summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-06-04 12:34:06 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-06-04 12:34:06 +0200
commita410cb031faef27b87337dbd2600083add7dce97 (patch)
tree72ea86b0fe3c1fcf3ea75f41c6978c88684b8c4a
parentd3b13515ef865fe7304afaa7a119cf326f2c774d (diff)
downloadtqt3-a410cb031faef27b87337dbd2600083add7dce97.tar.gz
tqt3-a410cb031faef27b87337dbd2600083add7dce97.zip
Rename tqt-kde integration to tqt-tde.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
l---------include/private/tqtkdeintegration_x11_p.h1
l---------include/private/tqttdeintegration_x11_p.h1
-rw-r--r--src/dialogs/qcolordialog.cpp10
-rw-r--r--src/dialogs/qfiledialog.cpp18
-rw-r--r--src/dialogs/qfontdialog.cpp6
-rw-r--r--src/dialogs/qmessagebox.cpp34
-rw-r--r--src/kernel/ntqt.h2
-rw-r--r--src/kernel/qt_x11.pri4
-rw-r--r--src/kernel/tqttdeintegration_x11.cpp (renamed from src/kernel/tqtkdeintegration_x11.cpp)130
-rw-r--r--src/kernel/tqttdeintegration_x11_p.h (renamed from src/kernel/tqtkdeintegration_x11_p.h)6
10 files changed, 106 insertions, 106 deletions
diff --git a/include/private/tqtkdeintegration_x11_p.h b/include/private/tqtkdeintegration_x11_p.h
deleted file mode 120000
index c7777a4c..00000000
--- a/include/private/tqtkdeintegration_x11_p.h
+++ /dev/null
@@ -1 +0,0 @@
-../../src/kernel/tqtkdeintegration_x11_p.h \ No newline at end of file
diff --git a/include/private/tqttdeintegration_x11_p.h b/include/private/tqttdeintegration_x11_p.h
new file mode 120000
index 00000000..8fa57f7f
--- /dev/null
+++ b/include/private/tqttdeintegration_x11_p.h
@@ -0,0 +1 @@
+../../src/kernel/tqttdeintegration_x11_p.h \ No newline at end of file
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index 281445c2..12efeb3f 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/tqtkdeintegration_x11_p.h"
+#include "private/tqttdeintegration_x11_p.h"
#endif
//////////// TQWellArray BEGIN
@@ -1486,8 +1486,8 @@ TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent,
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 @@ TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok,
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();
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 471084f1..076960d9 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 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
*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 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
*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 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
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 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter,
}
#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 );
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp
index cddc66a9..9e1094aa 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 @@ TQFont TQFontDialog::getFont( bool *ok, const TQFont *def,
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 )
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index 97ba0e85..50244b9c 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 TQMessageBox::information( TQWidget *parent,
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 TQMessageBox::question( TQWidget *parent,
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 TQMessageBox::warning( TQWidget *parent,
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 TQMessageBox::critical( TQWidget *parent,
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 TQMessageBox::information( TQWidget *parent, const TQString &caption,
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 TQMessageBox::question( TQWidget *parent, const TQString &caption,
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 TQMessageBox::warning( TQWidget *parent, const TQString &caption,
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 TQMessageBox::critical( TQWidget *parent, const TQString &caption,
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,
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index e4fc40a6..73b7ae48 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
diff --git a/src/kernel/qt_x11.pri b/src/kernel/qt_x11.pri
index 20d65b10..c81055eb 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/tqtkdeintegration_x11.cpp
- HEADERS += $$KERNEL_H/tqtkdeintegration_x11_p.h
+ SOURCES += $$KERNEL_CPP/tqttdeintegration_x11.cpp
+ HEADERS += $$KERNEL_H/tqttdeintegration_x11_p.h
}
nas {
diff --git a/src/kernel/tqtkdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index 9292d0bb..b3565b3d 100644
--- a/src/kernel/tqtkdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_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 "tqtkdeintegration_x11_p.h"
+#include "tqttdeintegration_x11_p.h"
#include <ntqcolordialog.h>
#include <ntqfiledialog.h>
@@ -11,10 +11,10 @@
#include <ntqmessagebox.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();
@@ -23,10 +23,10 @@ bool TQKDEIntegration::enabled()
static TQCString findLibrary()
{
- 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() + tqInstallPathPlugins() + "/integration/libtqtkde";
+ return TQCString() + tqInstallPathPlugins() + "/integration/libtqttde";
}
return "";
}
@@ -42,24 +42,24 @@ inline static TQFont fontPtrToFontRef( const TQFont* f )
}
// ---
-static bool (*tqtkde_initializeIntegration)( );
-static TQStringList (*tqtkde_getOpenFileNames)( const TQString& filter, TQString* workingDirectory,
+static bool (*tqttde_initializeIntegration)( );
+static TQStringList (*tqttde_getOpenFileNames)( const TQString& filter, TQString* workingDirectory,
long parent, const TQCString& name, const TQString& caption, TQString* selectedFilter,
bool multiple );
-static TQString (*tqtkde_getSaveFileName)( const TQString& initialSelection, const TQString& filter,
+static TQString (*tqttde_getSaveFileName)( const TQString& initialSelection, const TQString& filter,
TQString* workingDirectory, long parent, const TQCString& name, const TQString& caption,
TQString* selectedFilter );
-static TQString (*tqtkde_getExistingDirectory)( const TQString& initialDirectory, long parent,
+static TQString (*tqttde_getExistingDirectory)( const TQString& initialDirectory, long parent,
const TQCString& name, const TQString& caption );
-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,
+static TQColor (*tqttde_getColor)( const TQColor& color, long parent, const TQCString& name );
+static TQFont (*tqttde_getFont)( bool* ok, const TQFont& def, long parent, const TQCString& name );
+static int (*tqttde_messageBox1)( int type, long parent, const TQString& caption, const TQString& text,
int button0, int button1, int button2 );
-static int (*tqtkde_messageBox2)( int type, long parent, const TQString& caption, const TQString& text,
+static int (*tqttde_messageBox2)( int type, long parent, const TQString& caption, const TQString& text,
const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton );
-void TQKDEIntegration::initLibrary()
+void TQTDEIntegration::initLibrary()
{
if( !inited )
{
@@ -70,171 +70,171 @@ void TQKDEIntegration::initLibrary()
return;
TQLibrary lib( libpath );
lib.setAutoUnload( false );
- tqtkde_initializeIntegration = (
+ tqttde_initializeIntegration = (
bool (*)( )
)
lib.resolve("initializeIntegration");
- if( tqtkde_initializeIntegration == NULL )
+ if( tqttde_initializeIntegration == NULL )
return;
- tqtkde_getOpenFileNames = (
+ tqttde_getOpenFileNames = (
TQStringList (*)( const TQString& filter, TQString* workingDirectory, long parent,
const TQCString& name, const TQString& caption, TQString* selectedFilter,
bool multiple )
)
lib.resolve("getOpenFileNames");
- if( tqtkde_getOpenFileNames == NULL )
+ if( tqttde_getOpenFileNames == NULL )
return;
- tqtkde_getSaveFileName = (
+ tqttde_getSaveFileName = (
TQString (*)( const TQString& initialSelection, const TQString& filter, TQString* workingDirectory,
long parent, const TQCString& name, const TQString& caption, TQString* selectedFilter )
)
lib.resolve("getSaveFileName");
- if( tqtkde_getSaveFileName == NULL )
+ if( tqttde_getSaveFileName == NULL )
return;
- tqtkde_getExistingDirectory = (
+ tqttde_getExistingDirectory = (
TQString (*)( const TQString& initialDirectory, long parent, const TQCString& name,
const TQString& caption )
)
lib.resolve("getExistingDirectory");
- if( tqtkde_getExistingDirectory == NULL )
+ if( tqttde_getExistingDirectory == NULL )
return;
- tqtkde_getColor = (
+ tqttde_getColor = (
TQColor (*)( const TQColor& color, long parent, const TQCString& name )
)
lib.resolve("getColor");
- if( tqtkde_getColor == NULL )
+ if( tqttde_getColor == NULL )
return;
- tqtkde_getFont = (
+ tqttde_getFont = (
TQFont (*)( bool* ok, const TQFont& def, long parent, const TQCString& name )
)
lib.resolve("getFont");
- if( tqtkde_getFont == NULL )
+ if( tqttde_getFont == NULL )
return;
- tqtkde_messageBox1 = (
+ tqttde_messageBox1 = (
int (*)( int type, long parent, const TQString& caption, const TQString& text,
int button0, int button1, int button2 )
)
lib.resolve("messageBox1");
- if( tqtkde_messageBox1 == NULL )
+ if( tqttde_messageBox1 == NULL )
return;
- tqtkde_messageBox2 = (
+ tqttde_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( tqtkde_messageBox2 == NULL )
+ if( tqttde_messageBox2 == NULL )
return;
- enable = tqtkde_initializeIntegration();
+ enable = tqttde_initializeIntegration();
}
}
-bool TQKDEIntegration::initializeIntegration( )
+bool TQTDEIntegration::initializeIntegration( )
{
- return tqtkde_initializeIntegration(
+ return tqttde_initializeIntegration(
);
}
-TQStringList TQKDEIntegration::getOpenFileNames( const TQString& filter, TQString* workingDirectory,
+TQStringList TQTDEIntegration::getOpenFileNames( const TQString& filter, TQString* workingDirectory,
TQWidget* parent, const char* name, const TQString& caption, TQString* selectedFilter,
bool multiple )
{
- return tqtkde_getOpenFileNames(
+ return tqttde_getOpenFileNames(
filter, workingDirectory, widgetToWinId( parent ), name, caption, selectedFilter, multiple );
}
-TQString TQKDEIntegration::getSaveFileName( const TQString& initialSelection, const TQString& filter,
+TQString TQTDEIntegration::getSaveFileName( const TQString& initialSelection, const TQString& filter,
TQString* workingDirectory, TQWidget* parent, const char* name, const TQString& caption,
TQString* selectedFilter )
{
- return tqtkde_getSaveFileName(
+ return tqttde_getSaveFileName(
initialSelection, filter, workingDirectory, widgetToWinId( parent ), name, caption, selectedFilter );
}
-TQString TQKDEIntegration::getExistingDirectory( const TQString& initialDirectory, TQWidget* parent,
+TQString TQTDEIntegration::getExistingDirectory( const TQString& initialDirectory, TQWidget* parent,
const char* name, const TQString& caption )
{
- return tqtkde_getExistingDirectory(
+ return tqttde_getExistingDirectory(
initialDirectory, widgetToWinId( parent ), name, caption );
}
-TQColor TQKDEIntegration::getColor( const TQColor& color, TQWidget* parent, const char* name )
+TQColor TQTDEIntegration::getColor( const TQColor& color, TQWidget* parent, const char* name )
{
- return tqtkde_getColor(
+ return tqttde_getColor(
color, widgetToWinId( parent ), name );
}
-TQFont TQKDEIntegration::getFont( bool* ok, const TQFont* def, TQWidget* parent, const char* name )
+TQFont TQTDEIntegration::getFont( bool* ok, const TQFont* def, TQWidget* parent, const char* name )
{
- return tqtkde_getFont(
+ return tqttde_getFont(
ok, fontPtrToFontRef( def ), widgetToWinId( parent ), name );
}
-int TQKDEIntegration::messageBox1( int type, TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::messageBox1( int type, TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return tqtkde_messageBox1(
+ return tqttde_messageBox1(
type, widgetToWinId( parent ), caption, text, button0, button1, button2 );
}
-int TQKDEIntegration::messageBox2( int type, TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::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 tqtkde_messageBox2(
+ return tqttde_messageBox2(
type, widgetToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
// ---
-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, widgetToWinId( 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, widgetToWinId( 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, widgetToWinId( 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, widgetToWinId( 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, widgetToWinId( 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, widgetToWinId( 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, widgetToWinId( 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, widgetToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
diff --git a/src/kernel/tqtkdeintegration_x11_p.h b/src/kernel/tqttdeintegration_x11_p.h
index 10ee4443..fe8c2302 100644
--- a/src/kernel/tqtkdeintegration_x11_p.h
+++ b/src/kernel/tqttdeintegration_x11_p.h
@@ -1,8 +1,8 @@
/* 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 */
-#ifndef TQKDEINTEGRATION_H
-#define TQKDEINTEGRATION_H
+#ifndef TQTDEINTEGRATION_H
+#define TQTDEINTEGRATION_H
#include <ntqstringlist.h>
@@ -11,7 +11,7 @@ class TQWidget;
class TQColor;
class TQFont;
-class TQKDEIntegration
+class TQTDEIntegration
{
public:
static bool enabled();