aboutsummaryrefslogtreecommitdiff
path: root/lumina-desktop/main.cpp
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2014-12-18 07:47:48 -0500
committerKen Moore <ken@pcbsd.org>2014-12-18 07:47:48 -0500
commit71c2fda95224f0a04316c5f1059628d33564ca43 (patch)
treeca74dbe49dd2f555e73893e7f5f06154d6dab763 /lumina-desktop/main.cpp
parentOops, forgot to add knowledge of the new "Wine" app category to the userbutton. (diff)
downloadlumina-71c2fda95224f0a04316c5f1059628d33564ca43.tar.gz
lumina-71c2fda95224f0a04316c5f1059628d33564ca43.tar.bz2
lumina-71c2fda95224f0a04316c5f1059628d33564ca43.zip
Commit a checkpoint on the conversion of Lumina to Qt5.
It is functional at the moment, but still has a few rough edges with regards to the X11 background interface (due to the move from XLib to XCB in Qt5). This reulst in some of the window manager interactions not behaving properly (such as sticky status on panels).
Diffstat (limited to 'lumina-desktop/main.cpp')
-rw-r--r--lumina-desktop/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lumina-desktop/main.cpp b/lumina-desktop/main.cpp
index 884e9441..8305be60 100644
--- a/lumina-desktop/main.cpp
+++ b/lumina-desktop/main.cpp
@@ -23,10 +23,10 @@
#include <LuminaThemes.h>
#include <LuminaOS.h>
-#define DEBUG 0
+#define DEBUG 1
QFile logfile(QDir::homePath()+"/.lumina/logs/runtime.log");
-void MessageOutput(QtMsgType type, const char *msg){
+void MessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg){
QString txt;
switch(type){
case QtDebugMsg:
@@ -76,7 +76,7 @@ int main(int argc, char ** argv)
if(DEBUG){ qDebug() << "Theme Init:" << timer->elapsed(); }
LuminaThemeEngine theme(&a);
//Setup Log File
- qInstallMsgHandler(MessageOutput);
+ qInstallMessageHandler(MessageOutput);
if(DEBUG){ qDebug() << "Session Setup:" << timer->elapsed(); }
a.setupSession();
if(DEBUG){ qDebug() << "Load Locale:" << timer->elapsed(); }
bgstack15