include/private/tqtkdeintegration_x11_p.h

diff --git a/include/private/tqtkdeintegration_x11_p.h b/include/private/tqtkdeintegration_x11_p.h

deleted file mode 120000

index c7777a4..0000000

--- a/include/private/tqtkdeintegration_x11_p.h

+++ /dev/null

@@ -1 +0,0 @@

-../../src/kernel/tqtkdeintegration_x11_p.h

\ No newline at end of file

include/private/tqttdeintegration_x11_p.h

diff --git a/include/private/tqttdeintegration_x11_p.h b/include/private/tqttdeintegration_x11_p.h

new file mode 120000

index 0000000..8fa57f7

--- /dev/null

+++ b/include/private/tqttdeintegration_x11_p.h

@@ -0,0 +1 @@

+../../src/kernel/tqttdeintegration_x11_p.h

\ No newline at end of file

src/dialogs/qcolordialog.cpp

diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp

index 281445c..12efeb3 100644

--- a/src/dialogs/qcolordialog.cpp

+++ b/src/dialogs/qcolordialog.cpp

@@ -64,7 +64,7 @@

 #endif

 #ifdef Q_WS_X11

-#include "private/tqtkdeintegration_x11_p.h"

+#include "private/tqttdeintegration_x11_p.h"

 #endif

 //////////// TQWellArray BEGIN

@@ -1486,8 +1486,8 @@

 			       const char *name )

 {

 #if defined(Q_WS_X11)

-    if( TQKDEIntegration::enabled())

-        return TQKDEIntegration::getColor( initial, parent, name );

+    if( TQTDEIntegration::enabled())

+        return TQTDEIntegration::getColor( initial, parent, name );

 #elif defined(Q_WS_MAC)

     return macGetColor(initial, parent, name);

 #endif

@@ -1526,8 +1526,8 @@

 			    TQWidget *parent, const char* name )

 {

 #if defined(Q_WS_MAC)

-    if( TQKDEIntegration::enabled()) {

-        TQColor color = TQKDEIntegration::getColor( TQColor( initial ), parent, name );

+    if( TQTDEIntegration::enabled()) {

+        TQColor color = TQTDEIntegration::getColor( TQColor( initial ), parent, name );

         if( ok )

             *ok = color.isValid();

         return color.rgba();

src/dialogs/qfiledialog.cpp

diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp

index 471084f..076960d 100644

--- a/src/dialogs/qfiledialog.cpp

+++ b/src/dialogs/qfiledialog.cpp

@@ -96,7 +96,7 @@

 #include "ntqwidgetstack.h"

 #ifdef Q_WS_X11

-#include "private/tqtkdeintegration_x11_p.h"

+#include "private/tqttdeintegration_x11_p.h"

 #endif

 #ifdef Q_WS_WIN

@@ -3494,8 +3494,8 @@

 	*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-	return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name,

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+	return TQTDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name,

 				    caption, selectedFilter, false ).first();

 #elif defined(Q_WS_WIN)

     if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )

@@ -3619,8 +3619,8 @@

 	*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-	return TQKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory,

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+	return TQTDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory,

 				   parent, name, caption, selectedFilter );

 #elif defined(Q_WS_WIN)

     if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )

@@ -4520,8 +4520,8 @@

 	    initialDir = dir;

     } else

 	initialDir = TQString::null;

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::getExistingDirectory( initialDir, parent, name, caption );

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::getExistingDirectory( initialDir, parent, name, caption );

 #elif defined(Q_WS_WIN)

     TQString initialDir;

     if ( !dir.isEmpty() ) {

@@ -5687,8 +5687,8 @@

     }

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-	return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true );

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+	return TQTDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true );

 #elif defined(Q_WS_WIN)

     if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )

 	return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter );

src/dialogs/qfontdialog.cpp

diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp

index cddc66a..9e1094a 100644

--- a/src/dialogs/qfontdialog.cpp

+++ b/src/dialogs/qfontdialog.cpp

@@ -60,7 +60,7 @@

 #include <ntqvalidator.h>

 #ifdef Q_WS_X11

-#include "private/tqtkdeintegration_x11_p.h"

+#include "private/tqttdeintegration_x11_p.h"

 #endif

 /*!

@@ -397,8 +397,8 @@

 			    TQWidget *parent, const char* name)

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::getFont( ok, def, parent, name );

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::getFont( ok, def, parent, name );

 #endif

     TQFont result;

     if ( def )

src/dialogs/qmessagebox.cpp

diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp

index 97ba0e8..50244b9 100644

--- a/src/dialogs/qmessagebox.cpp

+++ b/src/dialogs/qmessagebox.cpp

@@ -58,7 +58,7 @@

 #ifdef Q_WS_X11

-#include "private/tqtkdeintegration_x11_p.h"

+#include "private/tqttdeintegration_x11_p.h"

 #endif

 extern bool tqt_use_native_dialogs;

@@ -1121,8 +1121,8 @@

                               int button0, int button1, int button2 )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::information( parent, caption, text, button0, button1, button2 );

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::information( parent, caption, text, button0, button1, button2 );

 #endif

     TQMessageBox *mb = new TQMessageBox( caption, text, Information,

                                        button0, button1, button2,

@@ -1172,8 +1172,8 @@

                            int button0, int button1, int button2 )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::question( parent, caption, text, button0, button1, button2 );

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::question( parent, caption, text, button0, button1, button2 );

 #endif

     TQMessageBox *mb = new TQMessageBox( caption, text, Question,

                                        button0, button1, button2,

@@ -1224,8 +1224,8 @@

                           int button0, int button1, int button2 )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::warning( parent, caption, text, button0, button1, button2 );

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::warning( parent, caption, text, button0, button1, button2 );

 #endif

     TQMessageBox *mb = new TQMessageBox( caption, text, Warning,

                                        button0, button1, button2,

@@ -1276,8 +1276,8 @@

                            int button0, int button1, int button2 )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::critical( parent, caption, text, button0, button1, button2 );

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::critical( parent, caption, text, button0, button1, button2 );

 #endif

     TQMessageBox *mb = new TQMessageBox( caption, text, Critical,

                                        button0, button1, button2,

@@ -1427,8 +1427,8 @@

                               int escapeButtonNumber )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::information( parent, caption, text,

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::information( parent, caption, text,

             button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );

 #endif

     return textBox( parent, Information, caption, text,

@@ -1474,8 +1474,8 @@

                            int escapeButtonNumber )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::question( parent, caption, text,

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::question( parent, caption, text,

             button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );

 #endif

     return textBox( parent, Question, caption, text,

@@ -1523,8 +1523,8 @@

                                  int escapeButtonNumber )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::warning( parent, caption, text,

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::warning( parent, caption, text,

             button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );

 #endif

     return textBox( parent, Warning, caption, text,

@@ -1568,8 +1568,8 @@

                                   int escapeButtonNumber )

 {

 #if defined(Q_WS_X11)

-    if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())

-        return TQKDEIntegration::critical( parent, caption, text,

+    if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())

+        return TQTDEIntegration::critical( parent, caption, text,

             button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );

 #endif

     return textBox( parent, Critical, caption, text,

src/kernel/ntqt.h

diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h

index e4fc40a..73b7ae4 100644

--- a/src/kernel/ntqt.h

+++ b/src/kernel/ntqt.h

@@ -314,7 +314,7 @@

 #ifdef Q_WS_X11

-#include "private/tqtkdeintegration_x11_p.h"

+#include "private/tqttdeintegration_x11_p.h"

 #endif

 #ifdef Q_WS_MAC

src/kernel/qt_x11.pri

diff --git a/src/kernel/qt_x11.pri b/src/kernel/qt_x11.pri

index 20d65b1..c81055e 100644

--- a/src/kernel/qt_x11.pri

+++ b/src/kernel/qt_x11.pri

** Diff limit reached (max: 250 lines) **