Rename KDE_IS_VERSION to TDE_IS_VERSIONrename/kde-is-version

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

9 files changed, 15 insertions, 37 deletions

diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 8f8e1969c..2103d6d1c 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -33,7 +33,6 @@
 #include "serviceifaceimpl.h"
 #include "network.h"
 
-#include <tdeversion.h>
 #include <tdemacros.h>
 
 extern "C" {
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp
index 51346cf66..72447486a 100644
--- a/tdecore/kurldrag.cpp
+++ b/tdecore/kurldrag.cpp
@@ -23,7 +23,6 @@
 #include <tqfont.h>
 #include <unistd.h>
 
-#include <tdeversion.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kdebug.h>
diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h
index 1cfc9f564..2fa4e9d13 100644
--- a/tdecore/tdeversion.h
+++ b/tdecore/tdeversion.h
@@ -1,4 +1,4 @@
-/* This file is part of the KDE libraries
+/* This file is part of the TDE libraries
     Copyright (c) 2002-2005 KDE Team
 
     This library is free software; you can redistribute it and/or
@@ -41,46 +41,46 @@
 #define TDE_VERSION \
   TDE_MAKE_VERSION(TDE_VERSION_MAJOR,TDE_VERSION_MINOR,TDE_VERSION_RELEASE)
 
-#define KDE_IS_VERSION(a,b,c) ( TDE_VERSION >= TDE_MAKE_VERSION(a,b,c) )
+#define TDE_IS_VERSION(a,b,c) ( TDE_VERSION >= TDE_MAKE_VERSION(a,b,c) )
 
 /**
- * Namespace for general KDE functions.
+ * Namespace for general TDE functions.
  */
 namespace KDE
 {
     /**
-     * Returns the encoded number of KDE's version, see the TDE_VERSION macro.
+     * Returns the encoded number of TDE's version, see the TDE_VERSION macro.
      * In contrary to that macro this function returns the number of the actully
-     * installed KDE version, not the number of the KDE version that was
+     * installed TDE version, not the number of the TDE version that was
      * installed when the program was compiled.
      * @return the version number, encoded in a single uint
      * @since 3.2
      */
     TDECORE_EXPORT unsigned int version();
     /**
-     * Returns the major number of KDE's version, e.g.
-     * 3 for KDE 3.1.2. 
+     * Returns the major number of TDE's version, e.g.
+     * 14 for TDE 14.1.2.
      * @return the major version number
      * @since 3.1
      */
     TDECORE_EXPORT unsigned int versionMajor();
     /**
-     * Returns the minor number of KDE's version, e.g.
-     * 1 for KDE 3.1.2. 
+     * Returns the minor number of TDE's version, e.g.
+     * 1 for TDE 14.1.2.
      * @return the minor version number
      * @since 3.1
      */
     TDECORE_EXPORT unsigned int versionMinor();
     /**
-     * Returns the release of KDE's version, e.g.
-     * 2 for KDE 3.1.2. 
+     * Returns the release of TDE's version, e.g.
+     * 2 for TDE 14.1.2.
      * @return the release number
      * @since 3.1
      */
     TDECORE_EXPORT unsigned int versionRelease();
     /**
-     * Returns the KDE version as string, e.g. "3.1.2".
-     * @return the KDE version. You can keep the string forever
+     * Returns the TDE version as string, e.g. "14.1.2".
+     * @return the TDE version. You can keep the string forever
      * @since 3.1
      */
     TDECORE_EXPORT const char *versionString();
diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp
index 392cd0662..517a66879 100644
--- a/tdeinit/tdeinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -72,8 +72,6 @@
 #include <tdestartupinfo.h> // schroder
 #endif
 
-#include <tdeversion.h>
-
 #include "ltdl.h"
 #include "tdelauncher_cmds.h"
 
@@ -639,9 +637,6 @@ static pid_t launch(int argc, const char *_name, const char *args,
         d.sym = lt_dlsym( d.handle, "kdemain" );
         if ( !d.sym )
         {
-#if ! KDE_IS_VERSION( 3, 90, 0 )
-           d.sym = lt_dlsym( d.handle, "main");
-#endif
            if (!d.sym )
            {
               const char * ltdlError = lt_dlerror();
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 925f7619a..99228da40 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -54,7 +54,6 @@
 #include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <tqtabwidget.h>
 #include <tdelocale.h>
 
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 1d7e56d42..c91b8b966 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -31,7 +31,6 @@
 #include <assert.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
-#include <tdeversion.h>
 #include "tdemdimainfrm.h"
 #include "tdemditoolviewaccessor.h"
 #include "tdemditoolviewaccessor_p.h"
@@ -260,11 +259,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 	TDEAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
 	                                       /*TQString::null*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
 	                                       m_mdiMainFrm, actionCollection(), aname.latin1() );
-#if KDE_IS_VERSION(3,2,90)
-
 	( ( ToggleToolViewAction* ) a ) ->setCheckedState( TQString(i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() )) );
-#endif
-
 	connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) );
 	m_toolViewActions.append( a );
 	m_toolMenu->insert( a );
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 2358b73ac..557a1e241 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -46,7 +46,6 @@
 #include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <tqtabwidget.h>
 #include <tdelocale.h>
 #include <tdestdaccel.h>
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index a62633930..04695f392 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -1236,16 +1236,12 @@ TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size)
     return size;
 }
 
-#if KDE_IS_VERSION( 3, 9, 0 )
-#ifdef __GNUC__
-#warning Remove, should be in Qt
-#endif
-#endif
+// TODO: remove, should be in TQt
 void TDEMainWindow::setIcon( const TQPixmap& p )
 {
     TQMainWindow::setIcon( p );
 #ifdef TQ_WS_X11 
-    // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which
+    // TQt doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which
     // is used by TDEMainWindow, sets it
     KWin::setIcons( winId(), p, TQPixmap());
 #endif
@@ -1262,7 +1258,4 @@ void TDEMainWindow::virtual_hook( int id, void* data )
 { KXMLGUIBuilder::virtual_hook( id, data );
   KXMLGUIClient::virtual_hook( id, data ); }
 
-
-
 #include "tdemainwindow.moc"
-
diff --git a/tdewallet/client/tdewallet.cpp b/tdewallet/client/tdewallet.cpp
index 9785472ed..0bca73cc4 100644
--- a/tdewallet/client/tdewallet.cpp
+++ b/tdewallet/client/tdewallet.cpp
@@ -22,7 +22,6 @@
 #include "tdewallet.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tqpopupmenu.h>