code cleanups

Skycoder42 · Skycoder42 · commit 6a0cf3abafea · 2018-08-07T18:19:36.000+02:00
diff --git a/src/jar/src/de/skycoder42/qtmvvm/core/AndroidSettingsAccessor.java b/src/jar/src/de/skycoder42/qtmvvm/core/AndroidSettingsAccessor.java
@@ -8,19 +8,19 @@
 import android.preference.PreferenceManager;
 
 class AndroidSettingsAccessor {
+	private long address = 0;
+	private SharedPreferences preferences = null;
+	private SharedPreferences.Editor editor = null;
+	private Listener listener = new Listener();
+
 	private class Listener implements SharedPreferences.OnSharedPreferenceChangeListener {
 		@Override
 		public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-			if(address != 0 && preferences == sharedPreferences)
+			if(address != 0 && preferences.equals(sharedPreferences))
 				callback(address, key);
 		}
 	}
 
-	long address = 0;
-	SharedPreferences preferences = null;
-	SharedPreferences.Editor editor = null;
-	Listener listener = new Listener();
-
 	private static native void callback(long address, Object key);
 
 	public AndroidSettingsAccessor(Context context, long address) {
diff --git a/src/mvvmcore/androidsettingsaccessor_p.h b/src/mvvmcore/androidsettingsaccessor_p.h
@@ -10,6 +10,8 @@ namespace QtMvvm {
 
 class AndroidSettingsAccessorPrivate
 {
+	Q_DISABLE_COPY(AndroidSettingsAccessorPrivate)
+
 public:
 	AndroidSettingsAccessor *q;
 	QAndroidJniObject settings;
diff --git a/src/mvvmcore/message_p.h b/src/mvvmcore/message_p.h
@@ -30,7 +30,11 @@ class MessageConfigPrivate : public QSharedData
 
 class MessageResultPrivate
 {
+	Q_DISABLE_COPY(MessageResultPrivate)
+
 public:
+	MessageResultPrivate() = default;
+
 	QMutex mutex;
 	QPointer<QObject> closeObject;
 	QMetaMethod closeMethod;
@@ -41,7 +45,11 @@ class MessageResultPrivate
 
 class ProgressControlPrivate
 {
+	Q_DISABLE_COPY(ProgressControlPrivate)
+
 public:
+	ProgressControlPrivate() = default;
+
 	bool autoDelete = true;
 #ifdef Q_ATOMIC_INT8_IS_SUPPORTED
 	QAtomicInteger<bool> indeterminate = false;
diff --git a/src/mvvmcore/serviceregistry_p.h b/src/mvvmcore/serviceregistry_p.h
@@ -11,7 +11,11 @@ namespace QtMvvm {
 
 class ServiceRegistryPrivate
 {
+	Q_DISABLE_COPY(ServiceRegistryPrivate)
+
 public:
+	ServiceRegistryPrivate() = default;
+
 	class ServiceInfo {
 		Q_DISABLE_COPY(ServiceInfo)
 	public:
diff --git a/src/mvvmcore/settingsconfigloader.cpp b/src/mvvmcore/settingsconfigloader.cpp
@@ -233,7 +233,7 @@ QException *SettingsConfigException::clone() const
 
 
 
-uint qHash(const std::tuple<QString, QString, QStringList> &key, uint seed)
+uint std::qHash(const std::tuple<QString, QString, QStringList> &key, uint seed)
 {
 	return qHash(std::get<0>(key), seed) ^
 			qHash(std::get<1>(key), seed) ^
diff --git a/src/mvvmcore/settingsconfigloader_p.h b/src/mvvmcore/settingsconfigloader_p.h
@@ -66,6 +66,10 @@ class Q_MVVMCORE_EXPORT SettingsConfigException : public SettingsLoaderException
 
 }
 
+namespace std {
+
 uint qHash(const std::tuple<QString, QString, QStringList> &key, uint seed);
 
+}
+
 #endif // SETTINGSCONFIGLOADER_P_H
diff --git a/src/mvvmcore/settingsviewmodel_p.h b/src/mvvmcore/settingsviewmodel_p.h
@@ -8,7 +8,11 @@ namespace QtMvvm {
 
 class SettingsViewModelPrivate
 {
+	Q_DISABLE_COPY(SettingsViewModelPrivate)
+
 public:
+	SettingsViewModelPrivate() = default;
+
 	ISettingsSetupLoader *setupLoader = nullptr;
 	ISettingsAccessor *accessor = nullptr;
 
diff --git a/src/mvvmdatasynccore/accountmodel_p.h b/src/mvvmdatasynccore/accountmodel_p.h
@@ -8,7 +8,11 @@ namespace QtMvvm {
 
 class AccountModelPrivate
 {
+	Q_DISABLE_COPY(AccountModelPrivate)
+
 public:
+	AccountModelPrivate() = default;
+
 	QtDataSync::AccountManager *accountManager = nullptr;
 	QtDataSync::SyncManager *syncManager = nullptr;
 	QList<QtDataSync::DeviceInfo> devices;
diff --git a/src/mvvmdatasynccore/datasyncsettingsaccessor_p.h b/src/mvvmdatasynccore/datasyncsettingsaccessor_p.h
@@ -8,6 +8,8 @@ namespace QtMvvm {
 
 class DataSyncSettingsAccessorPrivate
 {
+	Q_DISABLE_COPY(DataSyncSettingsAccessorPrivate)
+
 public:
 	DataSyncSettingsAccessorPrivate(QtDataSync::DataTypeStore<DataSyncSettingsEntry> *store);
 
diff --git a/src/mvvmdatasynccore/datasyncviewmodel_p.h b/src/mvvmdatasynccore/datasyncviewmodel_p.h
@@ -10,6 +10,8 @@ namespace QtMvvm {
 
 class DataSyncViewModelPrivate
 {
+	Q_DISABLE_COPY(DataSyncViewModelPrivate)
+
 public:
 	static const quint32 ExportRequestCode = 0xb201;
 	static const quint32 ChangeRemoteRequestCode = 0xb202;
diff --git a/src/mvvmdatasynccore/exchangedevicesmodel_p.h b/src/mvvmdatasynccore/exchangedevicesmodel_p.h
@@ -11,7 +11,11 @@ namespace QtMvvm {
 
 class ExchangeDevicesModelPrivate
 {
+	Q_DISABLE_COPY(ExchangeDevicesModelPrivate)
+
 public:
+	ExchangeDevicesModelPrivate() = default;
+
 	struct LimitedUserInfo : public QtDataSync::UserInfo
 	{
 		LimitedUserInfo(const QtDataSync::UserInfo &info = {});
diff --git a/src/mvvmdatasynccore/networkexchangeviewmodel_p.h b/src/mvvmdatasynccore/networkexchangeviewmodel_p.h
@@ -10,6 +10,8 @@ namespace QtMvvm {
 
 class NetworkExchangeViewModelPrivate
 {
+	Q_DISABLE_COPY(NetworkExchangeViewModelPrivate)
+
 public:
 	static const quint32 ExportRequestCode = 0xb300;
 
diff --git a/src/mvvmdatasyncwidgets/datasyncwindow_p.h b/src/mvvmdatasyncwidgets/datasyncwindow_p.h
@@ -12,6 +12,8 @@ namespace QtMvvm {
 
 class DataSyncWindowPrivate
 {
+	Q_DISABLE_COPY(DataSyncWindowPrivate)
+
 public:
 	DataSyncWindowPrivate(ViewModel *viewModel);
 
diff --git a/src/mvvmdatasyncwidgets/networkexchangewindow_p.h b/src/mvvmdatasyncwidgets/networkexchangewindow_p.h
@@ -12,6 +12,8 @@ namespace QtMvvm {
 
 class NetworkExchangeWindowPrivate
 {
+	Q_DISABLE_COPY(NetworkExchangeWindowPrivate)
+
 public:
 	NetworkExchangeWindowPrivate(ViewModel *viewModel);
 
diff --git a/src/mvvmquick/inputviewfactory_p.h b/src/mvvmquick/inputviewfactory_p.h
@@ -8,6 +8,8 @@ namespace QtMvvm {
 
 class InputViewFactoryPrivate
 {
+	Q_DISABLE_COPY(InputViewFactoryPrivate)
+
 public:
 	InputViewFactoryPrivate();
 
diff --git a/src/mvvmquick/quickpresenter_p.h b/src/mvvmquick/quickpresenter_p.h
@@ -11,9 +11,12 @@ namespace QtMvvm {
 
 class Q_MVVMQUICK_EXPORT QuickPresenterPrivate
 {
+	Q_DISABLE_COPY(QuickPresenterPrivate)
 	friend class QtMvvm::QuickPresenter;
 
 public:
+	QuickPresenterPrivate() = default;
+
 	static QuickPresenter *currentPresenter();
 	static void setQmlPresenter(QObject *presenter);
 
diff --git a/src/mvvmwidgets/inputwidgetfactory_p.h b/src/mvvmwidgets/inputwidgetfactory_p.h
@@ -8,7 +8,11 @@ namespace QtMvvm {
 
 class InputWidgetFactoryPrivate
 {
+	Q_DISABLE_COPY(InputWidgetFactoryPrivate)
+
 public:
+	InputWidgetFactoryPrivate() = default;
+
 	QHash<QByteArray, std::function<QWidget*(QWidget*)>> simpleWidgets;
 	QHash<QByteArray, QByteArray> aliases;
 };
diff --git a/src/mvvmwidgets/widgetspresenter_p.h b/src/mvvmwidgets/widgetspresenter_p.h
@@ -12,6 +12,8 @@ namespace QtMvvm {
 
 class WidgetsPresenterPrivate
 {
+	Q_DISABLE_COPY(WidgetsPresenterPrivate)
+
 public:
 	WidgetsPresenterPrivate();
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ namespace QtMvvm {`
`10`	`10`
`11`	`11`	`class AndroidSettingsAccessorPrivate`
`12`	`12`	`{`
	`13`	`+ Q_DISABLE_COPY(AndroidSettingsAccessorPrivate)`
	`14`	`+`
`13`	`15`	`public:`
`14`	`16`	`AndroidSettingsAccessor *q;`
`15`	`17`	`QAndroidJniObject settings;`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ QException *SettingsConfigException::clone() const`
`233`	`233`
`234`	`234`
`235`	`235`
`236`		`-uint qHash(const std::tuple<QString, QString, QStringList> &key, uint seed)`
	`236`	`+uint std::qHash(const std::tuple<QString, QString, QStringList> &key, uint seed)`
`237`	`237`	`{`
`238`	`238`	`return qHash(std::get<0>(key), seed) ^`
`239`	`239`	`qHash(std::get<1>(key), seed) ^`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ class Q_MVVMCORE_EXPORT SettingsConfigException : public SettingsLoaderException`
`66`	`66`
`67`	`67`	`}`
`68`	`68`
	`69`	`+namespace std {`
	`70`	`+`
`69`	`71`	`uint qHash(const std::tuple<QString, QString, QStringList> &key, uint seed);`
`70`	`72`
	`73`	`+}`
	`74`	`+`
`71`	`75`	`#endif // SETTINGSCONFIGLOADER_P_H`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ namespace QtMvvm {`
`8`	`8`
`9`	`9`	`class DataSyncSettingsAccessorPrivate`
`10`	`10`	`{`
	`11`	`+ Q_DISABLE_COPY(DataSyncSettingsAccessorPrivate)`
	`12`	`+`
`11`	`13`	`public:`
`12`	`14`	`DataSyncSettingsAccessorPrivate(QtDataSync::DataTypeStore<DataSyncSettingsEntry> *store);`
`13`	`15`