summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cervisia/cervisiapart.cpp2
-rw-r--r--kcachegrind/kcachegrind/toplevel.cpp18
-rw-r--r--kompare/kompare_shell.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp6
-rw-r--r--umbrello/umbrello/uml.cpp2
5 files changed, 15 insertions, 15 deletions
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index ea6ba686..9087bacc 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -726,7 +726,7 @@ void CervisiaPart::aboutCervisia()
"GNU General Public License for more details.\n"
"See the ChangeLog file for a list of contributors."));
TQMessageBox::about(0, i18n("About Cervisia"),
- aboutstr.tqarg(CERVISIA_VERSION).tqarg(KDE_VERSION_STRING));
+ aboutstr.tqarg(CERVISIA_VERSION).tqarg(TDE_VERSION_STRING));
}
diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp
index db1dace7..44165742 100644
--- a/kcachegrind/kcachegrind/toplevel.cpp
+++ b/kcachegrind/kcachegrind/toplevel.cpp
@@ -120,7 +120,7 @@ TopLevel::TopLevel(const char *name)
setupPartSelection(_partSelection);
// KCachegrind for KDE 3.0.x does not allow to hide toolbars...
-#if KDE_VERSION >= 308 // KDE 3.1
+#if TDE_VERSION >= 308 // KDE 3.1
setStandardToolBarMenuEnabled(true);
#endif
@@ -507,7 +507,7 @@ void TopLevel::createMiscActions()
action->setWhatsThis( hint );
action = new KAction( i18n( "&Reload" ), "reload",
-#if KDE_VERSION > 0x030190
+#if TDE_VERSION > 0x030190
// for KDE 3.2: KStdAccel::key is deprecated
KStdAccel::shortcut(KStdAccel::Reload),
#else
@@ -529,7 +529,7 @@ void TopLevel::createMiscActions()
_taDump = new KToggleAction( i18n( "&Force Dump" ), "redo",
-#if KDE_VERSION > 0x030190
+#if TDE_VERSION > 0x030190
// for KDE 3.2: KStdAccel::key is deprecated
KStdAccel::shortcut(KStdAccel::Redo),
#else
@@ -616,7 +616,7 @@ void TopLevel::createMiscActions()
TQT_TQOBJECT(this), TQT_SLOT(togglePercentage()),
actionCollection(),
"view_percentage");
-#if KDE_VERSION >= 0x030290
+#if TDE_VERSION >= 0x030290
// for KDE 3.3: show another text instead of a checkmark
_taPercentage->setCheckedState(i18n("Show Absolute Costs"));
#endif
@@ -654,7 +654,7 @@ void TopLevel::createMiscActions()
KShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(),
"view_cycles" );
-#if KDE_VERSION >= 0x030290
+#if TDE_VERSION >= 0x030290
// for KDE 3.3: show another text instead of a checkmark
_taCycles->setCheckedState(i18n("Skip Cycle Detection"));
#endif
@@ -797,7 +797,7 @@ void TopLevel::createMiscActions()
_taSplitDir->setWhatsThis( hint );
// copied from KMail...
-#if KDE_VERSION >= 308 // KDE 3.1
+#if TDE_VERSION >= 308 // KDE 3.1
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() );
#else
(void) new KAction( KGuiItem( i18n("Tip of the &Day..."), "idea",
@@ -969,7 +969,7 @@ void TopLevel::querySlot()
void TopLevel::configureKeys()
{
-#if KDE_VERSION > 0x030190
+#if TDE_VERSION > 0x030190
// for KDE 3.2: KKeyDialog::configureKeys is deprecated
KKeyDialog::configure(actionCollection(), this, true);
#else
@@ -1016,7 +1016,7 @@ void TopLevel::loadTrace(const KURL& url)
// network transparancy
TQString tmpFile;
-#if KDE_VERSION > 0x030190
+#if TDE_VERSION > 0x030190
// for KDE 3.2: KIO::NetAccess::download with 2 args is deprecated
if(KIO::NetAccess::download( url, tmpFile, this )) {
#else
@@ -1065,7 +1065,7 @@ void TopLevel::addTrace(const KURL& url)
// network transparancy
TQString tmpFile;
-#if KDE_VERSION > 0x030190
+#if TDE_VERSION > 0x030190
// for KDE 3.2: KIO::NetAccess::download with 2 args is deprecated
if(KIO::NetAccess::download( url, tmpFile, this )) {
#else
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 3af1af3b..bb1c71a9 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -238,7 +238,7 @@ void KompareShell::setupActions()
actionCollection(), "file_blend_url" );
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() );
-#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
createStandardStatusBarAction();
#endif
setStandardToolBarMenuEnabled(true);
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index b6c55a61..92886e07 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <kdeversion.h>
-#if (KDE_VERSION_MINOR==0) && (KDE_VERSION_MAJOR==3)
+#if (TDE_VERSION_MINOR==0) && (TDE_VERSION_MAJOR==3)
#include <kdevkurl.h>
#endif
@@ -129,7 +129,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
TQString URLUtil::extractPathNameRelative(const TQString &basePath, const KURL &url )
{
-#if (KDE_VERSION_MINOR!=0) || (KDE_VERSION_MAJOR!=3)
+#if (TDE_VERSION_MINOR!=0) || (TDE_VERSION_MAJOR!=3)
KURL baseDirUrl = KURL::fromPathOrURL( basePath );
#else
KURL baseDirUrl = KdevKURL::fromPathOrURL( basePath );
@@ -141,7 +141,7 @@ TQString URLUtil::extractPathNameRelative(const TQString &basePath, const KURL &
TQString URLUtil::extractPathNameRelative(const TQString &basePath, const TQString &absFilePath )
{
-#if (KDE_VERSION_MINOR!=0) || (KDE_VERSION_MAJOR!=3)
+#if (TDE_VERSION_MINOR!=0) || (TDE_VERSION_MAJOR!=3)
KURL baseDirUrl = KURL::fromPathOrURL( basePath ),
fileUrl = KURL::fromPathOrURL( absFilePath );
#else
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 91986427..8a305952 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -261,7 +261,7 @@ void UMLApp::initActions() {
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
viewShowGrid = new KToggleAction(i18n("S&how Grid"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid");
-#if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3)
+#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
viewShowGrid->setCheckedState(i18n("&Hide Grid"));
#endif
deleteDiagram = new KAction(i18n("&Delete"), SmallIconSet("editdelete"), 0,
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 17:16:49 +0000