Squish: Adapt to recent aspect development

Change-Id: Ied7406af9c39d8b57b5b9064500e589e33fb86da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/squish/squishsettings.h

@@ -10,12 +10,7 @@
 #include <QDialog>
 #include <QProcess>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
-namespace Squish {
-namespace Internal {
+namespace Squish::Internal {
 
 enum class Language;
 
@@ -30,30 +25,26 @@ public:
     QMap<QString, QString> attachableAuts; // name, host:port
     QStringList autPaths; // absolute path
     QStringList licensedToolkits;
-    Utils::IntegerAspect autTimeout;
-    Utils::IntegerAspect responseTimeout;
-    Utils::IntegerAspect postMortemWaitTime;
-    Utils::BoolAspect animatedCursor;
+    Utils::IntegerAspect autTimeout{this};
+    Utils::IntegerAspect responseTimeout{this};
+    Utils::IntegerAspect postMortemWaitTime{this};
+    Utils::BoolAspect animatedCursor{this};
 };
 
 class SquishSettings : public Utils::AspectContainer
 {
-    Q_OBJECT
 public:
     SquishSettings();
 
     Utils::FilePath scriptsPath(Language language) const;
 
-    Utils::StringAspect squishPath;
-    Utils::StringAspect licensePath;
-    Utils::StringAspect serverHost;
-    Utils::IntegerAspect serverPort;
-    Utils::BoolAspect local;
-    Utils::BoolAspect verbose;
-    Utils::BoolAspect minimizeIDE;
-
-signals:
-    void squishPathChanged();
+    Utils::FilePathAspect squishPath{this};
+    Utils::FilePathAspect licensePath{this};
+    Utils::StringAspect serverHost{this};
+    Utils::IntegerAspect serverPort{this};
+    Utils::BoolAspect local{this};
+    Utils::BoolAspect verbose{this};
+    Utils::BoolAspect minimizeIDE{this};
 };
 
 class SquishSettingsPage final : public Core::IOptionsPage
@@ -71,5 +62,4 @@ private:
     void configWriteFailed(QProcess::ProcessError error);
 };
 
-} // namespace Internal
-} // namespace Squish
+} // Squish::Internal