diff options
Diffstat (limited to 'src/kvirc')
-rw-r--r-- | src/kvirc/kernel/kvi_app.cpp | 30 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_app.h | 4 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 20 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_options.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_customtoolbar.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_filedialog.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_menubar.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_msgbox.cpp | 8 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_window.cpp | 6 |
10 files changed, 41 insertions, 41 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 66b65cf0..f093d33b 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -153,7 +153,7 @@ TQPixmap * g_pActivityMeterPixmap = 0; #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT #include <ksharedpixmap.h> #include <netwm.h> #include <kimageeffect.h> @@ -1091,7 +1091,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT #include <netwm.h> @@ -1151,11 +1151,11 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co //} } - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT void KviApp::destroyPseudoTransparency() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT if(g_pKdeDesktopBackground) { delete g_pKdeDesktopBackground; @@ -1163,7 +1163,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co } // forget the backgroundChanged signal (will do nothing if it is not connected) disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT if(g_pShadedParentGlobalDesktopBackground) { delete g_pShadedParentGlobalDesktopBackground; @@ -1183,11 +1183,11 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co TQTimer::singleShot(0,this,TQT_SLOT(updatePseudoTransparency())); } -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #define kimageeffect_fade KImageEffect::fade -#else //!COMPILE_KDE_SUPPORT +#else //!COMPILE_TDE_SUPPORT // // This function is taken from the KDE kimageeffect.cpp @@ -1252,7 +1252,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co return img; } -#endif //!COMPILE_KDE_SUPPORT +#endif //!COMPILE_TDE_SUPPORT void KviApp::createGlobalBackgrounds(TQPixmap * pix) { @@ -1287,7 +1287,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co void KviApp::kdeRootPixmapChanged(int iDesktop) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT if(!KVI_OPTION_BOOL(KviOption_boolUpdateKdeBackgroundOnChange))return; NETRootInfo rinfo(qt_xdisplay(),NET::CurrentDesktop); rinfo.activate(); @@ -1300,7 +1300,7 @@ void KviApp::kdeRootPixmapChanged(int iDesktop) void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT if(!bSuccess) { debug("Failed to download the KDE root background image..."); @@ -1315,7 +1315,7 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess) } delete g_pKdeDesktopBackground; g_pKdeDesktopBackground = 0; - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT #endif //COMPILE_PSEUDO_TRANSPARENCY } @@ -1326,12 +1326,12 @@ void KviApp::updatePseudoTransparency() m_bUpdatePseudoTransparencyPending = false; if(KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT if(KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde)) { downloadKdeRootPixmap(); } else { -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT if(KVI_OPTION_PIXMAP(KviOption_pixmapGlobalTransparencyBackground).pixmap()) { createGlobalBackgrounds(KVI_OPTION_PIXMAP(KviOption_pixmapGlobalTransparencyBackground).pixmap()); @@ -1339,9 +1339,9 @@ void KviApp::updatePseudoTransparency() destroyPseudoTransparency(); KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) = false; } -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } else { destroyPseudoTransparency(); if(g_pFrame)g_pFrame->updatePseudoTransparency(); diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index f5feb73e..63246253 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -320,9 +320,9 @@ private: #ifdef COMPILE_PSEUDO_TRANSPARENCY void createGlobalBackgrounds(TQPixmap * pix); void destroyPseudoTransparency(); - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT void downloadKdeRootPixmap(); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT #endif //COMPILE_PSEUDO_TRANSPARENCY private: // kvi_app.cpp : parts of setup() diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index de8b1a11..c7ac4266 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -50,7 +50,7 @@ #include <stdlib.h> // for getenv() #include <unistd.h> // for symlink() <-- unused ? - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT #include <kconfig.h> #include <kstddirs.h> #endif @@ -548,7 +548,7 @@ void KviApp::findGlobalKvircDirectory() // Since I had many problems with it // because of strange distributions or TDEDIRS // I do it in that way... - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT // KDE compilation ... // The things usually go installed into $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH // Look in the main KDE directory @@ -595,7 +595,7 @@ void KviApp::findGlobalKvircDirectory() if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT for(int k=0;usualKvircGlobalDir[k] != 0;k++){ m_szGlobalKvircDir = TQDir::homeDirPath(); m_szGlobalKvircDir+= "/.kde"; @@ -603,7 +603,7 @@ void KviApp::findGlobalKvircDirectory() m_szGlobalKvircDir+= KVI_VERSION_BRANCH; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT m_szGlobalKvircDir=""; @@ -611,7 +611,7 @@ void KviApp::findGlobalKvircDirectory() // THE TRANSLATION DIRECTORY WAS NOT FOUND YET // AND THE LOCALE IS NOT INITIALIZED AT ALL - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\ "The usual path for this directory is $TDEDIR/share/apps/kvirc.\n"\ "Are you sure that 'make install' worked correctly ?\n"\ @@ -626,7 +626,7 @@ void KviApp::findGlobalKvircDirectory() "Something went wrong during the bundle creation.\n"\ "Please read the documentation and make sure to set proper paths for --prefix, -bindir, -libdir and --datadir during the configure run.\n"\ "Trying to run anyway...\n"); - #else //!defined(COMPILE_KDE_SUPPORT) && !defined(Q_OS_MACX) + #else //!defined(COMPILE_TDE_SUPPORT) && !defined(Q_OS_MACX) KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\ "The usual path for this directory is /usr/local/share/kvirc.\n"\ "Are you sure that 'make install' worked correctly ?\n"\ @@ -644,7 +644,7 @@ bool KviApp::findLocalKvircDirectory() { // Here we check if we already did the setup // and we have the kvirc local directory saved somewhere -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT if(m_szConfigFile.isEmpty()) { // don't do that if user supplied a config file :) KConfig * cfg = config(); @@ -664,7 +664,7 @@ bool KviApp::findLocalKvircDirectory() } } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT #ifdef COMPILE_ON_WINDOWS if(KviFileUtils::fileExists(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable")) { @@ -819,7 +819,7 @@ void KviApp::saveKvircDirectory() #else //!COMPILE_ON_WINDOWS */ // Here we save the local directory path -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT // In KDE we use the application config file if(m_szConfigFile.isEmpty()) { // not if user supplied a config file @@ -836,7 +836,7 @@ void KviApp::saveKvircDirectory() } } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT // In NON-KDE we use $HOME/.kvirc.rc or $HOME/kvirc.ini TQString szF = TQDir::homeDirPath(); diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 2d3c1e20..fce61371 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -316,7 +316,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]= #ifdef COMPILE_ON_WINDOWS #define RUN_THE_BROWSER "run \"cmd.exe /c start \\\"\\\" \\\"$0\\\"\"" #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT #define RUN_THE_BROWSER "run kfmclient openURL $0" #else #ifdef Q_OS_MACX diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp index 096ff3c4..cc48db19 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp @@ -923,7 +923,7 @@ namespace KviKvsCoreFunctions #ifndef COMPILE_NO_IPC "IPC", #endif - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT "KDE", #endif #ifdef COMPILE_OSS_SUPPORT diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 774ba533..c7bca49e 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -291,7 +291,7 @@ void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e) #else boxLayout()->remove(m_pDraggedChild); // in case it was already added boxLayout()->insertWidget(idx,m_pDraggedChild); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT // bleah :///// insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx); #endif @@ -506,7 +506,7 @@ void KviCustomToolBar::drag(TQWidget * child,const TQPoint &pnt) #else boxLayout()->remove(child); boxLayout()->insertWidget(idx,child); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT // bleah :///// insertWidget(-1,child->width(),child,idx); #endif @@ -645,7 +645,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) #else boxLayout()->insertWidget(0,m_pMovedChild); m_pMovedChild->show(); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT // bleah :///// insertWidget(-1,m_pMovedChild->width(),m_pMovedChild,0); #endif diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 2660a528..5439e347 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -176,7 +176,7 @@ bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & captio return !buffer.isEmpty(); } #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT // the KDE based dir selection dialog is now quite nice buffer = KFileDialog::getExistingDirectory(initial,parent,caption); return !buffer.isEmpty(); diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index ad5531ee..74bbbe73 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -303,7 +303,7 @@ void KviMenuBar::setupToolsPopup() // moved the old tools here m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,TQT_SLOT(showIconWidget())); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT int id; id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); m->setItemParameter(id,KVI_INTERNALCOMMAND_TERM_OPEN); diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/kvi_msgbox.cpp index 5d02fab7..e86502ce 100644 --- a/src/kvirc/ui/kvi_msgbox.cpp +++ b/src/kvirc/ui/kvi_msgbox.cpp @@ -24,7 +24,7 @@ // FIXME: #warning "This should go into TAL as layer ...then maybe a wrapper in KviApp!" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <kmessagebox.h> #else #include <tqmessagebox.h> @@ -45,7 +45,7 @@ namespace KviMessageBox TQString s; KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KMessageBox::error(0,s,"KVIrc"); #else TQMessageBox::warning(0,"KVIrc",s); @@ -59,7 +59,7 @@ namespace KviMessageBox TQString s; KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KMessageBox::information(0,s,"KVIrc"); #else TQMessageBox::information(0,"KVIrc",s); @@ -74,7 +74,7 @@ namespace KviMessageBox KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); bool bRet; -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT bRet = (KMessageBox::questionYesNo(0,s,caption) == KMessageBox::Yes); #else bRet = (TQMessageBox::information(0,caption,s, diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 984fb70a..e5dd8e86 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -82,7 +82,7 @@ #include "kvi_cryptcontroller.h" #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <twin.h> #include <tdeversion.h> #endif @@ -257,7 +257,7 @@ void KviWindow::demandAttention() fwi.dwTimeout = 500; FlashWindowEx(&fwi); #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT #if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2) KWin::demandAttention(frame()->winId(),true); #endif @@ -274,7 +274,7 @@ void KviWindow::demandAttention() fwi.dwTimeout = 500; FlashWindowEx(&fwi); #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT #if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2) KWin::demandAttention(winId(),true); #endif |