diff options
39 files changed, 103 insertions, 103 deletions
diff --git a/src/kvilib/ext/kvi_dcophelper.cpp b/src/kvilib/ext/kvi_dcophelper.cpp index 2d58350c2..e6a68d1df 100644 --- a/src/kvilib/ext/kvi_dcophelper.cpp +++ b/src/kvilib/ext/kvi_dcophelper.cpp @@ -353,4 +353,4 @@ bool KviDCOPHelper::startApp(const QString &szApp,int iWaitMSecs) } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT diff --git a/src/kvilib/ext/kvi_dcophelper.h b/src/kvilib/ext/kvi_dcophelper.h index 6a997eb18..f265fc1d0 100644 --- a/src/kvilib/ext/kvi_dcophelper.h +++ b/src/kvilib/ext/kvi_dcophelper.h @@ -77,6 +77,6 @@ protected: bool qcstringListRetVoidDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,KviQCStringList &ret); }; -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT #endif // _KVI_DCOPHELPER_H_ diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp index ce89163d6..5c5c82879 100644 --- a/src/kvilib/tal/kvi_tal_application.cpp +++ b/src/kvilib/tal/kvi_tal_application.cpp @@ -25,7 +25,7 @@ #include "kvi_tal_application.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviTalApplication::KviTalApplication(int &argc,char ** argv) : KApplication() diff --git a/src/kvilib/tal/kvi_tal_application.h b/src/kvilib/tal/kvi_tal_application.h index 874afc6f2..064528285 100644 --- a/src/kvilib/tal/kvi_tal_application.h +++ b/src/kvilib/tal/kvi_tal_application.h @@ -30,7 +30,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_tal_application_kde.h" #else #include "kvi_tal_application_qt.h" diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/kvi_tal_filedialog.cpp index ae9feb3f3..e4cf0f25b 100644 --- a/src/kvilib/tal/kvi_tal_filedialog.cpp +++ b/src/kvilib/tal/kvi_tal_filedialog.cpp @@ -26,7 +26,7 @@ #include "kvi_tal_filedialog.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviTalFileDialog::KviTalFileDialog(const QString &dirName,const QString &filter,QWidget *parent,const char *name,bool modal) : KFileDialog(KUrl(dirName),filter,parent) @@ -75,7 +75,7 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_filedialog_kde.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #else @@ -124,6 +124,6 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_filedialog_qt.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #endif diff --git a/src/kvilib/tal/kvi_tal_filedialog.h b/src/kvilib/tal/kvi_tal_filedialog.h index 3eff1d6bd..64b0dcc10 100644 --- a/src/kvilib/tal/kvi_tal_filedialog.h +++ b/src/kvilib/tal/kvi_tal_filedialog.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_tal_filedialog_kde.h" #else #include "kvi_tal_filedialog_qt.h" diff --git a/src/kvilib/tal/kvi_tal_itemdelegates.h b/src/kvilib/tal/kvi_tal_itemdelegates.h index 6e258b1dc..a88414cbd 100644 --- a/src/kvilib/tal/kvi_tal_itemdelegates.h +++ b/src/kvilib/tal/kvi_tal_itemdelegates.h @@ -26,6 +26,7 @@ //============================================================================= #include "kvi_settings.h" + #include <QItemDelegate> #include <QListWidget> #include <QTreeWidget> diff --git a/src/kvilib/tal/kvi_tal_listwidget.h b/src/kvilib/tal/kvi_tal_listwidget.h index 6eb6c5f93..4f9f1c927 100644 --- a/src/kvilib/tal/kvi_tal_listwidget.h +++ b/src/kvilib/tal/kvi_tal_listwidget.h @@ -28,7 +28,6 @@ #include "kvi_settings.h" #include "kvi_tal_itemdelegates.h" - #include <QListWidget> class KviTalListWidgetItem; diff --git a/src/kvilib/tal/kvi_tal_mainwindow.cpp b/src/kvilib/tal/kvi_tal_mainwindow.cpp index 715f42532..c8874ab8e 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.cpp +++ b/src/kvilib/tal/kvi_tal_mainwindow.cpp @@ -25,7 +25,7 @@ #include "kvi_tal_mainwindow.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviTalMainWindow::KviTalMainWindow(QWidget * par,const char * nam) : KMainWindow(par) @@ -47,7 +47,7 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_mainwindow_kde.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #else KviTalMainWindow::KviTalMainWindow(QWidget * par,const char * nam) @@ -69,7 +69,7 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_mainwindow_qt.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #endif diff --git a/src/kvilib/tal/kvi_tal_mainwindow.h b/src/kvilib/tal/kvi_tal_mainwindow.h index 7230ce4fc..e2883133e 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.h +++ b/src/kvilib/tal/kvi_tal_mainwindow.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_tal_mainwindow_kde.h" #else #include "kvi_tal_mainwindow_qt.h" diff --git a/src/kvilib/tal/kvi_tal_menubar.cpp b/src/kvilib/tal/kvi_tal_menubar.cpp index 5b535ed9b..e088861ae 100644 --- a/src/kvilib/tal/kvi_tal_menubar.cpp +++ b/src/kvilib/tal/kvi_tal_menubar.cpp @@ -25,7 +25,7 @@ #include "kvi_tal_menubar.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviTalMenuBar::KviTalMenuBar(QWidget * par,const char * nam) : KMenuBar(par) @@ -39,7 +39,7 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_menubar_kde.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #else @@ -54,6 +54,6 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_menubar_qt.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #endif diff --git a/src/kvilib/tal/kvi_tal_menubar.h b/src/kvilib/tal/kvi_tal_menubar.h index fc6e41d97..5b4c3d32f 100644 --- a/src/kvilib/tal/kvi_tal_menubar.h +++ b/src/kvilib/tal/kvi_tal_menubar.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_tal_menubar_kde.h" #else #include "kvi_tal_menubar_qt.h" diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp index 4cc8ac05d..53b897ff3 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.cpp +++ b/src/kvilib/tal/kvi_tal_toolbar.cpp @@ -24,7 +24,7 @@ #include "kvi_tal_toolbar.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviTalToolBar::KviTalToolBar(const QString &label,QMainWindow *w,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) : KToolBar(nam,w,dock,bNewLine) { @@ -37,7 +37,7 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_toolbar_kde.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #else KviTalToolBar::KviTalToolBar(const QString &label,QMainWindow *w,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) @@ -86,6 +86,6 @@ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_toolbar_qt.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #endif diff --git a/src/kvilib/tal/kvi_tal_toolbar.h b/src/kvilib/tal/kvi_tal_toolbar.h index a81322b1e..b68b69923 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.h +++ b/src/kvilib/tal/kvi_tal_toolbar.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_tal_toolbar_kde.h" #else #include "kvi_tal_toolbar_qt.h" diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 215394586..69a1e8555 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -46,7 +46,7 @@ #include <stdlib.h> // for getenv() #include <unistd.h> // for symlink() <-- unused ? - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT #include <kconfig.h> #include <KConfigGroup> // #include <kstddirs.h> @@ -541,7 +541,7 @@ void KviApp::findGlobalKvircDirectory() // because of strange distributions or KDEDIRS // I do it in that way... /* does not work with kde4... - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT // KDE compilation ... // The things usually go installed into $KDEDIR/share/apps/kvirc/$VERSION_BRANCH // Look in the main KDE directory @@ -594,7 +594,7 @@ void KviApp::findGlobalKvircDirectory() if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT for(int k=0;usualKvircGlobalDir[k] != 0;k++){ m_szGlobalKvircDir = QDir::homePath(); m_szGlobalKvircDir+= "/.kde"; @@ -602,7 +602,7 @@ void KviApp::findGlobalKvircDirectory() m_szGlobalKvircDir+= KVIRC_VERSION_BRANCH; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_KDE3_SUPPORT */ m_szGlobalKvircDir=""; @@ -610,7 +610,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_KDE3_SUPPORT KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\ "The usual path for this directory is $KDEDIR/share/apps/kvirc.\n"\ "Are you sure that 'make install' worked correctly ?\n"\ @@ -625,7 +625,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(COMPILE_ON_MAC) + #else //!defined(COMPILE_KDE3_SUPPORT) && !defined(COMPILE_ON_MAC) 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"\ @@ -643,7 +643,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_KDE3_SUPPORT if(m_szConfigFile.isEmpty()) { // don't do that if user supplied a config file :) KConfig * cfg = new KConfig("kvirc"); @@ -663,7 +663,7 @@ bool KviApp::findLocalKvircDirectory() } } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(KviFileUtils::fileExists(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable")) { @@ -829,7 +829,7 @@ void KviApp::saveKvircDirectory() #else //!COMPILE_ON_WINDOWS */ // Here we save the local directory path -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT // In KDE we use the application config file if(m_szConfigFile.isEmpty()) { @@ -847,7 +847,7 @@ void KviApp::saveKvircDirectory() } } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT // In NON-KDE we use $HOME/.kvirc.rc or $HOME/kvirc.ini QString szF = QDir::homePath(); if(!m_szConfigFile.isEmpty()) diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index 523962e31..e1530e1a5 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -33,7 +33,7 @@ #include "kvi_msgbox.h" #include "kvi_buildinfo.h" #ifdef COMPILE_DBUS_SUPPORT -#ifndef COMPILE_KDE_SUPPORT // 'cause kde adds an interface itself +#ifndef COMPILE_KDE3_SUPPORT // 'cause kde adds an interface itself #include "kvi_dbusadaptor.h" #endif #endif @@ -45,7 +45,7 @@ #include <QMessageBox> -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include <kcmdlineargs.h> #endif @@ -317,13 +317,13 @@ int main(int argc,char ** argv) if(retCode != KVI_ARGS_RETCODE_OK)return ((retCode == KVI_ARGS_RETCODE_ERROR) ? (-1) : 0); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KCmdLineArgs::init(argc,argv,"kvirc","noway",ki18n("KVIrc"),KVI_VERSION); #endif // Need to have the X socket open before IPC startup KviApp * theApp = new KviApp(argc,argv); #ifdef COMPILE_DBUS_SUPPORT -#ifndef COMPILE_KDE_SUPPORT +#ifndef COMPILE_KDE3_SUPPORT new KviDbusAdaptor(theApp); QDBusConnection::sessionBus().registerObject("/MainApplication", theApp); #endif diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index d6356da5f..78bae37b1 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -323,7 +323,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]= #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #define RUN_THE_BROWSER "run \"cmd.exe /c start \\\"\\\" \\\"$0\\\"\"" #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT #define RUN_THE_BROWSER "run kfmclient openURL $0" #else #ifdef COMPILE_ON_MAC diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp index d8fb00d3b..36f6bd391 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp @@ -947,7 +947,7 @@ namespace KviKvsCoreFunctions #ifndef COMPILE_NO_IPC "IPC", #endif - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT "KDE", #endif #ifdef COMPILE_OSS_SUPPORT diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 8dd20642c..4df727ff0 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -256,7 +256,7 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e) if(!bDone) a = addWidget(m_pDraggedChild); a->setVisible(true); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT // bleah :///// //insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx); addWidget(m_pDraggedChild); @@ -462,7 +462,7 @@ void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt) if(!bDone) a = addWidget(child); a->setVisible(true); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT // bleah :///// // not sure if i'm losing anythig from insertWidget(-1,child->width(),child,idx); addWidget(child); @@ -580,7 +580,7 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) QAction * pActionForMovedChild = actionForWidget(m_pMovedChild); if(pActionForMovedChild) pActionForMovedChild->setVisible(false); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT // bleah :///// // muarghh //insertWidget(-1,m_pMovedChild->width(),m_pMovedChild,0); diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 9e61ef691..48c1f627f 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -134,7 +134,7 @@ bool KviFileDialog::askForSaveFileName(QString & szBuffer, const QString & szCap // 190 pDialog->setFileMode(KviTalFileDialog::AnyFile); //pDialog->setShowHiddenFiles(showHidden); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT pDialog->setKeepLocation(true); #endif while(pDialog->exec() == QDialog::Accepted) @@ -192,7 +192,7 @@ bool KviFileDialog::askForDirectoryName(QString & szBuffer, const QString & szCa return !szBuffer.isEmpty(); } #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT // the KDE based dir selection dialog is now quite nice szBuffer = KFileDialog::getExistingDirectory(szInitial,pParent,szCaption); return !szBuffer.isEmpty(); diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index cf7eea511..ee6991b90 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -310,7 +310,7 @@ void KviMenuBar::setupToolsPopup() // moved the old tools here m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,SLOT(showIconWidget())); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT int id; id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,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 d7267f1ad..1adb3e087 100644 --- a/src/kvirc/ui/kvi_msgbox.cpp +++ b/src/kvirc/ui/kvi_msgbox.cpp @@ -28,7 +28,7 @@ #include "kvi_locale.h" // FIXME: #warning "This should go into TAL as layer ...then maybe a wrapper in KviApp!" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include <kmessagebox.h> #else #include <QMessageBox> @@ -45,7 +45,7 @@ namespace KviMessageBox QString s; KviQString::vsprintf(s,fmt,list); kvi_va_end(list); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KMessageBox::error(0,s,"KVIrc"); #else QMessageBox::warning(0,"KVIrc",s); @@ -59,7 +59,7 @@ namespace KviMessageBox QString s; KviQString::vsprintf(s,fmt,list); kvi_va_end(list); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KMessageBox::information(0,s,"KVIrc"); #else QMessageBox::information(0,"KVIrc",s); @@ -74,7 +74,7 @@ namespace KviMessageBox KviQString::vsprintf(s,fmt,list); kvi_va_end(list); bool bRet; -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT bRet = (KMessageBox::questionYesNo(0,s,caption) == KMessageBox::Yes); #else bRet = (QMessageBox::information(0,caption,s, diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index bdbe62677..4a32fc207 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -73,7 +73,7 @@ #include "kvi_cryptcontroller.h" #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT // #include <kwin.h> #include <kdeversion.h> #endif @@ -226,7 +226,7 @@ void KviWindow::demandAttention() fwi.dwTimeout = 500; FlashWindowEx(&fwi); #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT #if (KDE_VERSION_MAJOR >= 3) && (KDE_VERSION_MINOR >= 2) KWin::demandAttention(frame()->winId(),true); #endif @@ -243,7 +243,7 @@ void KviWindow::demandAttention() fwi.dwTimeout = 500; FlashWindowEx(&fwi); #else - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT #if (KDE_VERSION_MAJOR >= 3) && (KDE_VERSION_MINOR >= 2) KWin::demandAttention(winId(),true); #endif diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index e13689ae7..c2702665b 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -505,7 +505,7 @@ void KviKvsCallbackFileDialog::done(int code) if(code == QDialog::Accepted) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT if(mode() == KFile::ExistingOnly) #else if(fileMode() == QFileDialog::ExistingFiles) diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 76530efb0..887f50f6f 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -52,13 +52,13 @@ #include <QHeaderView> -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include <kurl.h> #include <krun.h> #include <kmimetype.h> #include <kmimetypetrader.h> #include <kiconloader.h> -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT #ifdef COMPILE_PSEUDO_TRANSPARENCY extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground; @@ -410,18 +410,18 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo tmp += "</nobr><br>"; } -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT tmp += "<nobr>Mime: "; tmp += KMimeType::findByPath(szFile)->name(); tmp += "</nobr>"; -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT QLabel * l = new QLabel(tmp,m_pLocalFilePopup); QPalette p; l->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); m_pLocalFilePopup->insertItem(l); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT QString mimetype = KMimeType::findByPath(szFile)->name(); KService::List offers = KMimeTypeTrader::self()->query(mimetype,"Application"); @@ -454,7 +454,7 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,SLOT(openLocalFileFolder())); m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT //-| Grifisx & Noldor |- #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -526,7 +526,7 @@ KviFileTransfer * KviFileTransferWindow::selectedTransfer() void KviFileTransferWindow::openFilePopupActivated(int id) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT int ip = m_pOpenFilePopup->itemParameter(id); if(ip < 0)return; QString txt = m_pOpenFilePopup->text(id); @@ -553,7 +553,7 @@ void KviFileTransferWindow::openFilePopupActivated(int id) break; } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT } void KviFileTransferWindow::openLocalFileTerminal() @@ -573,7 +573,7 @@ void KviFileTransferWindow::openLocalFileTerminal() system(tmp.toLocal8Bit().data()); #else // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -587,7 +587,7 @@ void KviFileTransferWindow::openLocalFileTerminal() tmp.append("\""); KRun::runCommand(tmp,g_pFrame); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_KDE3_SUPPORT #endif } @@ -624,7 +624,7 @@ void KviFileTransferWindow::openLocalFile() ShellExecute(0,"open",tmp.toLocal8Bit().data(),NULL,NULL,SW_SHOWNORMAL); //You have to link the shell32.lib #else // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -644,7 +644,7 @@ void KviFileTransferWindow::openLocalFile() lst.append(url); KRun::run(*offer, lst, g_pFrame); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_KDE3_SUPPORT #endif } @@ -661,7 +661,7 @@ void KviFileTransferWindow::openLocalFileWith() WinExec(tmp.toLocal8Bit().data(),SW_SHOWNORMAL); #else // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -672,7 +672,7 @@ void KviFileTransferWindow::openLocalFileWith() url.setPath(tmp); lst.append(url); KRun::displayOpenWithDialog(lst,g_pFrame); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_KDE3_SUPPORT #endif } @@ -699,7 +699,7 @@ void KviFileTransferWindow::openLocalFileFolder() WinExec(tmp.toLocal8Bit().data(), SW_MAXIMIZE); #else // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -718,7 +718,7 @@ void KviFileTransferWindow::openLocalFileFolder() url.setPath(tmp); lst.append(url); KRun::run(*offer,lst,g_pFrame); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_KDE3_SUPPORT #endif } diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp index e958e8fc5..e22e3b39f 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.cpp +++ b/src/modules/mediaplayer/mp_amarokinterface.cpp @@ -193,4 +193,4 @@ bool KviAmarokInterface::playMrl(const QString &mrl) } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h index df6b569b2..41c79856e 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.h +++ b/src/modules/mediaplayer/mp_amarokinterface.h @@ -71,6 +71,6 @@ MP_DECLARE_DESCRIPTOR(KviAmarokInterface) -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT #endif //!_MP_AMAROKINTERFACE_H_ diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp index e21d53809..3bf1e7cd5 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.cpp +++ b/src/modules/mediaplayer/mp_dcopinterface.cpp @@ -221,4 +221,4 @@ bool KviMediaPlayerDCOPInterface::startApp(const QString &szApp,int iWaitMSecs) } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT diff --git a/src/modules/mediaplayer/mp_dcopinterface.h b/src/modules/mediaplayer/mp_dcopinterface.h index eea0f0f06..d371ed009 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.h +++ b/src/modules/mediaplayer/mp_dcopinterface.h @@ -52,6 +52,6 @@ protected: bool boolRetDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,bool &ret); }; -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT #endif //!_MP_DCOPINTERFACE_H_ diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp index 184d8f5d6..63df2d00a 100644 --- a/src/modules/mediaplayer/mp_jukinterface.cpp +++ b/src/modules/mediaplayer/mp_jukinterface.cpp @@ -181,4 +181,4 @@ bool KviJukInterface::playMrl(const QString &mrl) } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h index bee81513b..e7ee934ab 100644 --- a/src/modules/mediaplayer/mp_jukinterface.h +++ b/src/modules/mediaplayer/mp_jukinterface.h @@ -72,6 +72,6 @@ MP_DECLARE_DESCRIPTOR(KviJukInterface) -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT #endif //!_MP_JUKINTERFACE_H_ diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp index 333ee5805..6e3ac17b7 100644 --- a/src/modules/notifier/notifiermessage.cpp +++ b/src/modules/notifier/notifiermessage.cpp @@ -39,7 +39,7 @@ #include <windows.h> #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include <netwm.h> #endif */ diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index ad0a6be3a..79b8eb8be 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -61,14 +61,14 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT createLayout(); #else createLayout(); #endif m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency); - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT mergeTip(m_pUseTransparencyBoolSelector, __tr2qs_ctx("<center>This option makes all KVIrc windows look " \ "transparent.<br>You must choose a blending " \ @@ -94,7 +94,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),c,SLOT(setEnabled(bool))); // addRowSpacer(0,13,0,13); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT m_pObtainBackgroundFromKdeBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use KDE desktop for transparency","options"),KviOption_boolObtainGlobalBackgroundFromKde, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,SLOT(setEnabled(bool))); @@ -108,11 +108,11 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p layout()->setRowStretch(6,1); connect(m_pObtainBackgroundFromKdeBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool))); -#else //!COMPILE_KDE_SUPPORT +#else //!COMPILE_KDE3_SUPPORT m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); layout()->setRowStretch(4,1); -#endif //!COMPILE_KDE_SUPPORT +#endif //!COMPILE_KDE3_SUPPORT connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool))); connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); #else @@ -128,7 +128,7 @@ KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget() void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pObtainBackgroundFromKdeBoolSelector->isChecked())); #else m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked()); @@ -139,7 +139,7 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bool) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT m_pUpdateKdeBackgroundOnChangeBoolSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && m_pObtainBackgroundFromKdeBoolSelector->isChecked()); #endif #endif diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h index 83b0a1004..40521cef9 100644 --- a/src/modules/options/optw_interfacelookglobal.h +++ b/src/modules/options/optw_interfacelookglobal.h @@ -60,7 +60,7 @@ protected: #ifdef COMPILE_PSEUDO_TRANSPARENCY KviPixmapSelector * m_pGlobalBackgroundPixmapSelector; KviBoolSelector * m_pUseTransparencyBoolSelector; - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_KDE3_SUPPORT KviBoolSelector * m_pObtainBackgroundFromKdeBoolSelector; KviBoolSelector * m_pUpdateKdeBackgroundOnChangeBoolSelector; #endif diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index d488637a6..5aaa74c25 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -70,7 +70,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent) "Some actions of the target user (e.g. joins and parts) " \ "will be displayed in the window.<br></center>","options")); -#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW)) +#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE3_SUPPORT) || defined(COMPILE_ON_MINGW)) b = addBoolSelector(0,3,1,3,__tr2qs_ctx("Flash system taskbar on new query message","options"),KviOption_boolFlashQueryWindowOnNewMessages); mergeTip(b, __tr2qs_ctx("<center>This option causes the system taskbar entry for KVIrc to flash when a new query message " \ diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 9466f1bb5..c2b5e36a8 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -507,7 +507,7 @@ KviSetupWizard::KviSetupWizard() m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox); m_pCreateUrlHandlers->setChecked(true); #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT m_pCreateDesktopShortcut = new QCheckBox(__tr2qs("Create desktop shortcut"),m_pDesktopIntegration->m_pVBox); m_pCreateDesktopShortcut->setChecked(true); #endif @@ -851,7 +851,7 @@ void KviSetupWizard::makeLink() CoUninitialize(); #endif //COMPILE_ON_WINDOWS -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT QString tmp = QDir::homePath(); KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); tmp.append("Desktop"); @@ -870,7 +870,7 @@ void KviSetupWizard::makeLink() "X-KDE-SubstituteUID=false\n"; KviFileUtils::writeFile(tmp,contents,false); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT } @@ -1016,7 +1016,7 @@ void KviSetupWizard::accept() symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),QTextCodec::codecForLocale()->fromUnicode(localPath).data()); #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT if(m_pCreateDesktopShortcut->isChecked()) makeLink(); #endif diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index fbb3e178b..ba3f11f0b 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -427,18 +427,18 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalTreeWidgetItem *it,const QPo tmp += "</nobr><br>"; } -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT tmp += "<nobr>Mime: "; tmp += KMimeType::findByPath(szFile)->name(); tmp += "</nobr>"; -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT QLabel * l = new QLabel(tmp,m_pLocalFilePopup); QPalette p; m_pLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); m_pLocalFilePopup->insertItem(l); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT QString mimetype = KMimeType::findByPath(szFile)->name(); KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application"); @@ -467,7 +467,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalTreeWidgetItem *it,const QPo m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,SLOT(openLocalFileFolder())); m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard())); m_pContextPopup->insertItem(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup); @@ -511,7 +511,7 @@ KviSharedFiles * KviSharedFilesWindow::selectedTransfer() void KviSharedFilesWindow::openFilePopupActivated(int id) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT int ip = m_pOpenFilePopup->itemParameter(id); if(ip < 0)return; QString txt = m_pOpenFilePopup->text(id); @@ -537,12 +537,12 @@ void KviSharedFilesWindow::openFilePopupActivated(int id) break; } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT } void KviSharedFilesWindow::openLocalFileTerminal() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -556,12 +556,12 @@ void KviSharedFilesWindow::openLocalFileTerminal() tmp.append("\""); KRun::runCommand(tmp); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT } void KviSharedFilesWindow::openLocalFile() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -580,12 +580,12 @@ void KviSharedFilesWindow::openLocalFile() url.setPath(tmp); lst.append(url); KRun::run(*offer, lst); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT } void KviSharedFilesWindow::openLocalFileWith() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -596,7 +596,7 @@ void KviSharedFilesWindow::openLocalFileWith() url.setPath(tmp); lst.append(url); KRun::displayOpenWithDialog(lst); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT } void KviSharedFilesWindow::copyLocalFileToClipboard() @@ -613,7 +613,7 @@ void KviSharedFilesWindow::copyLocalFileToClipboard() void KviSharedFilesWindow::openLocalFileFolder() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -632,7 +632,7 @@ void KviSharedFilesWindow::openLocalFileFolder() url.setPath(tmp); lst.append(url); KRun::run(*offer, lst); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT } void KviSharedFilesWindow::heartbeat() diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index 3f948aadb..a9268b2ac 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -178,4 +178,4 @@ #include "termwidget.moc" -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_KDE3_SUPPORT diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp index fbb1a3ad4..7f72cd3cc 100644 --- a/src/modules/torrent/libkvitorrent.cpp +++ b/src/modules/torrent/libkvitorrent.cpp @@ -832,7 +832,7 @@ static bool torrent_module_init(KviModule *m) #ifdef COMPILE_KDE3_SUPPORT g_pDescriptorList->append(new KviKTorrentDCOPInterfaceDescriptor); -#endif // COMPILE_KDE_SUPPORT +#endif // COMPILE_KDE3_SUPPORT KviTorrentInterface::select(0); |