Merge remote-tracking branch 'origin/master' into step

FreeCAD · Jan 8, 2017 · 358238f · 358238f
2 parents 7ccd9a9 + 5a370d6
commit 358238f
Show file tree

Hide file tree

Showing 48 changed files with 2,734 additions and 617 deletions.
diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
@@ -1036,7 +1036,7 @@ bool Application::activateWorkbench(const char* name)
         }
 
         Base::Console().Error("%s\n", (const char*)msg.toLatin1());
-        Base::Console().Log("%s\n", e.getStackTrace().c_str());
+        Base::Console().Error("%s\n", e.getStackTrace().c_str());
         if (!d->startingUp) {
             wc.restoreCursor();
             QMessageBox::critical(getMainWindow(), QObject::tr("Workbench failure"), 
@@ -1279,37 +1279,36 @@ typedef void (*_qt_msg_handler_old)(QtMsgType type, const char *msg);
 _qt_msg_handler_old old_qtmsg_handler = 0;
 
 #if QT_VERSION >= 0x050000
-void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &qmsg)
+void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     Q_UNUSED(context);
-    const QChar *msg = qmsg.unicode();
 #ifdef FC_DEBUG
     switch (type)
     {
 #if QT_VERSION >= 0x050500
     case QtInfoMsg:
 #endif
     case QtDebugMsg:
-        Base::Console().Message("%s\n", msg);
+        Base::Console().Message("%s\n", msg.toUtf8().constData());
         break;
     case QtWarningMsg:
-        Base::Console().Warning("%s\n", msg);
+        Base::Console().Warning("%s\n", msg.toUtf8().constData());
         break;
     case QtCriticalMsg:
-        Base::Console().Error("%s\n", msg);
+        Base::Console().Error("%s\n", msg.toUtf8().constData());
         break;
     case QtFatalMsg:
-        Base::Console().Error("%s\n", msg);
+        Base::Console().Error("%s\n", msg.toUtf8().constData());
         abort();                    // deliberately core dump
     }
 #ifdef FC_OS_WIN32
     if (old_qtmsg_handler)
-        (*old_qtmsg_handler)(type, context, qmsg);
+        (*old_qtmsg_handler)(type, context, msg);
 #endif
 #else
     // do not stress user with Qt internals but write to log file if enabled
     Q_UNUSED(type);
-    Base::Console().Log("%s\n", msg);
+    Base::Console().Log("%s\n", msg.toUtf8().constData());
 #endif
 }
 #else

diff --git a/src/Gui/OnlineDocumentation.h b/src/Gui/OnlineDocumentation.h
@@ -69,7 +69,7 @@ class HttpServer : public QTcpServer
     void pause();
     void resume();
 
-private slots:
+private Q_SLOTS:
     void readClient();
     void discardClient();
 

diff --git a/src/Gui/QSint/actionpanel/taskheader_p.cpp b/src/Gui/QSint/actionpanel/taskheader_p.cpp
@@ -195,7 +195,7 @@ void TaskHeader::leaveEvent ( QEvent * /*event*/ )
 void TaskHeader::fold()
 {
   if (myExpandable) {
-    emit activated();
+    Q_EMIT activated();
     // Toggling the 'm_fold' member here may lead to inconsistencies with its ActionGroup.
     // Thus, the method setFold() was added and called from ActionGroup when required.
 #if 0
@@ -254,7 +254,7 @@ void TaskHeader::changeIcons()
 void TaskHeader::mouseReleaseEvent ( QMouseEvent * event )
 {
   if (event->button() == Qt::LeftButton) {
-    emit activated();
+    Q_EMIT activated();
   }
 }
 

diff --git a/src/Gui/Quarter/ContextMenu.h b/src/Gui/Quarter/ContextMenu.h
@@ -50,7 +50,7 @@ class ContextMenu : public QObject {
 
   QMenu * getMenu(void) const;
 
-public slots:
+public Q_SLOTS:
   void changeRenderMode(QAction * action);
   void changeStereoMode(QAction * action);
   void changeTransparencyType(QAction * action);

diff --git a/src/Gui/Quarter/SensorManager.h b/src/Gui/Quarter/SensorManager.h
@@ -48,7 +48,7 @@ class SensorManager : public QObject {
   SensorManager(void);
   ~SensorManager();
 
-public slots:
+public Q_SLOTS:
   void idleTimeout(void);
   void delayTimeout(void);
   void timerQueueTimeout(void);

diff --git a/src/Gui/Quarter/SignalThread.cpp b/src/Gui/Quarter/SignalThread.cpp
@@ -70,7 +70,7 @@ SignalThread::run(void)
     // just wait, and trigger every time we receive a signal
     this->waitcond.wait(&this->mutex);
     if (!this->isstopped) {
-      emit triggerSignal();
+      Q_EMIT triggerSignal();
     }
   }
 }