reverted defines

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2678 17fca916-40b9-46aa-a4ea-0a15b648b75c

16 files changed, 53 insertions, 53 deletions

diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index c2702665b..e13689ae7 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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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 887f50f6f..76530efb0 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -52,13 +52,13 @@
 
 #include <QHeaderView>
 
-#ifdef COMPILE_KDE3_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
 	#include <kurl.h>
 	#include <krun.h>
 	#include <kmimetype.h>
 	#include <kmimetypetrader.h>
 	#include <kiconloader.h>
-#endif //COMPILE_KDE3_SUPPORT
+#endif //COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
 				tmp += "<nobr>Mime: ";
 				tmp += KMimeType::findByPath(szFile)->name();
 				tmp += "</nobr>";
-#endif //COMPILE_KDE3_SUPPORT
+#endif //COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 }
 
 void KviFileTransferWindow::openLocalFileTerminal()
@@ -573,7 +573,7 @@ void KviFileTransferWindow::openLocalFileTerminal()
 	system(tmp.toLocal8Bit().data());
 #else
 // G&N end
-	#ifdef COMPILE_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+	#endif //COMPILE_KDE_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_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+	#endif //COMPILE_KDE_SUPPORT
 #endif
 }
 
@@ -661,7 +661,7 @@ void KviFileTransferWindow::openLocalFileWith()
 	WinExec(tmp.toLocal8Bit().data(),SW_SHOWNORMAL);
 #else
 // G&N end
-	#ifdef COMPILE_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+	#endif //COMPILE_KDE_SUPPORT
 #endif
 }
 
@@ -699,7 +699,7 @@ void KviFileTransferWindow::openLocalFileFolder()
 	WinExec(tmp.toLocal8Bit().data(), SW_MAXIMIZE);
 #else
 // G&N end
-	#ifdef COMPILE_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+	#endif //COMPILE_KDE_SUPPORT
 #endif
 }
 
diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp
index e22e3b39f..e958e8fc5 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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h
index 41c79856e..df6b569b2 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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 
 #endif //!_MP_AMAROKINTERFACE_H_
diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp
index 3bf1e7cd5..e21d53809 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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/mediaplayer/mp_dcopinterface.h b/src/modules/mediaplayer/mp_dcopinterface.h
index d371ed009..eea0f0f06 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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 
 #endif //!_MP_DCOPINTERFACE_H_
diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp
index 63df2d00a..184d8f5d6 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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h
index e7ee934ab..bee81513b 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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 
 #endif //!_MP_JUKINTERFACE_H_
diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp
index 6e3ac17b7..333ee5805 100644
--- a/src/modules/notifier/notifiermessage.cpp
+++ b/src/modules/notifier/notifiermessage.cpp
@@ -39,7 +39,7 @@
 	#include <windows.h>
 #endif
 
-#ifdef COMPILE_KDE3_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
 	#include <netwm.h>
 #endif
 */
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 79b8eb8be..ad0a6be3a 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_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_SUPPORT
 		createLayout();
 	#else
 		createLayout();
 	#endif
 
 	m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency);
-	#ifdef COMPILE_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#else //!COMPILE_KDE_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_KDE3_SUPPORT
+#endif //!COMPILE_KDE_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_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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 40521cef9..83b0a1004 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_KDE3_SUPPORT
+	#ifdef COMPILE_KDE_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 5aaa74c25..d488637a6 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_KDE3_SUPPORT) || defined(COMPILE_ON_MINGW))
+#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_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 c2b5e36a8..9466f1bb5 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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
 		if(m_pCreateDesktopShortcut->isChecked())
 			makeLink();
 #endif
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index ba3f11f0b..fbb3e178b 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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
 				tmp += "<nobr>Mime: ";
 				tmp += KMimeType::findByPath(szFile)->name();
 				tmp += "</nobr>";
-#endif //COMPILE_KDE3_SUPPORT
+#endif //COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_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_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 }
 
 void KviSharedFilesWindow::openLocalFileTerminal()
 {
-#ifdef COMPILE_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 }
 
 void KviSharedFilesWindow::openLocalFile()
 {
-#ifdef COMPILE_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 }
 
 void KviSharedFilesWindow::openLocalFileWith()
 {
-#ifdef COMPILE_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 }
 
 void KviSharedFilesWindow::copyLocalFileToClipboard()
@@ -613,7 +613,7 @@ void KviSharedFilesWindow::copyLocalFileToClipboard()
 
 void KviSharedFilesWindow::openLocalFileFolder()
 {
-#ifdef COMPILE_KDE3_SUPPORT
+#ifdef COMPILE_KDE_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_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
 }
 
 void KviSharedFilesWindow::heartbeat()
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index a9268b2ac..3f948aadb 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -178,4 +178,4 @@
 	
 	#include "termwidget.moc"
 
-#endif //COMPILE_KDE3_SUPPORT
+#endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 7f72cd3cc..fbb1a3ad4 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_KDE3_SUPPORT
+#endif // COMPILE_KDE_SUPPORT
 
 	KviTorrentInterface::select(0);