summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
l---------include/private/qtkdeintegration_x11_p.h1
l---------include/private/tqtkdeintegration_x11_p.h1
-rw-r--r--src/dialogs/qcolordialog.cpp2
-rw-r--r--src/dialogs/qfiledialog.cpp2
-rw-r--r--src/dialogs/qfontdialog.cpp2
-rw-r--r--src/dialogs/qmessagebox.cpp2
-rw-r--r--src/kernel/ntqt.h2
-rw-r--r--src/kernel/qt_x11.pri4
-rw-r--r--src/kernel/tqtkdeintegration_x11.cpp (renamed from src/kernel/qtkdeintegration_x11.cpp)84
-rw-r--r--src/kernel/tqtkdeintegration_x11_p.h (renamed from src/kernel/qtkdeintegration_x11_p.h)0
10 files changed, 50 insertions, 50 deletions
diff --git a/include/private/qtkdeintegration_x11_p.h b/include/private/qtkdeintegration_x11_p.h
deleted file mode 120000
index 7bbc0318a..000000000
--- a/include/private/qtkdeintegration_x11_p.h
+++ /dev/null
@@ -1 +0,0 @@
-../../src/kernel/qtkdeintegration_x11_p.h \ No newline at end of file
diff --git a/include/private/tqtkdeintegration_x11_p.h b/include/private/tqtkdeintegration_x11_p.h
new file mode 120000
index 000000000..c7777a4c5
--- /dev/null
+++ b/include/private/tqtkdeintegration_x11_p.h
@@ -0,0 +1 @@
+../../src/kernel/tqtkdeintegration_x11_p.h \ No newline at end of file
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index 7efb55ff6..ac27d6c34 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -64,7 +64,7 @@ TQColor macGetColor( const TQColor& initial, TQWidget *parent, const char *name
#endif
#ifdef Q_WS_X11
-#include "private/qtkdeintegration_x11_p.h"
+#include "private/tqtkdeintegration_x11_p.h"
#endif
//////////// TQWellArray BEGIN
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 9e95e0c55..ae1b5ab34 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -96,7 +96,7 @@
#include "ntqwidgetstack.h"
#ifdef Q_WS_X11
-#include "private/qtkdeintegration_x11_p.h"
+#include "private/tqtkdeintegration_x11_p.h"
#endif
#ifdef Q_WS_WIN
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp
index 2dcf7b530..0eee95a8c 100644
--- a/src/dialogs/qfontdialog.cpp
+++ b/src/dialogs/qfontdialog.cpp
@@ -60,7 +60,7 @@
#include <ntqvalidator.h>
#ifdef Q_WS_X11
-#include "private/qtkdeintegration_x11_p.h"
+#include "private/tqtkdeintegration_x11_p.h"
#endif
/*!
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index b27ce1a82..23e1d5cde 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -58,7 +58,7 @@
#ifdef Q_WS_X11
-#include "private/qtkdeintegration_x11_p.h"
+#include "private/tqtkdeintegration_x11_p.h"
#endif
extern bool tqt_use_native_dialogs;
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 6a2a54289..e4fc40a67 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -314,7 +314,7 @@
#ifdef Q_WS_X11
-#include "private/qtkdeintegration_x11_p.h"
+#include "private/tqtkdeintegration_x11_p.h"
#endif
#ifdef Q_WS_MAC
diff --git a/src/kernel/qt_x11.pri b/src/kernel/qt_x11.pri
index 06db6859b..b20081f04 100644
--- a/src/kernel/qt_x11.pri
+++ b/src/kernel/qt_x11.pri
@@ -11,8 +11,8 @@ unix {
SOURCES += $$KERNEL_CPP/qtaddons_x11.cpp
PRECOMPILED_HEADER = kernel/qt_pch.h
- SOURCES += $$KERNEL_CPP/qtkdeintegration_x11.cpp
- HEADERS += $$KERNEL_H/qtkdeintegration_x11_p.h
+ SOURCES += $$KERNEL_CPP/tqtkdeintegration_x11.cpp
+ HEADERS += $$KERNEL_H/tqtkdeintegration_x11_p.h
}
nas {
diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/tqtkdeintegration_x11.cpp
index 9c16896f2..0dae849c1 100644
--- a/src/kernel/qtkdeintegration_x11.cpp
+++ b/src/kernel/tqtkdeintegration_x11.cpp
@@ -1,7 +1,7 @@
/* This file is licensed under the terms of the GPL v2 or v3, as it has been publicly released by
OpenSUSE as part of their GPLed TQt library disribution */
-#include "qtkdeintegration_x11_p.h"
+#include "tqtkdeintegration_x11_p.h"
#include <ntqcolordialog.h>
#include <ntqfiledialog.h>
@@ -46,20 +46,20 @@ inline static TQFont fontPtrToFontRef( const TQFont* f )
}
// ---
-static bool (*qtkde_initializeIntegration)( );
-static TQStringList (*qtkde_getOpenFileNames)( const TQString& filter, TQString* workingDirectory,
+static bool (*tqtkde_initializeIntegration)( );
+static TQStringList (*tqtkde_getOpenFileNames)( const TQString& filter, TQString* workingDirectory,
long parent, const TQCString& name, const TQString& caption, TQString* selectedFilter,
bool multiple );
-static TQString (*qtkde_getSaveFileName)( const TQString& initialSelection, const TQString& filter,
+static TQString (*tqtkde_getSaveFileName)( const TQString& initialSelection, const TQString& filter,
TQString* workingDirectory, long parent, const TQCString& name, const TQString& caption,
TQString* selectedFilter );
-static TQString (*qtkde_getExistingDirectory)( const TQString& initialDirectory, long parent,
+static TQString (*tqtkde_getExistingDirectory)( const TQString& initialDirectory, long parent,
const TQCString& name, const TQString& caption );
-static TQColor (*qtkde_getColor)( const TQColor& color, long parent, const TQCString& name );
-static TQFont (*qtkde_getFont)( bool* ok, const TQFont& def, long parent, const TQCString& name );
-static int (*qtkde_messageBox1)( int type, long parent, const TQString& caption, const TQString& text,
+static TQColor (*tqtkde_getColor)( const TQColor& color, long parent, const TQCString& name );
+static TQFont (*tqtkde_getFont)( bool* ok, const TQFont& def, long parent, const TQCString& name );
+static int (*tqtkde_messageBox1)( int type, long parent, const TQString& caption, const TQString& text,
int button0, int button1, int button2 );
-static int (*qtkde_messageBox2)( int type, long parent, const TQString& caption, const TQString& text,
+static int (*tqtkde_messageBox2)( int type, long parent, const TQString& caption, const TQString& text,
const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton );
@@ -74,111 +74,111 @@ void TQKDEIntegration::initLibrary()
return;
TQLibrary lib( libpath );
lib.setAutoUnload( false );
- qtkde_initializeIntegration = (
+ tqtkde_initializeIntegration = (
bool (*)( )
)
lib.resolve("initializeIntegration");
- if( qtkde_initializeIntegration == NULL )
+ if( tqtkde_initializeIntegration == NULL )
return;
- qtkde_getOpenFileNames = (
+ tqtkde_getOpenFileNames = (
TQStringList (*)( const TQString& filter, TQString* workingDirectory, long parent,
const TQCString& name, const TQString& caption, TQString* selectedFilter,
bool multiple )
)
lib.resolve("getOpenFileNames");
- if( qtkde_getOpenFileNames == NULL )
+ if( tqtkde_getOpenFileNames == NULL )
return;
- qtkde_getSaveFileName = (
+ tqtkde_getSaveFileName = (
TQString (*)( const TQString& initialSelection, const TQString& filter, TQString* workingDirectory,
long parent, const TQCString& name, const TQString& caption, TQString* selectedFilter )
)
lib.resolve("getSaveFileName");
- if( qtkde_getSaveFileName == NULL )
+ if( tqtkde_getSaveFileName == NULL )
return;
- qtkde_getExistingDirectory = (
+ tqtkde_getExistingDirectory = (
TQString (*)( const TQString& initialDirectory, long parent, const TQCString& name,
const TQString& caption )
)
lib.resolve("getExistingDirectory");
- if( qtkde_getExistingDirectory == NULL )
+ if( tqtkde_getExistingDirectory == NULL )
return;
- qtkde_getColor = (
+ tqtkde_getColor = (
TQColor (*)( const TQColor& color, long parent, const TQCString& name )
)
lib.resolve("getColor");
- if( qtkde_getColor == NULL )
+ if( tqtkde_getColor == NULL )
return;
- qtkde_getFont = (
+ tqtkde_getFont = (
TQFont (*)( bool* ok, const TQFont& def, long parent, const TQCString& name )
)
lib.resolve("getFont");
- if( qtkde_getFont == NULL )
+ if( tqtkde_getFont == NULL )
return;
- qtkde_messageBox1 = (
+ tqtkde_messageBox1 = (
int (*)( int type, long parent, const TQString& caption, const TQString& text,
int button0, int button1, int button2 )
)
lib.resolve("messageBox1");
- if( qtkde_messageBox1 == NULL )
+ if( tqtkde_messageBox1 == NULL )
return;
- qtkde_messageBox2 = (
+ tqtkde_messageBox2 = (
int (*)( int type, long parent, const TQString& caption, const TQString& text,
const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
)
lib.resolve("messageBox2");
- if( qtkde_messageBox2 == NULL )
+ if( tqtkde_messageBox2 == NULL )
return;
- enable = qtkde_initializeIntegration();
+ enable = tqtkde_initializeIntegration();
}
}
bool TQKDEIntegration::initializeIntegration( )
{
- return qtkde_initializeIntegration(
+ return tqtkde_initializeIntegration(
);
}
TQStringList TQKDEIntegration::getOpenFileNames( const TQString& filter, TQString* workingDirectory,
TQWidget* parent, const char* name, const TQString& caption, TQString* selectedFilter,
bool multiple )
{
- return qtkde_getOpenFileNames(
+ return tqtkde_getOpenFileNames(
filter, workingDirectory, widgetToWinId( parent ), name, caption, selectedFilter, multiple );
}
TQString TQKDEIntegration::getSaveFileName( const TQString& initialSelection, const TQString& filter,
TQString* workingDirectory, TQWidget* parent, const char* name, const TQString& caption,
TQString* selectedFilter )
{
- return qtkde_getSaveFileName(
+ return tqtkde_getSaveFileName(
initialSelection, filter, workingDirectory, widgetToWinId( parent ), name, caption, selectedFilter );
}
TQString TQKDEIntegration::getExistingDirectory( const TQString& initialDirectory, TQWidget* parent,
const char* name, const TQString& caption )
{
- return qtkde_getExistingDirectory(
+ return tqtkde_getExistingDirectory(
initialDirectory, widgetToWinId( parent ), name, caption );
}
TQColor TQKDEIntegration::getColor( const TQColor& color, TQWidget* parent, const char* name )
{
- return qtkde_getColor(
+ return tqtkde_getColor(
color, widgetToWinId( parent ), name );
}
TQFont TQKDEIntegration::getFont( bool* ok, const TQFont* def, TQWidget* parent, const char* name )
{
- return qtkde_getFont(
+ return tqtkde_getFont(
ok, fontPtrToFontRef( def ), widgetToWinId( parent ), name );
}
int TQKDEIntegration::messageBox1( int type, TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return qtkde_messageBox1(
+ return tqtkde_messageBox1(
type, widgetToWinId( parent ), caption, text, button0, button1, button2 );
}
int TQKDEIntegration::messageBox2( int type, TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return qtkde_messageBox2(
+ return tqtkde_messageBox2(
type, widgetToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
// ---
@@ -186,28 +186,28 @@ int TQKDEIntegration::messageBox2( int type, TQWidget* parent, const TQString& c
int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return qtkde_messageBox1(
+ return tqtkde_messageBox1(
TQMessageBox::Information, widgetToWinId( parent ), caption, text, button0, button1, button2 );
}
int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return qtkde_messageBox1(
+ return tqtkde_messageBox1(
TQMessageBox::Question, widgetToWinId( parent ), caption, text, button0, button1, button2 );
}
int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return qtkde_messageBox1(
+ return tqtkde_messageBox1(
TQMessageBox::Warning, widgetToWinId( parent ), caption, text, button0, button1, button2 );
}
int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return qtkde_messageBox1(
+ return tqtkde_messageBox1(
TQMessageBox::Critical, widgetToWinId( parent ), caption, text, button0, button1, button2 );
}
@@ -215,7 +215,7 @@ int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return qtkde_messageBox2(
+ return tqtkde_messageBox2(
TQMessageBox::Information, widgetToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
@@ -223,7 +223,7 @@ int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return qtkde_messageBox2(
+ return tqtkde_messageBox2(
TQMessageBox::Question, widgetToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
@@ -231,7 +231,7 @@ int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return qtkde_messageBox2(
+ return tqtkde_messageBox2(
TQMessageBox::Warning, widgetToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
@@ -239,6 +239,6 @@ int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return qtkde_messageBox2(
+ return tqtkde_messageBox2(
TQMessageBox::Critical, widgetToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
diff --git a/src/kernel/qtkdeintegration_x11_p.h b/src/kernel/tqtkdeintegration_x11_p.h
index 10ee4443b..10ee4443b 100644
--- a/src/kernel/qtkdeintegration_x11_p.h
+++ b/src/kernel/tqtkdeintegration_x11_p.h