diff options
| -rw-r--r-- | conduits/sysinfoconduit/sysinfo-conduit.cpp | 3 | ||||
| -rw-r--r-- | kpilot/addressWidget.cpp | 5 | ||||
| -rw-r--r-- | kpilot/logFile.cpp | 3 | ||||
| -rw-r--r-- | kpilot/logWidget.cpp | 3 | ||||
| -rw-r--r-- | kpilot/memoWidget.cpp | 1 | ||||
| -rw-r--r-- | kpilot/pilotDaemon.cpp | 7 | ||||
| -rw-r--r-- | kpilot/todoWidget.cpp | 5 | ||||
| -rw-r--r-- | lib/options.h | 1 |
8 files changed, 4 insertions, 24 deletions
diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cpp b/conduits/sysinfoconduit/sysinfo-conduit.cpp index 4289eac..41dfd98 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cpp +++ b/conduits/sysinfoconduit/sysinfo-conduit.cpp @@ -34,6 +34,7 @@ #include <tqfileinfo.h> #include <tqregexp.h> #include <tdeconfig.h> +#include <tdeversion.h> #include <kdebug.h> #include <pilotSysInfo.h> @@ -413,9 +414,7 @@ void SysInfoConduit::pcVersionInfo() .arg(TQString::fromLatin1(name.machine)); fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::fromLatin1(name.nodename)); } -#ifdef TDE_VERSION_STRING fValues[CSL1("tde")] = TQString::fromLatin1(TDE_VERSION_STRING); -#endif #ifdef TQT_VERSION_STR fValues[CSL1("tqt")] = TQString::fromLatin1(TQT_VERSION_STR); #endif diff --git a/kpilot/addressWidget.cpp b/kpilot/addressWidget.cpp index 2b418c4..5a6ab0b 100644 --- a/kpilot/addressWidget.cpp +++ b/kpilot/addressWidget.cpp @@ -183,14 +183,9 @@ void AddressWidget::hideComponent() << endl; #endif -#if TDE_VERSION<220 - s = i18n("There are still %1 address editing windows open.") - .arg(TQString::number(fPendingAddresses)); -#else s = i18n("There is still an address editing window open.", "There are still %n address editing windows open.", fPendingAddresses); -#endif return false; } diff --git a/kpilot/logFile.cpp b/kpilot/logFile.cpp index c22bdc3..aa25336 100644 --- a/kpilot/logFile.cpp +++ b/kpilot/logFile.cpp @@ -35,6 +35,7 @@ #include <tqdatetime.h> #include <pi-version.h> +#include <tdeversion.h> #ifndef PILOT_LINK_PATCH #define PILOT_LINK_PATCH "unknown" @@ -80,9 +81,7 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing( .arg(TQString()) #endif )<<endl; -#ifdef TDE_VERSION_STRING fLogStream<<(CSL1("Version: KDE %1" ).arg(TQString::fromLatin1(TDE_VERSION_STRING)) )<<endl; -#endif #ifdef TQT_VERSION_STR fLogStream<<(CSL1("Version: TQt %1" ).arg(TQString::fromLatin1(TQT_VERSION_STR)) )<<endl; #endif diff --git a/kpilot/logWidget.cpp b/kpilot/logWidget.cpp index f7596be..f62562f 100644 --- a/kpilot/logWidget.cpp +++ b/kpilot/logWidget.cpp @@ -49,6 +49,7 @@ #include <tdemessagebox.h> #include <pi-version.h> +#include <tdeversion.h> #ifndef PILOT_LINK_PATCH #define PILOT_LINK_PATCH "unknown" @@ -106,10 +107,8 @@ LogWidget::LogWidget(TQWidget * parent) : .arg(TQString()) #endif ); -#ifdef TDE_VERSION_STRING initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL) .arg(TQString::fromLatin1(TDE_VERSION_STRING))); -#endif #ifdef TQT_VERSION_STR initialText.append(CSL1("<b>Version:</b> TQt %1" TE_EOL) .arg(TQString::fromLatin1(TQT_VERSION_STR))); diff --git a/kpilot/memoWidget.cpp b/kpilot/memoWidget.cpp index 61d96d4..bf70584 100644 --- a/kpilot/memoWidget.cpp +++ b/kpilot/memoWidget.cpp @@ -51,7 +51,6 @@ #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdefiledialog.h> -#include <tdeversion.h> #include <ktextedit.h> #include "kpilot.h" diff --git a/kpilot/pilotDaemon.cpp b/kpilot/pilotDaemon.cpp index 2c99534..85e9349 100644 --- a/kpilot/pilotDaemon.cpp +++ b/kpilot/pilotDaemon.cpp @@ -1209,12 +1209,7 @@ void PilotDaemon::slotRunKPilot() int kpilotPID; if (TDEApplication::startServiceByDesktopName(CSL1("kpilot"), - TQString(), &kpilotError, &kpilotDCOP, &kpilotPID -#if (TDE_VERSION >= 220) - // Startup notification added in 2.2 - , "" -#endif - )) + TQString(), &kpilotError, &kpilotDCOP, &kpilotPID, "")) { WARNINGKPILOT << "Couldn't start KPilot! " << kpilotError << endl; } diff --git a/kpilot/todoWidget.cpp b/kpilot/todoWidget.cpp index 0c3817e..2df0926 100644 --- a/kpilot/todoWidget.cpp +++ b/kpilot/todoWidget.cpp @@ -170,14 +170,9 @@ void TodoWidget::showComponent() << endl; #endif -#if TDE_VERSION<220 - s = i18n("There are still %1 to-do editing windows open.") - .arg(TQString::number(fPendingTodos)); -#else s = i18n("There is still a to-do editing window open.", "There are still %n to-do editing windows open.", fPendingTodos); -#endif return false; } diff --git a/lib/options.h b/lib/options.h index 1a3f401..f197874 100644 --- a/lib/options.h +++ b/lib/options.h @@ -41,7 +41,6 @@ #include <tqstring.h> #include <kdebug.h> -#include <tdeversion.h> #include <tdelocale.h> #include "pilotLinkVersion.h" |