diff options
Diffstat (limited to 'Slimber/Qt')
-rw-r--r-- | Slimber/Qt/QtAboutDialog.cpp | 6 | ||||
-rw-r--r-- | Slimber/Qt/QtMenulet.cpp | 5 | ||||
-rw-r--r-- | Slimber/Qt/QtMenulet.h | 10 | ||||
-rw-r--r-- | Slimber/Qt/SConscript | 2 | ||||
-rw-r--r-- | Slimber/Qt/main.cpp | 9 |
5 files changed, 15 insertions, 17 deletions
diff --git a/Slimber/Qt/QtAboutDialog.cpp b/Slimber/Qt/QtAboutDialog.cpp index 27fc803..7fcd2ca 100644 --- a/Slimber/Qt/QtAboutDialog.cpp +++ b/Slimber/Qt/QtAboutDialog.cpp @@ -1,15 +1,15 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Slimber/Qt/QtAboutDialog.h" +#include <Slimber/Qt/QtAboutDialog.h> #include <QCoreApplication> -#include <QVBoxLayout> #include <QLabel> #include <QPixmap> +#include <QVBoxLayout> QtAboutDialog::QtAboutDialog() { setAttribute(Qt::WA_DeleteOnClose); diff --git a/Slimber/Qt/QtMenulet.cpp b/Slimber/Qt/QtMenulet.cpp index ba3d004..5d0d276 100644 --- a/Slimber/Qt/QtMenulet.cpp +++ b/Slimber/Qt/QtMenulet.cpp @@ -1,8 +1,7 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Slimber/Qt/QtMenulet.h" - +#include <Slimber/Qt/QtMenulet.h> diff --git a/Slimber/Qt/QtMenulet.h b/Slimber/Qt/QtMenulet.h index d6a7a4d..1aed329 100644 --- a/Slimber/Qt/QtMenulet.h +++ b/Slimber/Qt/QtMenulet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,14 +8,14 @@ #include <QCoreApplication> #include <QMenu> -#include <QString> -#include <QSystemTrayIcon> #include <QObject> #include <QPixmap> #include <QPointer> +#include <QString> +#include <QSystemTrayIcon> -#include "Slimber/Menulet.h" -#include "Slimber/Qt/QtAboutDialog.h" +#include <Slimber/Menulet.h> +#include <Slimber/Qt/QtAboutDialog.h> class QtMenulet : public QObject, public Menulet { Q_OBJECT diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript index 0e7bdea..9d965cc 100644 --- a/Slimber/Qt/SConscript +++ b/Slimber/Qt/SConscript @@ -33,8 +33,6 @@ else : qt_version = '4' myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version) -myenv.Append(CPPPATH = ["."]) - if env["PLATFORM"] == "win32" : myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"]) myenv.Append(LIBS = "qtmain") diff --git a/Slimber/Qt/main.cpp b/Slimber/Qt/main.cpp index 5415d05..69a8b6e 100644 --- a/Slimber/Qt/main.cpp +++ b/Slimber/Qt/main.cpp @@ -1,18 +1,19 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <QApplication> #include <QCoreApplication> -#include <QSystemTrayIcon> #include <QMessageBox> +#include <QSystemTrayIcon> -#include "QtMenulet.h" -#include "Slimber/MainController.h" #include <Swiften/EventLoop/Qt/QtEventLoop.h> + +#include <Slimber/MainController.h> #include <Slimber/Qt/BuildVersion.h> +#include <Slimber/Qt/QtMenulet.h> int main(int argc, char* argv[]) { QApplication app(argc, argv); |