diff options
Diffstat (limited to 'umbrello')
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp | 6 | ||||
| -rw-r--r-- | umbrello/umbrello/uml.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
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, |