Remove use of TDE_VERSIONremove/tde-version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 0 insertions, 52 deletions

diff --git a/src/kqalculate.cpp b/src/kqalculate.cpp
index 87dbc6e..0d70c20 100644
--- a/src/kqalculate.cpp
+++ b/src/kqalculate.cpp
@@ -103,12 +103,8 @@
 #include <tqstringlist.h>
 #include <tqcombobox.h>
 #include <ksystemtray.h>
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR > 1
 #include <tdeactionclasses.h>
-#endif
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 4
 #include <tdeaccelmanager.h>
-#endif
 #include <tqbuttongroup.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
@@ -117,10 +113,7 @@
 #include <tqimage.h>
 #include <tdeaccel.h>
 #include <tdeio/netaccess.h>
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 2
 #include <kinputdialog.h>
-#endif
-#include <tdeversion.h>
 #include <tqstyle.h>
 #include <tdeglobalaccel.h>
 #include <kkeydialog.h>
@@ -190,22 +183,7 @@ const MathStructure *KQalculate::getResultPart(int i) {
 	return &result_parts[(size_t) i - 1];
 }
 
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2
-#include <kiconloader.h>
-#include <tdeconfig.h>
-TQPixmap loadSystrayIcon(const TQString &icon) {
-	TDEConfig *appCfg = tdeApp->config();
-	TDEConfigGroupSaver configSaver(appCfg, "System Tray");
-	int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
-	return TDEGlobal::instance()->iconLoader()->loadIcon(icon, TDEIcon::Panel, iconWidth);
-}
-#endif
-
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 3
 #define ICON_SIZE_SMALL_MEDIUM		TDEIcon::SizeSmallMedium
-#else
-#define ICON_SIZE_SMALL_MEDIUM		22
-#endif
 
 ModeObject::ModeObject(int mode) : i_mode(mode) {}
 void ModeObject::loadMode() {
@@ -454,12 +432,10 @@ KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl
 	keypadAngleLayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 	keypadFunctionsLayout->addMultiCellLayout(keypadAngleLayout, 4, 4, 0, 2);
 	
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 4	
 	TDEAcceleratorManager::setNoAccel(kpDegreesButton);
 	TDEAcceleratorManager::setNoAccel(kpRadiansButton);
 	TDEAcceleratorManager::setNoAccel(kpGradiansButton);
 	TDEAcceleratorManager::setNoAccel(kpNoAngleUnitButton);
-#endif		
 	
 	keypadBottomLayout->addLayout(keypadFunctionsLayout);
 	
@@ -957,15 +933,9 @@ void KQalculate::showSystemTrayIcon(bool do_show) {
 	if(do_show && !trayicon) {
 		trayicon = new KSystemTray(this);
 		TQObject::connect(trayicon, TQ_SIGNAL(quitSelected()), tqApp, TQ_SLOT(quit()));
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2	
-		trayicon->setPixmap(loadSystrayIcon(PACKAGE));
-#else
 		trayicon->setPixmap(trayicon->loadIcon(PACKAGE));
-#endif
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 2
 		TDEPopupMenu* traypop = trayicon->contextMenu();
 		ActionHideSystemTrayIcon->plug(traypop, 1);
-#endif
 		TQToolTip::add(trayicon, i18n("Qalculate! - Scientific Calculator"));
 	}
 	if(do_show) {
@@ -3898,11 +3868,7 @@ void KQalculate::execute() {
 bool KQalculate::fetch_exchange_rates(int) {
 	KURL url(CALCULATOR->getExchangeRatesUrl().c_str());
 	TQString filename(CALCULATOR->getExchangeRatesFileName().c_str());
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2
-	if(TDEIO::NetAccess::download(url, filename)) {
-#else
 	if(TDEIO::NetAccess::download(url, filename, this)) {
-#endif
 		return true;
 	} else {
 		TQString errorstr = i18n("Failed to download exchange rates from ECB.");
@@ -4022,23 +3988,13 @@ void KQalculate::showHide() {
 	if(isVisible()) {
 		hide();
 	} else {
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2			
-			KWin::Info info = KWin::info(winId());
-			KWin::setOnDesktop(winId(), KWin::currentDesktop());
-			move(info.geometry.topLeft());
-#else
 			KWin::WindowInfo info = KWin::windowInfo(winId(), (unsigned long) NET::WMGeometry);
 			KWin::setOnDesktop(winId(), KWin::currentDesktop());
 			move(info.geometry().topLeft());
-#endif						
 			setShown(true);
 			show();
 			raise();
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2
-			KWin::setActiveWindow(winId());
-#else
 			KWin::activateWindow(winId());
-#endif
 	}
 }
 void KQalculate::configureGlobalShortcuts() {
@@ -4821,7 +4777,6 @@ void KQalculate::saveModeAs() {
 	delete dialog;
 }
 void KQalculate::deleteMode() {
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 2
 	bool b_ok = false;
 	TQStringList mode_names;
 	for(size_t i = 2; i < modes.size(); i++) {
@@ -4845,7 +4800,6 @@ void KQalculate::deleteMode() {
 			}
 		}
 	}
-#endif
 }
 void KQalculate::saveMode() {
 	save_mode();
@@ -6521,24 +6475,18 @@ void QalculateParseLabel::drawContents(TQPainter *p) {
 QalculateButton::QalculateButton(TQWidget *parent, const char *name) : TQPushButton(parent, name) {
 	setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	umtcw = true;
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 4	
 	TDEAcceleratorManager::setNoAccel(this);
-#endif
 
 }
 QalculateButton::QalculateButton(const TQString &text, TQWidget *parent, const char *name) : TQPushButton(text, parent, name) {
 	setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	umtcw = true;
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 4	
 	TDEAcceleratorManager::setNoAccel(this);
-#endif	
 }
 QalculateButton::QalculateButton(const TQIconSet &icon, const TQString &text, TQWidget *parent, const char *name) : TQPushButton(icon, text, parent, name) {
 	setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	umtcw = true;
-#if TDE_VERSION_MAJOR > 3 || TDE_VERSION_MINOR >= 4	
 	TDEAcceleratorManager::setNoAccel(this);
-#endif	
 }
 QalculateButton::~QalculateButton() {}