From a9cfcd75daef74e494a2632af260f1f92b834b4a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Oct 2011 19:05:08 +0000 Subject: TQt port tqt3integration git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1259732 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../utils/qt/in/qtkdeintegration_x11_0.cpp.cmake | 2 +- .../utils/qt/in/qtkdeintegration_x11_1.cpp | 46 ++++++++++----------- .../utils/qt/in/qtkdeintegration_x11_2.cpp | 48 +++++++++++----------- .../utils/qt/in/qtkdeintegration_x11_p_1.h | 16 ++++---- 4 files changed, 56 insertions(+), 56 deletions(-) (limited to 'tqt3integration/utils/qt') diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake index 37b84a776..b0d5fd517 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake @@ -1 +1 @@ -#define QTKDELIBDIR @PLUGIN_INSTALL_DIR@/plugins/integration +#define TQTKDELIBDIR @PLUGIN_INSTALL_DIR@/plugins/integration diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp index 0fe1b3baf..ec9c976d8 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp @@ -18,56 +18,56 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "qtkdeintegration_x11_p.h" +#include "tqtkdeintegration_x11_p.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -bool QKDEIntegration::inited = false; -bool QKDEIntegration::enable = false; +bool TQKDEIntegration::inited = false; +bool TQKDEIntegration::enable = false; -bool QKDEIntegration::enabled() +bool TQKDEIntegration::enabled() { if( !inited ) initLibrary(); return enable; } -static QCString findLibrary() +static TQCString findLibrary() { if( getenv( "KDE_FULL_SESSION" ) == NULL ) return ""; if( getenv( "KDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "KDE_FULL_SESSION" )[ 0 ] != '1' ) return ""; - if( getenv( "QT_NO_KDE_INTEGRATION" ) == NULL - || getenv( "QT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) + if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL + || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) { - return QCString( QTKDELIBDIR ) + "/libqtkde"; + return TQCString( TQTKDELIBDIR ) + "/libqtkde"; } return ""; } -static long parentToWinId( const QWidget* w ) +static long parentToWinId( const TQWidget* w ) { if( w != NULL ) - return w->topLevelWidget()->winId(); + return w->tqtopLevelWidget()->winId(); // try to find some usable parent - if( qApp->activeWindow() && w != qApp->activeWindow()) - return qApp->activeWindow()->winId(); - if( qApp->mainWidget() && w != qApp->mainWidget()) - return qApp->mainWidget()->winId(); + if( tqApp->activeWindow() && w != tqApp->activeWindow()) + return tqApp->activeWindow()->winId(); + if( tqApp->mainWidget() && w != tqApp->mainWidget()) + return tqApp->mainWidget()->winId(); return 0; } -inline static QFont fontPtrToFontRef( const QFont* f ) +inline static TQFont fontPtrToFontRef( const TQFont* f ) { - return f != NULL ? *f : QFont(); + return f != NULL ? *f : TQFont(); } // --- diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp index d22f5e9af..ebeac1ab7 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp @@ -20,62 +20,62 @@ // --- -int QKDEIntegration::information( QWidget* parent, const QString& caption, - const QString& text, int button0, int button1, int button2 ) +int TQKDEIntegration::information( TQWidget* parent, const TQString& caption, + const TQString& text, int button0, int button1, int button2 ) { return qtkde_messageBox1( - QMessageBox::Information, parentToWinId( parent ), caption, text, button0, button1, button2 ); + TQMessageBox::Information, parentToWinId( parent ), caption, text, button0, button1, button2 ); } -int QKDEIntegration::question( QWidget* parent, const QString& caption, - const QString& text, int button0, int button1, int button2 ) +int TQKDEIntegration::question( TQWidget* parent, const TQString& caption, + const TQString& text, int button0, int button1, int button2 ) { return qtkde_messageBox1( - QMessageBox::Question, parentToWinId( parent ), caption, text, button0, button1, button2 ); + TQMessageBox::Question, parentToWinId( parent ), caption, text, button0, button1, button2 ); } -int QKDEIntegration::warning( QWidget* parent, const QString& caption, - const QString& text, int button0, int button1, int button2 ) +int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption, + const TQString& text, int button0, int button1, int button2 ) { return qtkde_messageBox1( - QMessageBox::Warning, parentToWinId( parent ), caption, text, button0, button1, button2 ); + TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0, button1, button2 ); } -int QKDEIntegration::critical( QWidget* parent, const QString& caption, - const QString& text, int button0, int button1, int button2 ) +int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption, + const TQString& text, int button0, int button1, int button2 ) { return qtkde_messageBox1( - QMessageBox::Critical, parentToWinId( parent ), caption, text, button0, button1, button2 ); + TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0, button1, button2 ); } -int QKDEIntegration::information( QWidget* parent, const QString& caption, - const QString& text, const QString& button0Text, const QString& button1Text, const QString& button2Text, +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( - QMessageBox::Information, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); + TQMessageBox::Information, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } -int QKDEIntegration::question( QWidget* parent, const QString& caption, - const QString& text, const QString& button0Text, const QString& button1Text, const QString& button2Text, +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( - QMessageBox::Question, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); + TQMessageBox::Question, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } -int QKDEIntegration::warning( QWidget* parent, const QString& caption, - const QString& text, const QString& button0Text, const QString& button1Text, const QString& button2Text, +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( - QMessageBox::Warning, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); + TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } -int QKDEIntegration::critical( QWidget* parent, const QString& caption, - const QString& text, const QString& button0Text, const QString& button1Text, const QString& button2Text, +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( - QMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); + TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h b/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h index 118e861e7..5cd0d803c 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h @@ -18,17 +18,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef QKDEINTEGRATION_H -#define QKDEINTEGRATION_H +#ifndef TQKDEINTEGRATION_H +#define TQKDEINTEGRATION_H -#include +#include -class QLibrary; -class QWidget; -class QColor; -class QFont; +class TQLibrary; +class TQWidget; +class TQColor; +class TQFont; -class QKDEIntegration +class TQKDEIntegration { public: static bool enabled(); -- cgit v1.2.1