7 files changed, 28 insertions, 28 deletions
diff --git a/tqt3integration/utils/tqt/in/CMakeLists.txt b/tqt3integration/utils/tqt/in/CMakeLists.txt
index c9bc36f92..000fde3ba 100644
--- a/tqt3integration/utils/tqt/in/CMakeLists.txt
+++ b/tqt3integration/utils/tqt/in/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-configure_file( tqtkdeintegration_x11_0.cpp.cmake tqtkdeintegration_x11_0.cpp @ONLY )
+configure_file( tqttdeintegration_x11_0.cpp.cmake tqttdeintegration_x11_0.cpp @ONLY )
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
deleted file mode 100644
index bc6d9fda6..000000000
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#define TQTKDELIBDIR @TQT_PLUGINS_DIR@/integration
diff --git a/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake
new file mode 100644
index 000000000..00b0dc3de
--- /dev/null
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake
@@ -0,0 +1 @@
+#define TQTTDELIBDIR @TQT_PLUGINS_DIR@/integration
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp
index 36d4e075c..fc849142b 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "tqtkdeintegration_x11_p.h"
+#include "tqttdeintegration_x11_p.h"
 
 #include <tqcolordialog.h>
 #include <tqfiledialog.h>
@@ -29,10 +29,10 @@
 #include <tqapplication.h>
 #include <stdlib.h>
 
-bool TQKDEIntegration::inited = false;
-bool TQKDEIntegration::enable = false;
+bool TQTDEIntegration::inited = false;
+bool TQTDEIntegration::enable = false;
 
-bool TQKDEIntegration::enabled()
+bool TQTDEIntegration::enabled()
     {
     if( !inited )
         initLibrary();
@@ -45,10 +45,10 @@ static TQCString findLibrary()
         return "";
     if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' )
         return "";
-    if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL
-        || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' )
+    if( getenv( "TQT_NO_TDE_INTEGRATION" ) == NULL
+        || getenv( "TQT_NO_TDE_INTEGRATION" )[ 0 ] == '0' )
         {
-        return TQCString( TQTKDELIBDIR ) + "/libtqtkde";
+        return TQCString( TQTTDELIBDIR ) + "/libtqttde";
         }
     return "";
     }
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp
index f9ab72d70..ba365f7db 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp
@@ -20,62 +20,62 @@
 
 // ---
 
-int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::information( TQWidget* parent, const TQString& caption,
     const TQString& text, int button0, int button1, int button2 )
     {
-    return tqtkde_messageBox1(
+    return tqttde_messageBox1(
         TQMessageBox::Information, parentToWinId( parent ), caption, text, button0, button1, button2 );
     }
 
-int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::question( TQWidget* parent, const TQString& caption,
     const TQString& text, int button0, int button1, int button2 )
     {
-    return tqtkde_messageBox1(
+    return tqttde_messageBox1(
         TQMessageBox::Question, parentToWinId( parent ), caption, text, button0, button1, button2 );
     }
 
-int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::warning( TQWidget* parent, const TQString& caption,
     const TQString& text, int button0, int button1, int button2 )
     {
-    return tqtkde_messageBox1(
+    return tqttde_messageBox1(
         TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0, button1, button2 );
     }
 
-int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::critical( TQWidget* parent, const TQString& caption,
     const TQString& text, int button0, int button1, int button2 )
     {
-    return tqtkde_messageBox1(
+    return tqttde_messageBox1(
         TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0, button1, button2 );
     }
 
-int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::information( TQWidget* parent, const TQString& caption,
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
     int defaultButton, int escapeButton )
     {
-    return tqtkde_messageBox2(
+    return tqttde_messageBox2(
         TQMessageBox::Information, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
     }
 
-int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::question( TQWidget* parent, const TQString& caption,
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
     int defaultButton, int escapeButton )
     {
-    return tqtkde_messageBox2(
+    return tqttde_messageBox2(
         TQMessageBox::Question, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
     }
 
-int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::warning( TQWidget* parent, const TQString& caption,
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
     int defaultButton, int escapeButton )
     {
-    return tqtkde_messageBox2(
+    return tqttde_messageBox2(
         TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
     }
 
-int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::critical( TQWidget* parent, const TQString& caption,
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
     int defaultButton, int escapeButton )
     {
-    return tqtkde_messageBox2(
+    return tqttde_messageBox2(
         TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
     }
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h
index 59a0127b9..53990697a 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h
@@ -18,8 +18,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TQKDEINTEGRATION_H
-#define TQKDEINTEGRATION_H
+#ifndef TQTDEINTEGRATION_H
+#define TQTDEINTEGRATION_H
 
 #include <tqstringlist.h>
 
@@ -28,7 +28,7 @@ class TQWidget;
 class TQColor;
 class TQFont;
 
-class TQKDEIntegration
+class TQTDEIntegration
     {
     public:
         static bool enabled();
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h
index 63d569fc0..63d569fc0 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h