Merge branch 'release/0.9.7'

leftytennis · Jan 20, 2019 · 96cd8c7 · 96cd8c7
2 parents e5106d7 + 9189b8d
commit 96cd8c7
Show file tree

Hide file tree

Showing 17 changed files with 343 additions and 222 deletions.
diff --git a/src/InkjetPlumber.plist b/src/InkjetPlumber.plist
@@ -19,7 +19,7 @@
     <key>CFBundleIdentifier</key>
     <string>org.threeputt.Inkjet Plumber</string>
     <key>CFBundleVersion</key>
-    <string>0.9.6</string>
+    <string>0.9.7</string>
     <key>NOTE</key>
     <string>This file was generated by Qt/QMake.</string>
 	<key>SUAutomaticallyUpdate</key>

diff --git a/src/Sparkle b/src/Sparkle
diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
@@ -1,5 +1,5 @@
 //
-//    Copyright (c) 2016 Jeff Thompson <[email protected]>
+//    Copyright (c) 2019 Jeff Thompson <[email protected]>
 //
 //    This file is part of Inkjet Plumber.
 //

diff --git a/src/aboutdialog.h b/src/aboutdialog.h
@@ -1,5 +1,5 @@
 //
-//    Copyright (c) 2016 Jeff Thompson <[email protected]>
+//    Copyright (c) 2019 Jeff Thompson <[email protected]>
 //
 //    This file is part of Inkjet Plumber.
 //
@@ -22,7 +22,8 @@
 
 #include <QDialog>
 
-namespace Ui {
+namespace Ui
+{
 class AboutDialog;
 }
 

diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
@@ -135,7 +135,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:14pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;© 2016 Jeff Thompson &amp;lt;&lt;a href=&quot;mailto:[email protected]&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;[email protected]&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;© 2019 Jeff Thompson &amp;lt;&lt;a href=&quot;mailto:[email protected]&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;[email protected]&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>

diff --git a/src/autoupdater.h b/src/autoupdater.h
@@ -29,7 +29,7 @@ class AutoUpdater
     virtual void        resetUpdateCycle() = 0;
     virtual void        setAutomaticallyChecksForUpdates(bool autoChecks) = 0;
     virtual void        setAutomaticallyDownloadsUpdates(bool autoDownloads) = 0;
-    virtual void        setFeedURL(QUrl& url) = 0;
+    virtual void        setFeedURL(QUrl &url) = 0;
     virtual void        setUpdateCheckInterval(long seconds) = 0;
     virtual long        updateCheckInterval() = 0;
     virtual bool        updateInProgress() = 0;

diff --git a/src/cocoainitializer.h b/src/cocoainitializer.h
@@ -7,13 +7,13 @@
 
 class CocoaInitializer
 {
-	public:
-		CocoaInitializer();
-		~CocoaInitializer();
-	
-	private:
-		class Private;
-		Private* d;
+public:
+    CocoaInitializer();
+    ~CocoaInitializer();
+
+private:
+    class Private;
+    Private *d;
 };
 
 #endif
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,5 @@
 //
-//    Copyright (c) 2016 Jeff Thompson <[email protected]>
+//    Copyright (c) 2019 Jeff Thompson <[email protected]>
 //
 //    This file is part of Inkjet Plumber.
 //
@@ -28,7 +28,7 @@
 #include "sparkleautoupdater.h"
 #endif
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     a.setApplicationName("Inkjet Plumber");
@@ -37,7 +37,7 @@ int main(int argc, char* argv[])
     a.setOrganizationName("Jeff Thompson");
 
 #if defined(Q_OS_OSX)
-    SparkleAutoUpdater* updater = nullptr;
+    SparkleAutoUpdater *updater = nullptr;
     CocoaInitializer initializer;
     updater = new SparkleAutoUpdater();
     MainWindow w(updater);

diff --git a/src/maintenancejob.cpp b/src/maintenancejob.cpp
@@ -1,5 +1,5 @@
 //
-//    Copyright (c) 2016 Jeff Thompson <[email protected]>
+//    Copyright (c) 2019 Jeff Thompson <[email protected]>
 //
 //    This file is part of Inkjet Plumber.
 //
@@ -21,7 +21,7 @@
 
 #include "maintenancejob.h"
 
-MaintenanceJob::MaintenanceJob(QObject* parent)
+MaintenanceJob::MaintenanceJob(QObject *parent)
     : QObject(parent)
     , enabled(false)
     , hours(55)
@@ -40,7 +40,7 @@ MaintenanceJob::MaintenanceJob(QObject* parent)
     return;
 }
 
-MaintenanceJob::MaintenanceJob(const QString& name, QObject* parent)
+MaintenanceJob::MaintenanceJob(const QString &name, QObject *parent)
     : QObject(parent)
     , printer_name(name)
     , enabled(false)
@@ -60,7 +60,7 @@ MaintenanceJob::MaintenanceJob(const QString& name, QObject* parent)
     return;
 }
 
-MaintenanceJob::MaintenanceJob(const MaintenanceJob& rhs)
+MaintenanceJob::MaintenanceJob(const MaintenanceJob &rhs)
     : QObject(rhs.parent())
     , printer_name(rhs.printer_name)
     , enabled(rhs.enabled)
@@ -85,7 +85,7 @@ MaintenanceJob::~MaintenanceJob()
     return;
 }
 
-MaintenanceJob& MaintenanceJob::operator=(const MaintenanceJob& rhs)
+MaintenanceJob &MaintenanceJob::operator=(const MaintenanceJob &rhs)
 {
     printer_name = rhs.printer_name;
     enabled = rhs.enabled;

diff --git a/src/maintenancejob.h b/src/maintenancejob.h
@@ -1,5 +1,5 @@
 //
-//    Copyright (c) 2016 Jeff Thompson <[email protected]>
+//    Copyright (c) 2019 Jeff Thompson <[email protected]>
 //
 //    This file is part of Inkjet Plumber.
 //
@@ -39,11 +39,11 @@ class MaintenanceJob : public QObject
 
 public:
 
-    explicit MaintenanceJob(QObject* parent = 0);
-    MaintenanceJob(const QString& name, QObject* parent = 0);
-    MaintenanceJob(const MaintenanceJob& rhs);
+    explicit MaintenanceJob(QObject *parent = 0);
+    MaintenanceJob(const QString &name, QObject *parent = 0);
+    MaintenanceJob(const MaintenanceJob &rhs);
     ~MaintenanceJob();
-    MaintenanceJob& operator=(const MaintenanceJob& rhs);
+    MaintenanceJob &operator=(const MaintenanceJob &rhs);
 
 signals:
 
@@ -68,10 +68,10 @@ public slots:
 };
 
 Q_DECLARE_METATYPE(MaintenanceJob);
-Q_DECLARE_METATYPE(MaintenanceJob*);
+Q_DECLARE_METATYPE(MaintenanceJob *);
 
-typedef QList<MaintenanceJob*> MaintenanceJobList;
-typedef QMap<QString, MaintenanceJob*> MaintenanceJobMap;
-typedef QMapIterator<QString, MaintenanceJob*> MaintenanceJobMapIterator;
+typedef QList<MaintenanceJob *> MaintenanceJobList;
+typedef QMap<QString, MaintenanceJob *> MaintenanceJobMap;
+typedef QMapIterator<QString, MaintenanceJob *> MaintenanceJobMapIterator;
 
 #endif // MAINTENANCEJOB_H