commit 3658736c2cf2c24cc27b669a1a2794bc32d5bc66
author Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Thu Feb 04 12:30:52 2016 -0500
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Thu Feb 04 13:49:38 2016 -0500
tree 340843dafc08599eafbcdd95775f8f820be51b95
parent 31484f1a0f6b02368016041df3f1b8461427402d

wizard: automatic alias suggestion

- Also fix some code style issue
- Change Q_OS_WIN32 macro to more general Q_OS_WIN

Change-Id: I54c646b52e07ffee7ad7f078528b106e12ff32f2
Tuleap: #334

mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index edbb96e..5238465 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -24,7 +24,7 @@
 #include "media/text.h"
 #include "media/textrecording.h"
 
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
 #include <windows.h>
 #include <QWinThumbnailToolBar>
 #include <QWinThumbnailToolButton>
@@ -40,9 +40,7 @@
 
 #include "callmodel.h"
 
-#include <windows.h>
-
-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(QWidget* parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     mwToolBar_(new MainWindowToolBar)
@@ -56,7 +54,7 @@
     GlobalSystemTray& sysIcon = GlobalSystemTray::instance();
     sysIcon.setIcon(icon);
 
-    QMenu *menu = new QMenu();
+    QMenu* menu = new QMenu();
 
     auto configAction = new QAction("Configuration", this);
     menu->addAction(configAction);
@@ -75,7 +73,7 @@
         navStack_->onNavigationRequested(ScreenEnum::ConfScreen);
     });
 
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     HMENU sysMenu = ::GetSystemMenu((HWND) winId(), FALSE);
     if (sysMenu != NULL) {
         ::AppendMenuA(sysMenu, MF_SEPARATOR, 0, 0);
@@ -123,7 +121,7 @@
 }
 
 void
-MainWindow::onRingEvent(const QString &uri)
+MainWindow::onRingEvent(const QString& uri)
 {
     this->showNormal();
     if (not uri.isEmpty()) {
@@ -134,12 +132,12 @@
 }
 
 bool
-MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
+MainWindow::nativeEvent(const QByteArray& eventType, void* message, long* result)
 {
     Q_UNUSED(eventType)
 
-#ifdef Q_OS_WIN32
-    MSG *msg = (MSG*) message;
+#ifdef Q_OS_WIN
+    MSG* msg = (MSG*) message;
 
     if (msg->message == WM_SYSCOMMAND) {
         if ((msg->wParam & 0xfff0) == IDM_ABOUTBOX) {
@@ -151,6 +149,9 @@
             return true;
         }
     }
+#else
+    Q_UNUSED(message)
+    Q_UNUSED(result)
 #endif
     return false;
 }
@@ -163,7 +164,7 @@
 }
 
 void
-MainWindow::onIncomingCall(Call *call)
+MainWindow::onIncomingCall(Call* call)
 {
     Q_UNUSED(call);
     QWidget::showNormal();
@@ -172,10 +173,10 @@
 void
 MainWindow::createThumbBar()
 {
-#ifdef Q_OS_WIN32
-    QWinThumbnailToolBar *thumbbar = new QWinThumbnailToolBar(this);
+#ifdef Q_OS_WIN
+    QWinThumbnailToolBar* thumbbar = new QWinThumbnailToolBar(this);
     thumbbar->setWindow(this->windowHandle());
-    QWinThumbnailToolButton *settings = new QWinThumbnailToolButton(thumbbar);
+    QWinThumbnailToolButton* settings = new QWinThumbnailToolButton(thumbbar);
     settings->setToolTip("Settings");
     QIcon icon(":/images/settings.png");
     settings->setIcon(icon);