diff options
Diffstat (limited to 'tools/m-servicefwgen.d/m-servicefwgen.cpp')
| -rw-r--r-- | tools/m-servicefwgen.d/m-servicefwgen.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/tools/m-servicefwgen.d/m-servicefwgen.cpp b/tools/m-servicefwgen.d/m-servicefwgen.cpp index 52a1308d..935a618a 100644 --- a/tools/m-servicefwgen.d/m-servicefwgen.cpp +++ b/tools/m-servicefwgen.d/m-servicefwgen.cpp @@ -813,8 +813,6 @@ void processAdaptorCppFile() "#include <MApplicationWindow>\n" \ "#include <MApplicationIfProxy>\n" \ "#include <MEscapeButtonPanel>\n" \ - "#include <MDebug>\n" \ - "\n" \ "#include <QX11Info>\n" \ "#include <X11/Xutil.h>\n" \ "#include <X11/Xlib.h>\n" \ @@ -841,20 +839,11 @@ void processAdaptorCppFile() " MApplicationWindow *appWindow = MApplication::activeApplicationWindow();\n"\ " if (appWindow != 0) {\n"\ " appWindow->setWindowTitle( windowTitle );\n"\ -"\n"\ -" MApplicationPage *currentPage = appWindow->currentPage();\n"\ -"\n"\ -" if ( currentPage != 0 ) {\n"\ -" currentPage->setEscapeMode( MApplicationPageModel::EscapeManualBack );\n"\ -" // connect to the back button - assumes the above 'showImage' opens a\n"\ -" // new window and so the window referred to below is already the top one\n"\ -" connect(currentPage, SIGNAL(backButtonClicked()),\n"\ +" appWindow->currentPage()->setEscapeMode( MApplicationPageModel::EscapeManualBack );\n"\ +" // connect to the back button - assumes the above 'showImage' opens a\n"\ +" // new window and so the window referred to below is already the top one\n"\ +" connect(appWindow->currentPage(), SIGNAL(backButtonClicked()),\n"\ " this, SLOT(goBack()));\n"\ -" } else {\n"\ -" mDebug( __PRETTY_FUNCTION__ ) << \"No currentPage! - broken chain\";\n"\ -" }\n"\ -" } else {\n"\ -" mDebug( __PRETTY_FUNCTION__ ) << \"No activeApplicationWindow! - broken chain\";\n"\ " }\n"\ "\n"\ " // update the X server\n"\ @@ -899,16 +888,18 @@ void processAdaptorCppFile() outS << "void " + w.upperCamelAdaptorName() + "::goBack()\n"\ "{\n" \ +" qDebug() << __PRETTY_FUNCTION__;\n"\ +"\n"\ " bool backServiceRegistered = ( windowId != -1 );\n"\ " if ( backServiceRegistered ) {\n"\ " MApplicationIfProxy mApplicationIfProxy(backServiceName, this);\n"\ "\n"\ " if (mApplicationIfProxy.connection().isConnected()) {\n"\ -" mDebug( __PRETTY_FUNCTION__ ) << \"Launching \" << backServiceName;\n"\ +" qDebug() << \"Launching \" << backServiceName;\n"\ " mApplicationIfProxy.launch();\n"\ " } else {\n"\ -" mDebug( __PRETTY_FUNCTION__ ) << \"Could not launch\" << backServiceName;\n"\ -" mDebug( __PRETTY_FUNCTION__ ) << \"DBus not connected?\";\n"\ +" qWarning() << \"Could not launch\" << backServiceName;\n"\ +" qWarning() << \"DBus not connected?\";\n"\ " }\n"\ "\n"\ " // unhide the chain parent's window\n"\ |