diff options
Diffstat (limited to 'umbrello')
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp | 14 | ||||
| -rw-r--r-- | umbrello/umbrello/uml.cpp | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp index a9ce6789..d63fb635 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp @@ -30,11 +30,6 @@ #include <limits.h> #include <stdlib.h> -#include <tdeversion.h> -#if (TDE_VERSION_MINOR==0) && (TDE_VERSION_MAJOR==3) -#include <kdevkurl.h> -#endif - /////////////////////////////////////////////////////////////////////////////// // Namespace URLUtil /////////////////////////////////////////////////////////////////////////////// @@ -129,11 +124,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur TQString URLUtil::extractPathNameRelative(const TQString &basePath, const KURL &url ) { -#if (TDE_VERSION_MINOR!=0) || (TDE_VERSION_MAJOR!=3) KURL baseDirUrl = KURL::fromPathOrURL( basePath ); -#else - KURL baseDirUrl = KdevKURL::fromPathOrURL( basePath ); -#endif return extractPathNameRelative( baseDirUrl, url ); } @@ -141,13 +132,8 @@ TQString URLUtil::extractPathNameRelative(const TQString &basePath, const KURL & TQString URLUtil::extractPathNameRelative(const TQString &basePath, const TQString &absFilePath ) { -#if (TDE_VERSION_MINOR!=0) || (TDE_VERSION_MAJOR!=3) KURL baseDirUrl = KURL::fromPathOrURL( basePath ), fileUrl = KURL::fromPathOrURL( absFilePath ); -#else - KURL baseDirUrl = KdevKURL::fromPathOrURL( basePath ), - fileUrl = KdevKURL::fromPathOrURL( absFilePath ); -#endif return extractPathNameRelative( baseDirUrl, fileUrl ); } diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 48a46f7a..25e9e821 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -261,9 +261,7 @@ void UMLApp::initActions() { this, TQ_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0, this, TQ_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); -#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) viewShowGrid->setCheckedState(i18n("&Hide Grid")); -#endif deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0, this, TQ_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image-x-generic"), 0, |