diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-24 15:29:11 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-24 15:29:11 -0600 |
commit | b7d96aa82b20eafeecf272bd2b8eb59e9ca45d77 (patch) | |
tree | 31cd0dfbcd812303cb707e37614c5a8bc86afd00 /src/modules | |
parent | 2b0f7501a0f64a3eac41fffc6256714aba7693c2 (diff) | |
download | kvirc-b7d96aa82b20eafeecf272bd2b8eb59e9ca45d77.tar.gz kvirc-b7d96aa82b20eafeecf272bd2b8eb59e9ca45d77.zip |
Set COMPILE_TDE_SUPPORT instead of COMPILE_KDE_SUPPORT
Diffstat (limited to 'src/modules')
26 files changed, 84 insertions, 84 deletions
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 40804790..09072570 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -505,7 +505,7 @@ void KviKvsCallbackFileDialog::done(int code) if(code == TQDialog::Accepted) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT if(mode() == KFile::ExistingOnly) #else if(mode() == TQFileDialog::ExistingFiles) diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index ce454b2b..169c8279 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -42,7 +42,7 @@ #include "libkvidockwidget.h" #include "kvi_doublebuffer.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <twin.h> #include <kpopupmenu.h> #else @@ -126,7 +126,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) #ifndef COMPILE_USE_QT4 setBackgroundMode(X11ParentRelative); #endif - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT KWin::setSystemTrayWindowFor(winId(),frm->winId()); #endif #endif //!COMPILE_ON_WINDOWS @@ -140,7 +140,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) m_pAwayPopup = new KviTalPopupMenu(this); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT m_pContextPopup = new KPopupMenu(this); m_pContextPopup->insertTitle(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("KVIrc")); #else @@ -301,13 +301,13 @@ static const char * idlemsgs[NIDLEMSGS]= __tr("idle idle idle idle!") }; -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT extern Time qt_x_time; #endif void KviDockWidget::enterEvent( TQEvent* ) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT if(!g_pApp->focusWidget()) { XEvent ev; diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.h b/src/modules/dockwidget/libkvidockwidget_qt3.h index b30aca10..5003057f 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.h +++ b/src/modules/dockwidget/libkvidockwidget_qt3.h @@ -23,7 +23,7 @@ #include "kvi_frame.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT class KPopupMenu; #else class KviTalPopupMenu; @@ -48,7 +48,7 @@ public: protected: KviFrame * m_pFrm; KviDynamicToolTip * m_pTip; -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KPopupMenu * m_pContextPopup; #else KviTalPopupMenu * m_pContextPopup; diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 0990e176..fba72c1c 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -53,12 +53,12 @@ #include <tqfontmetrics.h> #include <tqevent.h> -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <kurl.h> #include <krun.h> #include <kuserprofile.h> #include <kmimetype.h> -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT extern KviFileTransferWindow * g_pFileTransferWindow; @@ -317,17 +317,17 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo tmp += "</nobr><br>"; } -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT tmp += "<nobr>Mime: "; tmp += KMimeType::findByPath(szFile)->name(); tmp += "</nobr>"; -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT TQLabel * l = new TQLabel(tmp,m_pLocalFilePopup); l->setFrameStyle(TQFrame::Raised | TQFrame::Panel); m_pLocalFilePopup->insertItem(l); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT TQString mimetype = KMimeType::findByPath(szFile)->name(); KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application"); @@ -357,7 +357,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder())); m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT //-| Grifisx & Noldor |- #ifdef COMPILE_ON_WINDOWS @@ -423,7 +423,7 @@ KviFileTransfer * KviFileTransferWindow::selectedTransfer() void KviFileTransferWindow::openFilePopupActivated(int id) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT int ip = m_pOpenFilePopup->itemParameter(id); if(ip < 0)return; TQString txt = m_pOpenFilePopup->text(id); @@ -449,7 +449,7 @@ void KviFileTransferWindow::openFilePopupActivated(int id) break; } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } void KviFileTransferWindow::openLocalFileTerminal() @@ -470,7 +470,7 @@ void KviFileTransferWindow::openLocalFileTerminal() system(tmp.local8Bit().data()); #else //COMPILE_ON_WINDOWS // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -484,7 +484,7 @@ void KviFileTransferWindow::openLocalFileTerminal() tmp.append("\""); KRun::runCommand(tmp); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT #endif //!COMPILE_ON_WINDOWS } @@ -522,7 +522,7 @@ void KviFileTransferWindow::openLocalFile() ShellExecute(0,"open",tmp.local8Bit().data(),NULL,NULL,SW_SHOWNORMAL); //You have to link the shell32.lib #else //!COMPILE_ON_WINDOWS // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -541,7 +541,7 @@ void KviFileTransferWindow::openLocalFile() url.setPath(tmp); lst.append(url); KRun::run(*offer, lst); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT #endif //!COMPILE_ON_WINDOWS } @@ -558,7 +558,7 @@ void KviFileTransferWindow::openLocalFileWith() WinExec(tmp.local8Bit().data(),SW_SHOWNORMAL); #else //!COMPILE_ON_WINDOWS // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -569,7 +569,7 @@ void KviFileTransferWindow::openLocalFileWith() url.setPath(tmp); lst.append(url); KRun::displayOpenWithDialog(lst); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT #endif //!COMPILE_ON_WINDOWS } @@ -603,7 +603,7 @@ void KviFileTransferWindow::openLocalFileFolder() WinExec(tmp.local8Bit().data(), SW_MAXIMIZE); #else //!COMPILE_ON_WINDOWS // G&N end - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT KviFileTransfer * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -622,7 +622,7 @@ void KviFileTransferWindow::openLocalFileFolder() url.setPath(tmp); lst.append(url); KRun::run(*offer, lst); - #endif //COMPILE_KDE_SUPPORT + #endif //COMPILE_TDE_SUPPORT #endif //!COMPILE_ON_WINDOWS } diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index 5c04bdc8..216c11b4 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1615,7 +1615,7 @@ static bool mediaplayer_module_init( KviModule * m ) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface)); #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmarokInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviJukInterface)); #endif diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp index 7bbfa927..7a458b2e 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.cpp +++ b/src/modules/mediaplayer/mp_amarokinterface.cpp @@ -24,7 +24,7 @@ #include "mp_amarokinterface.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "kvi_app.h" @@ -186,4 +186,4 @@ bool KviAmarokInterface::playMrl(const TQString &mrl) } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h index 6dcfec6c..6e0994f2 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.h +++ b/src/modules/mediaplayer/mp_amarokinterface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "kvi_dcophelper.h" #include "mp_interface.h" @@ -71,6 +71,6 @@ MP_DECLARE_DESCRIPTOR(KviAmarokInterface) -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT #endif //!_MP_AMAROKINTERFACE_H_ diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp index 1f18b3af..639c0757 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.cpp +++ b/src/modules/mediaplayer/mp_dcopinterface.cpp @@ -24,7 +24,7 @@ #include "mp_dcopinterface.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "dcopclient.h" @@ -221,4 +221,4 @@ bool KviMediaPlayerDCOPInterface::startApp(const TQString &szApp,int iWaitMSecs) } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT diff --git a/src/modules/mediaplayer/mp_dcopinterface.h b/src/modules/mediaplayer/mp_dcopinterface.h index 449f385c..97b49196 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.h +++ b/src/modules/mediaplayer/mp_dcopinterface.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "mp_interface.h" @@ -52,6 +52,6 @@ protected: bool boolRetDCOPCall(const KviTQCString &szObj,const KviTQCString &szFunc,bool &ret); }; -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT #endif //!_MP_DCOPINTERFACE_H_ diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp index 0be694cc..190b0aff 100644 --- a/src/modules/mediaplayer/mp_jukinterface.cpp +++ b/src/modules/mediaplayer/mp_jukinterface.cpp @@ -24,7 +24,7 @@ #include "mp_jukinterface.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "kvi_app.h" @@ -182,4 +182,4 @@ bool KviJukInterface::playMrl(const TQString &mrl) } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h index cde06ee8..61c5266e 100644 --- a/src/modules/mediaplayer/mp_jukinterface.h +++ b/src/modules/mediaplayer/mp_jukinterface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "kvi_dcophelper.h" #include "mp_interface.h" @@ -72,6 +72,6 @@ MP_DECLARE_DESCRIPTOR(KviJukInterface) -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT #endif //!_MP_JUKINTERFACE_H_ diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp index d57d2019..bec675df 100644 --- a/src/modules/notifier/notifiermessage.cpp +++ b/src/modules/notifier/notifiermessage.cpp @@ -40,7 +40,7 @@ #include <windows.h> #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <netwm.h> #endif */ diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index e5d0cd53..fe27dbd6 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -58,7 +58,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT createLayout(7,2); #else createLayout(5,2); @@ -66,7 +66,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency); #ifdef COMPILE_INFO_TIPS - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT mergeTip(m_pUseTransparencyBoolSelector, __tr2qs_ctx("<center>This option makes all KVIrc windows look " \ "transparent.<br>You must choose a blending " \ @@ -93,7 +93,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool))); // addRowSpacer(0,13,0,13); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_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,TQT_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQT_SLOT(setEnabled(bool))); @@ -107,11 +107,11 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * layout()->setRowStretch(6,1); connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); -#else //!COMPILE_KDE_SUPPORT +#else //!COMPILE_TDE_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_TDE_SUPPORT connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); #else @@ -127,7 +127,7 @@ KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget() void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pObtainBackgroundFromKdeBoolSelector->isChecked())); #else m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked()); @@ -138,7 +138,7 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bool) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_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 3b20e1d3..62a55176 100644 --- a/src/modules/options/optw_interfacelookglobal.h +++ b/src/modules/options/optw_interfacelookglobal.h @@ -61,7 +61,7 @@ protected: #ifdef COMPILE_PSEUDO_TRANSPARENCY KviPixmapSelector * m_pGlobalBackgroundPixmapSelector; KviBoolSelector * m_pUseTransparencyBoolSelector; - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_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 dfaca3bb..99403932 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -30,7 +30,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <tdeversion.h> #endif @@ -79,7 +79,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent) "will be displayed in the window.<br></center>","options")); #endif -#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_KDE_SUPPORT) && (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)) +#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_TDE_SUPPORT) && (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)) b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Flash system taskbar on new query message","options"),KviOption_boolFlashQueryWindowOnNewMessages); #ifdef COMPILE_INFO_TIPS mergeTip(b, diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 1a8b5c4f..dd0e8a9b 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -504,7 +504,7 @@ KviSetupWizard::KviSetupWizard() m_pCreateUrlHandlers = new TQCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox); m_pCreateUrlHandlers->setChecked(true); #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT m_pCreateDesktopShortcut = new TQCheckBox(__tr2qs("Create desktop shortcut"),m_pDesktopIntegration->m_pVBox); m_pCreateDesktopShortcut->setChecked(true); #endif @@ -845,7 +845,7 @@ void KviSetupWizard::makeLink() CoUninitialize(); #endif //COMPILE_ON_WINDOWS -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT TQString tmp = TQDir::homeDirPath(); KviTQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); tmp.append("Desktop"); @@ -864,7 +864,7 @@ void KviSetupWizard::makeLink() "X-KDE-SubstituteUID=false\n"; KviFileUtils::writeFile(tmp,contents,false); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } @@ -1010,7 +1010,7 @@ void KviSetupWizard::accept() symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT if(m_pCreateDesktopShortcut->isChecked()) makeLink(); #endif diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index d4e59cba..728f80bd 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -415,17 +415,17 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi tmp += "</nobr><br>"; } -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT tmp += "<nobr>Mime: "; tmp += KMimeType::findByPath(szFile)->name(); tmp += "</nobr>"; -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT TQLabel * l = new TQLabel(tmp,m_pLocalFilePopup); l->setFrameStyle(TQFrame::Raised | TQFrame::Panel); m_pLocalFilePopup->insertItem(l); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT TQString mimetype = KMimeType::findByPath(szFile)->name(); KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application"); @@ -454,7 +454,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder())); m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,TQT_SLOT(copyLocalFileToClipboard())); m_pContextPopup->insertItem(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup); @@ -498,7 +498,7 @@ KviSharedFiles * KviSharedFilesWindow::selectedTransfer() void KviSharedFilesWindow::openFilePopupActivated(int id) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT int ip = m_pOpenFilePopup->itemParameter(id); if(ip < 0)return; TQString txt = m_pOpenFilePopup->text(id); @@ -524,12 +524,12 @@ void KviSharedFilesWindow::openFilePopupActivated(int id) break; } } -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } void KviSharedFilesWindow::openLocalFileTerminal() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -543,12 +543,12 @@ void KviSharedFilesWindow::openLocalFileTerminal() tmp.append("\""); KRun::runCommand(tmp); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } void KviSharedFilesWindow::openLocalFile() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -567,12 +567,12 @@ void KviSharedFilesWindow::openLocalFile() url.setPath(tmp); lst.append(url); KRun::run(*offer, lst); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } void KviSharedFilesWindow::openLocalFileWith() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -583,7 +583,7 @@ void KviSharedFilesWindow::openLocalFileWith() url.setPath(tmp); lst.append(url); KRun::displayOpenWithDialog(lst); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } void KviSharedFilesWindow::copyLocalFileToClipboard() @@ -600,7 +600,7 @@ void KviSharedFilesWindow::copyLocalFileToClipboard() void KviSharedFilesWindow::openLocalFileFolder() { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KviSharedFiles * t = selectedTransfer(); if(!t)return; TQString tmp = t->localFileName(); @@ -619,7 +619,7 @@ void KviSharedFilesWindow::openLocalFileFolder() url.setPath(tmp); lst.append(url); KRun::run(*offer, lst); -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT } void KviSharedFilesWindow::heartbeat() diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 879a2ae6..7a5f3c77 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -43,7 +43,7 @@ #include <unistd.h> #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <dcopclient.h> #endif @@ -468,7 +468,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) } } -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp index 66717cf1..ee2ab448 100644 --- a/src/modules/term/libkviterm.cpp +++ b/src/modules/term/libkviterm.cpp @@ -31,7 +31,7 @@ #include <tqsplitter.h> #include "kvi_pointerlist.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "termwidget.h" #include "termwindow.h" @@ -46,7 +46,7 @@ KviModule * g_pTermModule = 0; -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT KviPointerList<KviTermWidget> * g_pTermWidgetList = 0; KviPointerList<KviTermWindow> * g_pTermWindowList = 0; KviStr g_szKonsoleLibraryName = ""; @@ -77,7 +77,7 @@ KviModule * g_pTermModule = 0; static bool term_kvs_cmd_open(KviKvsModuleCommandCall * c) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT if(g_szKonsoleLibraryName.hasData()) { c->module()->lock(); // multiple locks are allowed @@ -103,7 +103,7 @@ static bool term_module_init(KviModule * m) { g_pTermModule = m; -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT g_pTermWidgetList = new KviPointerList<KviTermWidget>; g_pTermWidgetList->setAutoDelete(false); g_pTermWindowList = new KviPointerList<KviTermWindow>; @@ -144,7 +144,7 @@ static bool term_module_init(KviModule * m) static bool term_module_cleanup(KviModule *m) { -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT while(g_pTermWidgetList->first())delete g_pTermWidgetList->first(); delete g_pTermWidgetList; g_pTermWidgetList = 0; diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index 8b581c20..16bd8efd 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -33,7 +33,7 @@ #include <tqtooltip.h> #include <tqtimer.h> -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "klibloader.h" #include "kparts/part.h" @@ -176,4 +176,4 @@ TQSize KviTermWidget::sizeHint() const #include "termwidget.moc" -#endif //COMPILE_KDE_SUPPORT +#endif //COMPILE_TDE_SUPPORT diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h index 49d2e78d..6f30f753 100644 --- a/src/modules/term/termwidget.h +++ b/src/modules/term/termwidget.h @@ -24,7 +24,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <tqframe.h> #include <tqlabel.h> diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp index 0610a600..2abb6d84 100644 --- a/src/modules/term/termwindow.cpp +++ b/src/modules/term/termwindow.cpp @@ -22,7 +22,7 @@ #include "termwindow.h" #include "termwidget.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "kvi_iconmanager.h" diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h index fd38b23f..da41d17a 100644 --- a/src/modules/term/termwindow.h +++ b/src/modules/term/termwindow.h @@ -24,7 +24,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "kvi_window.h" diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp index 8ab218ab..78702290 100644 --- a/src/modules/torrent/libkvitorrent.cpp +++ b/src/modules/torrent/libkvitorrent.cpp @@ -831,9 +831,9 @@ static bool torrent_module_init(KviModule *m) g_pDescriptorList = new KviPointerList<KviTorrentInterfaceDescriptor>; g_pDescriptorList->setAutoDelete(true); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT g_pDescriptorList->append(new KviKTorrentDCOPInterfaceDescriptor); -#endif // COMPILE_KDE_SUPPORT +#endif // COMPILE_TDE_SUPPORT KviTorrentInterface::select(0); diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index d6047194..be2dea52 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -25,7 +25,7 @@ // //============================================================================= -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include "kvi_app.h" @@ -496,5 +496,5 @@ bool KviKTorrentDCOPInterface::setMaxDownloadSpeed(int kbytes_per_sec) #include "tc_ktorrentdcopinterface.moc" -#endif // COMPILE_KDE_SUPPORT +#endif // COMPILE_TDE_SUPPORT diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.h b/src/modules/torrent/tc_ktorrentdcopinterface.h index 5bd30597..7114f5c0 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.h +++ b/src/modules/torrent/tc_ktorrentdcopinterface.h @@ -31,7 +31,7 @@ #include "tc_interface.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include <kvi_dcophelper.h> @@ -127,6 +127,6 @@ private: TORR_DECLARE_DESCRIPTOR(KviKTorrentDCOPInterface) -#endif // COMPILE_KDE_SUPPORT +#endif // COMPILE_TDE_SUPPORT #endif // _TC_KTORRENTDCOPINTERFACE_H_ |