diff options
| author |  Fabio Bas | 2010-11-07 18:31:54 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-11-07 18:31:54 +0000 |
| commit | e8bde9dce299c53501dd4b3c193bf8024dc7cc8f (patch) | |
| tree | 023d30ec42db70d60b9b4f59540c676d66929499 | |
| parent | [INTL:de] Minor correction of sentence structure. (diff) | |
| download | KVIrc-e8bde9dce299c53501dd4b3c193bf8024dc7cc8f.tar.gz KVIrc-e8bde9dce299c53501dd4b3c193bf8024dc7cc8f.tar.bz2 KVIrc-e8bde9dce299c53501dd4b3c193bf8024dc7cc8f.zip | |
avoid to inline overload a non-virtual method of QApplication, sicne it could confuse some compilers; thanks Gizmokid2005
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5134 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/kernel/kvi_app.h | 4 | ||||
| -rw-r--r-- | src/kvirc/kvs/kvi_kvs_runtimecontext.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/module/kvi_modulemanager.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_mdimanager.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index b3f8f11bf..0e07ff0fd 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -163,8 +163,8 @@ public: static int getGloballyUniqueId(); // returns an unique integer identifier across the application - inline bool firstTimeRun() const { return m_bFirstTimeRun; }; - inline bool closingDown() const { return m_bClosingDown; }; + bool firstTimeRun() const { return m_bFirstTimeRun; }; + bool kviClosingDown() const { return m_bClosingDown; }; inline bool supportsCompositing() { diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp index 394573ebd..eb819067e 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp @@ -73,7 +73,7 @@ void KviKvsRunTimeContext::enterBlockingSection() bool KviKvsRunTimeContext::leaveBlockingSection() { - if(g_pApp->closingDown())return false; // application quitting + if(g_pApp->kviClosingDown())return false; // application quitting if(!g_pApp->windowExists(m_pWindow))return false; // window lost return true; } diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index d979234ef..9f3bfc0d1 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -258,7 +258,7 @@ bool KviModuleManager::loadModule(const QString &modName) } } // be verbose if needed....just make sure that we're not shutting down... - if(_OUTPUT_VERBOSE && !g_pApp->closingDown()) + if(_OUTPUT_VERBOSE && !g_pApp->kviClosingDown()) { if(g_pFrame)g_pFrame->firstConsole()->output(KVI_OUT_VERBOSE, __tr2qs("Loaded module '%s' (%s)"),modName.toUtf8().data(),szName.toUtf8().data()); @@ -295,7 +295,7 @@ bool KviModuleManager::unloadModule(KviModule * module) if(m_pCleanupTimer->isActive())m_pCleanupTimer->stop(); } - if(_OUTPUT_VERBOSE && !g_pApp->closingDown()) + if(_OUTPUT_VERBOSE && !g_pApp->kviClosingDown()) { if(g_pFrame)g_pFrame->firstConsole()->output(KVI_OUT_VERBOSE, __tr2qs("Unloaded module '%s'"),szModName.toUtf8().data()); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 4e5565676..94ef3d7db 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -539,7 +539,7 @@ void KviMdiManager::tileAllInternal(int maxWnds, bool bHorizontal) //int maxWnds int * pRowrecall = bHorizontal ? rowrecall : colrecall; ensureNoMaximized(); - if (g_pApp->closingDown()) return; + if (g_pApp->kviClosingDown()) return; KviMdiChild * lpTop = topChild(); if (!lpTop) return; |