summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kgpg/popuppublic.cpp6
-rw-r--r--kmilo/kmilod/defaultskin.cpp4
-rw-r--r--tdefilereplace/tdefilereplacepart.cpp4
-rw-r--r--tdewallet/tdewalletmanager.cpp7
4 files changed, 0 insertions, 21 deletions
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index 5e0432c..eeebd4b 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -38,9 +38,7 @@
#include <tdeprocio.h>
#include <tdelocale.h>
#include <tdeaccel.h>
-#if KDE_IS_VERSION( 3, 2, 90 )
#include <tdelistviewsearchline.h>
-#endif
#include <kactivelabel.h>
#include <tdeaction.h>
#include <kdebug.h>
@@ -117,7 +115,6 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
//hBar->setFrameStyle(TQFrame::NoFrame);
hBar->setMargin(0);
-#if KDE_IS_VERSION( 3, 2, 90 )
TQToolButton *clearSearch = new TQToolButton(hBar);
clearSearch->setTextLabel(i18n("Clear Search"), true);
clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left"
@@ -125,16 +122,13 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
(void) new TQLabel(i18n("Search: "),hBar);
TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar);
connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear()));
-#endif
keysList = new TDEListView( page );
keysList->addColumn(i18n("Name"));
keysList->addColumn(i18n("Email"));
keysList->addColumn(i18n("ID"));
-#if KDE_IS_VERSION( 3, 2, 90 )
listViewSearch->setListView(keysList);
-#endif
keysList->setRootIsDecorated(false);
page->setMinimumSize(540,200);
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 156f2ac..af96dee 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -96,11 +96,7 @@ void DefaultSkin::clear() {
void DefaultSkin::show() {
-#if KDE_IS_VERSION(3,1,90)
TQRect r = TDEGlobalSettings::splashScreenDesktopGeometry();
-#else
- TQRect r = TQApplication::desktop()->geometry();
-#endif
// _label->resize(_label->minimumSizeHint());
// _widget->resize(_label->minimumSizeHint());
_widget->move(r.center() -
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index c3c4b82..7224849 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -719,11 +719,7 @@ void TDEFileReplacePart::loadFiltersList()
TQStringList filtersEntryList;
m_config->setGroup("Filters");
- #if KDE_IS_VERSION(3,1,3)
filtersEntryList = m_config->readPathListEntry(rcFiltersList);
- #else
- filtersEntryList = m_config->readListEntry(rcFiltersList);
- #endif
if(filtersEntryList.isEmpty())
filtersEntryList.append("*.htm;*.html;*.xml;*.xhtml;*.css;*.js;*.php");
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 621bd60..16312cb 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -409,14 +409,7 @@ void TDEWalletManager::closeAllWallets() {
TQPixmap TDEWalletManager::loadSystemTrayIcon(const TQString &icon) {
-#if KDE_IS_VERSION(3, 1, 90)
return KSystemTray::loadIcon(icon);
-#else
- TDEConfig *appCfg = tdeApp->config();
- TDEConfigGroupSaver configSaver(appCfg, "System Tray");
- int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
- return tdeApp->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
-#endif
}