From df7ecb99bb9ce3da09911eb6b2388fee4324183d Mon Sep 17 00:00:00 2001 From: Robert Knight Date: Thu, 14 Jun 2007 01:59:46 +0000 Subject: [PATCH] Disable translucent windows temporarily (again) while I work on other things. svn path=/trunk/KDE/kdebase/apps/konsole/; revision=675338 --- src/Application.cpp | 19 ++++++++++++++----- src/Application.h | 5 +++-- src/start.cpp | 3 ++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index b6c9e7131..cf98ad444 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -49,12 +49,21 @@ using namespace Konsole; #ifdef Q_WS_X11 Application::Application(Display* display , Qt::HANDLE visual, Qt::HANDLE colormap) : KUniqueApplication(display,visual,colormap) -#else -Application::Application() : KUniqueApplication() -#endif - , _sessionList(0) - , _backgroundInstance(0) { + init(); +} +#endif + +Application::Application() : KUniqueApplication() +{ + init(); +} + +void Application::init() +{ + _sessionList = 0; + _backgroundInstance = 0; + // create session manager SessionManager::setInstance( new SessionManager() ); diff --git a/src/Application.h b/src/Application.h index 9cc139fb7..ec963809a 100644 --- a/src/Application.h +++ b/src/Application.h @@ -51,10 +51,10 @@ public: /** Constructs a new Konsole application. */ #ifdef Q_WS_X11 Application(Display* display , Qt::HANDLE visual, Qt::HANDLE colormap); -#else - Application(); #endif + Application(); + virtual ~Application(); /** Creates a new main window and opens a default terminal session */ @@ -78,6 +78,7 @@ private slots: void toggleBackgroundInstance(); private: + void init(); void listAvailableProfiles(); void startBackgroundMode(MainWindow* window); diff --git a/src/start.cpp b/src/start.cpp index 3eb27d923..8989785fd 100644 --- a/src/start.cpp +++ b/src/start.cpp @@ -97,7 +97,8 @@ extern "C" int KDE_EXPORT kdemain(int argc,char** argv) qDebug() << "Transparency available: " << transparencyAvailable; - Application app(display,Qt::HANDLE(visual),Qt::HANDLE(colormap)); + Application app; + //Application app(display,Qt::HANDLE(visual),Qt::HANDLE(colormap)); #else Application app; #endif