diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-09-28 02:50:01 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-09-28 02:50:32 +0200 |
| commit | a72081c4238ad2309872da8a5b751ddcc736b4a9 (patch) | |
| tree | 542e79cbc57c07b6a4ee0882d42768812d9ca77d | |
| parent | 99ec83a68787294651683a10afa4ad5faa31173a (diff) | |
| download | tdebase-a72081c4238ad2309872da8a5b751ddcc736b4a9.tar.gz tdebase-a72081c4238ad2309872da8a5b751ddcc736b4a9.zip | |
qt => tqt conversion:
+ libqtkde => libtqtkde
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
23 files changed, 105 insertions, 368 deletions
diff --git a/tqt3integration/README b/tqt3integration/README index 0e81a7ed6..47edd1440 100644 --- a/tqt3integration/README +++ b/tqt3integration/README @@ -1,10 +1,10 @@ -Qt/KDE UI integration. Makes Qt-only apps use several KDE dialogs without any modifications -to these applications. Can be turned off by setting $QT_NO_KDE_INTEGRATION. +TQt/KDE UI integration. Makes TQt-only apps use several KDE dialogs without any modifications +to these applications. Can be turned off by setting $TQT_NO_KDE_INTEGRATION. Installation: Just plain make && make install. -Additionally 'make generate' needs to be done in utils/, and Qt needs to be patched using the sources -generated in utils/qt . Patch should be applied, the .cpp/.h files belong to src/kernel/ , +Additionally 'make generate' needs to be done in utils/, and TQt needs to be patched using the sources +generated in utils/tqt . Patch should be applied, the .cpp/.h files belong to src/kernel/ , the .h file additionally should go to include/private . diff --git a/tqt3integration/configure.in.in b/tqt3integration/configure.in.in index 8e36cc206..b2c264dea 100644 --- a/tqt3integration/configure.in.in +++ b/tqt3integration/configure.in.in @@ -1,5 +1,5 @@ -qtkdelibdir="\${kde_moduledir}/plugins/integration" -KDE_EXPAND_MAKEVAR(ac_qtkdelibdir,qtkdelibdir) -AC_SUBST(qtkdelibdir) -AC_SUBST(ac_qtkdelibdir) -dnl AC_OUTPUT(qtkdeintegration/utils/qt/in/qtkdeintegration_x11_0.cpp) +tqtkdelibdir="\${kde_moduledir}/plugins/integration" +KDE_EXPAND_MAKEVAR(ac_tqtkdelibdir,tqtkdelibdir) +AC_SUBST(tqtkdelibdir) +AC_SUBST(ac_tqtkdelibdir) +dnl AC_OUTPUT(tqtkdeintegration/utils/tqt/in/tqtkdeintegration_x11_0.cpp) diff --git a/tqt3integration/libqtkde/Makefile.am b/tqt3integration/libqtkde/Makefile.am deleted file mode 100644 index d294a1209..000000000 --- a/tqt3integration/libqtkde/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -qtkdelib_LTLIBRARIES = libtqtkde.la - -libtqtkde_la_SOURCES = qtkde.cpp -libtqtkde_la_LIBADD = -lDCOP -libtqtkde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version - -CLEANFILES = qtkde_functions.cpp - -INCLUDES = $(all_includes) -METASOURCES = AUTO - -qtkde.lo : qtkde_functions.cpp - -qtkde_functions.cpp : ../utils/qtkde_functions.cpp - cp -f ../utils/qtkde_functions.cpp . || exit 1 diff --git a/tqt3integration/libqtkde/CMakeLists.txt b/tqt3integration/libtqtkde/CMakeLists.txt index e6ecc6ad3..9c4c5318a 100644 --- a/tqt3integration/libqtkde/CMakeLists.txt +++ b/tqt3integration/libtqtkde/CMakeLists.txt @@ -22,12 +22,13 @@ link_directories( ${TQT_LIBRARY_DIRS} ) + ##### libtqtkde (shared) #################### -tde_add_library( qtkde SHARED AUTOMOC - SOURCES qtkde.cpp +tde_add_library( tqtkde SHARED AUTOMOC + SOURCES tqtkde.cpp VERSION 0.0.0 LINK tdeui-shared DEPENDENCIES generate_tqt3_bindings DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/" -)
\ No newline at end of file +) diff --git a/tqt3integration/libtqtkde/Makefile.am b/tqt3integration/libtqtkde/Makefile.am new file mode 100644 index 000000000..8f239fe8a --- /dev/null +++ b/tqt3integration/libtqtkde/Makefile.am @@ -0,0 +1,15 @@ +tqtkdelib_LTLIBRARIES = libtqtkde.la + +libtqtkde_la_SOURCES = tqtkde.cpp +libtqtkde_la_LIBADD = -lDCOP +libtqtkde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version + +CLEANFILES = tqtkde_functions.cpp + +INCLUDES = $(all_includes) +METASOURCES = AUTO + +tqtkde.lo : tqtkde_functions.cpp + +tqtkde_functions.cpp : ../utils/tqtkde_functions.cpp + cp -f ../utils/tqtkde_functions.cpp . || exit 1 diff --git a/tqt3integration/libqtkde/qtkde.cpp b/tqt3integration/libtqtkde/tqtkde.cpp index 96ad72429..ced1c338e 100644 --- a/tqt3integration/libqtkde/qtkde.cpp +++ b/tqt3integration/libtqtkde/tqtkde.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "qtkde.h" +#include "tqtkde.h" #include <assert.h> #include <dcopclient.h> @@ -89,7 +89,7 @@ static DCOPClient* dcopClient() dcop->bindToApp(); if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking { - static qtkde_EventLoop* loop = new qtkde_EventLoop; + static tqtkde_EventLoop* loop = new tqtkde_EventLoop; TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool ))); } } @@ -122,7 +122,7 @@ static int input_filter( XEvent* e ) return false; } -void qtkde_EventLoop::block( bool b ) +void tqtkde_EventLoop::block( bool b ) { if( b ) old_filter = tqt_set_x11_event_filter( input_filter ); @@ -144,4 +144,4 @@ static TQString getHostname() #include "tqtkde_functions.cpp" -#include "qtkde.moc" +#include "tqtkde.moc" diff --git a/tqt3integration/libqtkde/qtkde.h b/tqt3integration/libtqtkde/tqtkde.h index 8ee2c061d..426221eba 100644 --- a/tqt3integration/libqtkde/qtkde.h +++ b/tqt3integration/libtqtkde/tqtkde.h @@ -23,11 +23,11 @@ #include <tqobject.h> -class qtkde_EventLoop +class tqtkde_EventLoop : public TQObject { Q_OBJECT - + public slots: void block( bool ); }; diff --git a/tqt3integration/module/CMakeLists.txt b/tqt3integration/module/CMakeLists.txt index dd7a62ebe..93c059405 100644 --- a/tqt3integration/module/CMakeLists.txt +++ b/tqt3integration/module/CMakeLists.txt @@ -22,10 +22,12 @@ link_directories( ${TQT_LIBRARY_DIRS} ) + ##### service desktop file(s) ########################## install( FILES kdeintegration.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) + ##### kded_kdeintegration (module) ##################### set( target kded_kdeintegration ) @@ -39,4 +41,4 @@ tde_add_kpart( ${target} AUTOMOC LINK tdeinit_kded-shared DEPENDENCIES generate_tqt3_bindings DESTINATION ${PLUGIN_INSTALL_DIR} -)
\ No newline at end of file +) diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index 79ac1325f..a0be507b0 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -60,8 +60,8 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1, w->move( info.geometry().x() + ( info.geometry().width() - w->width())/2, info.geometry().y() + ( info.geometry().height()- w->height())/2 ); } - -// duped in qtkde + +// duped in tqtkde static TQString getHostname() { char hostname[ 256 ]; diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt index da78e6a99..ffdd72739 100644 --- a/tqt3integration/utils/CMakeLists.txt +++ b/tqt3integration/utils/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -add_subdirectory( qt ) +add_subdirectory( tqt ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} @@ -32,13 +32,18 @@ tde_add_executable( gen AUTOMOC ) ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qtkde_functions.cpp ${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp ${CMAKE_CURRENT_BINARY_DIR}/module_functions.h - COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/qt + OUTPUT + ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp + ${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp + ${CMAKE_CURRENT_BINARY_DIR}/module_functions.h + COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/tqt COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen ${CMAKE_CURRENT_SOURCE_DIR}/gen.txt - COMMAND cat ${CMAKE_CURRENT_BINARY_DIR}/qt/in/qtkdeintegration_x11_0.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qt/in/qtkdeintegration_x11_1.cpp ${CMAKE_CURRENT_BINARY_DIR}/qtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_SOURCE_DIR}/qt/in/qtkdeintegration_x11_2.cpp > ${CMAKE_CURRENT_BINARY_DIR}/qt/qtkdeintegration_x11.cpp - COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/qt/in/qtkdeintegration_x11_p_1.h ${CMAKE_CURRENT_BINARY_DIR}/qtkdeintegration_x11_p.h.gen ${CMAKE_CURRENT_SOURCE_DIR}/qt/in/qtkdeintegration_x11_p_2.h > ${CMAKE_CURRENT_BINARY_DIR}/qt/qtkdeintegration_x11_p.h - COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/qtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/qtkdeintegration_x11_p.h.gen -# COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/qt/in/qt.patch ${CMAKE_CURRENT_BINARY_DIR}/qt/ + COMMAND cat ${CMAKE_CURRENT_BINARY_DIR}/tqt/in/tqtkdeintegration_x11_0.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_1.cpp ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_2.cpp > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqtkdeintegration_x11.cpp + COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_p_1.h ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11_p.h.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_p_2.h > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqtkdeintegration_x11_p.h + COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11_p.h.gen DEPENDS gen ) -ADD_CUSTOM_TARGET(generate_tqt3_bindings DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qtkde_functions.cpp)
\ No newline at end of file + +ADD_CUSTOM_TARGET( generate_tqt3_bindings + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp +) diff --git a/tqt3integration/utils/Makefile.am b/tqt3integration/utils/Makefile.am index 0d46eb92f..88f92b52a 100644 --- a/tqt3integration/utils/Makefile.am +++ b/tqt3integration/utils/Makefile.am @@ -3,17 +3,16 @@ gen_SOURCES = gen.cpp gen_LDADD = $(LIB_TDECORE) gen_LDFLAGS = $(all_libraries) INCLUDES = $(all_includes) -CLEANFILES = qtkde_functions.cpp module_functions.cpp module_functions.h generated -SUBDIRS = qt +CLEANFILES = tqtkde_functions.cpp module_functions.cpp module_functions.h generated +SUBDIRS = tqt generate: generated generated: gen gen.txt ./gen || exit 1 - cat qt/in/qtkdeintegration_x11_0.cpp qt/in/qtkdeintegration_x11_1.cpp qtkdeintegration_x11.cpp.gen qt/in/qtkdeintegration_x11_2.cpp >qt/qtkdeintegration_x11.cpp - cat qt/in/qtkdeintegration_x11_p_1.h qtkdeintegration_x11_p.h.gen qt/in/qtkdeintegration_x11_p_2.h >qt/qtkdeintegration_x11_p.h - rm -f qtkdeintegration_x11.cpp.gen qtkdeintegration_x11_p.h.gen - cp -f qt/in/qt.patch qt/ + cat tqt/in/tqtkdeintegration_x11_0.cpp tqt/in/tqtkdeintegration_x11_1.cpp tqtkdeintegration_x11.cpp.gen tqt/in/tqtkdeintegration_x11_2.cpp >tqt/tqtkdeintegration_x11.cpp + cat tqt/in/tqtkdeintegration_x11_p_1.h tqtkdeintegration_x11_p.h.gen tqt/in/tqtkdeintegration_x11_p_2.h >tqt/tqtkdeintegration_x11_p.h + rm -f tqtkdeintegration_x11.cpp.gen tqtkdeintegration_x11_p.h.gen touch generated -qtkde_functions.cpp module_functions.cpp module_functions.h : generated +tqtkde_functions.cpp module_functions.cpp module_functions.h : generated diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp index 80e597742..754aa9305 100644 --- a/tqt3integration/utils/gen.cpp +++ b/tqt3integration/utils/gen.cpp @@ -31,8 +31,8 @@ FUNCTION <name> RETURN_TYPE <type> DELAYED_RETURN - use DCOP transaction in kded module, function will take some time to finish - SKIP_QT - don't generate in qt file - ONLY_QT - generate only in qt file + SKIP_TQT - don't generate in tqt file + ONLY_TQT - generate only in tqt file ADD_APPINFO - generate wmclass arguments ARG <name> TYPE <type> @@ -44,7 +44,7 @@ FUNCTION <name> OUT_ARGUMENT CONVERSION <function> BACK_CONVERSION <function> - for out arguments - CREATE <function> - doesn't exist in TQt, create in qtkde using function + CREATE <function> - doesn't exist in TQt, create in tqtkde using function PARENT - the argument is a parent window to be used for windows ENDARG ENDFUNCTION @@ -70,12 +70,12 @@ struct Arg struct Function { - Function() : delayed_return( false ), skip_qt( false ), only_qt( false ), add_appinfo( false ) {} + Function() : delayed_return( false ), skip_tqt( false ), only_tqt( false ), add_appinfo( false ) {} TQString name; TQString return_type; bool delayed_return; - bool skip_qt; - bool only_qt; + bool skip_tqt; + bool only_tqt; bool add_appinfo; TQValueList< Arg > args; void stripNonOutArguments(); @@ -274,10 +274,10 @@ void parseFunction( const TQString& details ) } else if( line.startsWith( "DELAYED_RETURN" )) function.delayed_return = true; - else if( line.startsWith( "SKIP_QT" )) - function.skip_qt = true; - else if( line.startsWith( "ONLY_QT" )) - function.only_qt = true; + else if( line.startsWith( "SKIP_TQT" )) + function.skip_tqt = true; + else if( line.startsWith( "ONLY_TQT" )) + function.only_tqt = true; else if( line.startsWith( "ADD_APPINFO" )) function.add_appinfo = true; else if( line.startsWith( "ARG" )) @@ -366,7 +366,7 @@ void generateFunction( TQTextStream& stream, const Function& function, const TQS void generateTQtH() { - TQFile file( "qtkdeintegration_x11_p.h.gen" ); + TQFile file( "tqtkdeintegration_x11_p.h.gen" ); if( !file.open( IO_WriteOnly )) error(); TQTextStream stream( &file ); @@ -375,7 +375,7 @@ void generateTQtH() ++it ) { Function f = *it; - if( f.skip_qt ) + if( f.skip_tqt ) continue; f.stripCreatedArguments(); generateFunction( stream, f, f.name, 8, @@ -386,7 +386,7 @@ void generateTQtH() void generateTQtCpp() { - TQFile file( "qtkdeintegration_x11.cpp.gen" ); + TQFile file( "tqtkdeintegration_x11.cpp.gen" ); if( !file.open( IO_WriteOnly )) error(); TQTextStream stream( &file ); @@ -395,10 +395,10 @@ void generateTQtCpp() ++it ) { Function f = *it; - if( f.only_qt ) + if( f.only_tqt ) continue; f.stripCreatedArguments(); - generateFunction( stream, f, "(*qtkde_" + f.name + ")", 0, + generateFunction( stream, f, "(*tqtkde_" + f.name + ")", 0, true /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ ); stream << ";\n"; } @@ -422,19 +422,19 @@ void generateTQtCpp() ++it ) { Function function = *it; - if( function.only_qt ) + if( function.only_tqt ) continue; - stream << makeIndent( 8 ) + "qtkde_" + function.name + " = (\n"; + stream << makeIndent( 8 ) + "tqtkde_" + function.name + " = (\n"; function.stripCreatedArguments(); generateFunction( stream, function, "(*)", 12, false /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ ); stream << "\n" + makeIndent( 12 ) + ")\n"; stream << makeIndent( 12 ) + "lib.resolve(\"" + (*it).name + "\");\n"; - stream << makeIndent( 8 ) + "if( qtkde_" + (*it).name + " == NULL )\n"; + stream << makeIndent( 8 ) + "if( tqtkde_" + (*it).name + " == NULL )\n"; stream << makeIndent( 12 ) + "return;\n"; } stream << -" enable = qtkde_initializeIntegration();\n" +" enable = tqtkde_initializeIntegration();\n" " }\n" " }\n" "\n"; @@ -443,14 +443,14 @@ void generateTQtCpp() ++it1 ) { Function function = *it1; - if( function.skip_qt || function.only_qt ) + if( function.skip_tqt || function.only_tqt ) continue; function.stripCreatedArguments(); generateFunction( stream, function, "QKDEIntegration::" + function.name, 0, false /*static*/, true /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ ); stream << "\n"; stream << makeIndent( 4 ) + "{\n"; - stream << makeIndent( 4 ) + "return qtkde_" + function.name + "(\n"; + stream << makeIndent( 4 ) + "return tqtkde_" + function.name + "(\n"; stream << makeIndent( 8 ); bool need_comma = false; for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); @@ -490,7 +490,7 @@ void generateTQtKde() ++it1 ) { const Function& function = *it1; - if( function.only_qt ) + if( function.only_tqt ) continue; Function stripped_function = function; stripped_function.stripCreatedArguments(); @@ -651,7 +651,7 @@ void generateKdeDcop( TQTextStream& stream ) ++it1 ) { const Function& function = *it1; - if( function.only_qt ) + if( function.only_tqt ) continue; stream << " if( fun == \"" + function.name + "("; bool need_comma = false; @@ -692,7 +692,7 @@ void generateKdeDcop( TQTextStream& stream ) ++it1 ) { const Function& function = *it1; - if( function.only_qt ) + if( function.only_tqt ) continue; stream << " funcs << \"" + function.name + "("; bool need_comma = false; @@ -730,7 +730,7 @@ void generateKdePreStub( TQTextStream& stream ) ++it1 ) { const Function& function = *it1; - if( function.only_qt ) + if( function.only_tqt ) continue; stream << "void Module::pre_" + function.name + "( const TQByteArray& " + ( function.args.isEmpty() ? "" : "data" ) @@ -803,7 +803,7 @@ void generateKdePostStub( TQTextStream& stream ) ++it1 ) { const Function& function = *it1; - if( function.only_qt ) + if( function.only_tqt ) continue; stream << "void Module::post_" + function.name + "( "; bool needs_comma = false; @@ -842,7 +842,7 @@ void generateKdePostStub( TQTextStream& stream ) stream << " JobData job = jobs[ handle ];\n"; stream << " jobs.remove( handle );\n"; stream << " TQByteArray replyData;\n"; - stream << " TQCString replyType = \"qtkde\";\n"; + stream << " TQCString replyType = \"tqtkde\";\n"; } bool return_data = false; for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); @@ -904,7 +904,7 @@ void generateKdeH() ++it1 ) { const Function& function = *it1; - if( function.only_qt ) + if( function.only_tqt ) continue; Function real_function = function; if( function.delayed_return ) diff --git a/tqt3integration/utils/gen.txt b/tqt3integration/utils/gen.txt index 4befc9645..f1c1571ba 100644 --- a/tqt3integration/utils/gen.txt +++ b/tqt3integration/utils/gen.txt @@ -218,7 +218,7 @@ ENDFUNCTION FUNCTION information RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* @@ -249,7 +249,7 @@ ENDFUNCTION FUNCTION question RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* @@ -280,7 +280,7 @@ ENDFUNCTION FUNCTION warning RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* @@ -311,7 +311,7 @@ ENDFUNCTION FUNCTION critical RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* @@ -387,7 +387,7 @@ ENDFUNCTION FUNCTION information RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* @@ -428,7 +428,7 @@ ENDFUNCTION FUNCTION question RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* @@ -469,7 +469,7 @@ ENDFUNCTION FUNCTION warning RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* @@ -510,7 +510,7 @@ ENDFUNCTION FUNCTION critical RETURN_TYPE int DELAYED_RETURN - ONLY_QT + ONLY_TQT ARG parent TYPE long ORIG_TYPE TQWidget* diff --git a/tqt3integration/utils/qt/Makefile.am b/tqt3integration/utils/qt/Makefile.am deleted file mode 100644 index c4667d0bd..000000000 --- a/tqt3integration/utils/qt/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -CLEANFILES = qt.patch qtkdeintegration_x11.cpp qtkdeintegration_x11_p.h diff --git a/tqt3integration/utils/qt/in/qt.patch b/tqt3integration/utils/qt/in/qt.patch deleted file mode 100644 index b67571887..000000000 --- a/tqt3integration/utils/qt/in/qt.patch +++ /dev/null @@ -1,270 +0,0 @@ ---- src/dialogs/qfiledialog.cpp.sav 2004-12-08 15:39:41.000000000 +0100 -+++ src/dialogs/qfiledialog.cpp 2004-12-13 16:53:40.000000000 +0100 -@@ -92,6 +92,10 @@ - #include "qvbox.h" - #include "qwidgetstack.h" - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - #ifdef Q_WS_WIN - #ifdef TQT_THREAD_SUPPORT - # include <private/qmutexpool_p.h> -@@ -3428,7 +3432,11 @@ QString QFileDialog::getOpenFileName( co - if ( workingDirectory->isNull() ) - *workingDirectory = QDir::currentDirPath(); - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, -+ caption, selectedFilter, false ).first(); -+#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) - return winGetOpenFileName( initialSelection, filter, workingDirectory, - parent, name, caption, selectedFilter ); -@@ -3546,7 +3554,11 @@ QString QFileDialog::getSaveFileName( co - if ( workingDirectory->isNull() ) - *workingDirectory = QDir::currentDirPath(); - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory, -+ parent, name, caption, selectedFilter ); -+#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) - return winGetSaveFileName( initialSelection, filter, workingDirectory, - parent, name, caption, selectedFilter ); -@@ -4433,7 +4445,17 @@ QString QFileDialog::getExistingDirector - if ( workingDirectory ) - wd = *workingDirectory; - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ QString initialDir; -+ if ( !dir.isEmpty() ) { -+ QUrlOperator u( dir ); -+ if ( QFileInfo( u.path() ).isDir() ) -+ initialDir = dir; -+ } else -+ initialDir = QString::null; -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getExistingDirectory( initialDir, parent, name, caption ); -+#elif defined(Q_WS_WIN) - QString initialDir; - if ( !dir.isEmpty() ) { - QUrlOperator u( dir ); -@@ -5586,7 +5608,10 @@ QStringList QFileDialog::getOpenFileName - } - } - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true ); -+#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) - return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter ); - #elif defined(Q_WS_MAC) ---- src/dialogs/qmessagebox.cpp.sav 2003-12-22 12:24:32.000000000 +0100 -+++ src/dialogs/qmessagebox.cpp 2005-01-05 18:05:29.638723917 +0100 -@@ -54,6 +54,12 @@ - #endif - - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ -+extern bool qt_use_native_dialogs; -+ - // Internal class - don't touch - - class QMessageBoxLabel : public QLabel -@@ -1104,6 +1110,10 @@ int QMessageBox::information( QWidget *p - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::information( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Information, - button0, button1, button2, - parent, "qt_msgbox_information", TRUE, -@@ -1151,6 +1161,10 @@ int QMessageBox::question( QWidget *pare - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::question( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Question, - button0, button1, button2, - parent, "qt_msgbox_information", TRUE, -@@ -1199,6 +1213,10 @@ int QMessageBox::warning( QWidget *paren - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::warning( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Warning, - button0, button1, button2, - parent, "qt_msgbox_warning", TRUE, -@@ -1247,6 +1265,10 @@ int QMessageBox::critical( QWidget *pare - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::critical( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Critical, - button0, button1, button2, - parent, "qt_msgbox_critical", TRUE, -@@ -1394,6 +1416,11 @@ int QMessageBox::information( QWidget *p - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::information( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Information, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); -@@ -1436,6 +1463,11 @@ int QMessageBox::question( QWidget *pare - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::question( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Question, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); -@@ -1480,6 +1512,11 @@ int QMessageBox::warning( QWidget *paren - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::warning( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Warning, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); -@@ -1520,6 +1557,11 @@ int QMessageBox::critical( QWidget *pare - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::critical( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Critical, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); ---- src/dialogs/qfontdialog.cpp.sav 2004-08-12 14:32:06.000000000 +0200 -+++ src/dialogs/qfontdialog.cpp 2004-12-13 19:02:31.000000000 +0100 -@@ -56,6 +56,10 @@ - #include <private/qfontdata_p.h> - #include <qvalidator.h> - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - /*! - \class QFontDialog qfontdialog.h - \ingroup dialogs -@@ -384,9 +388,15 @@ QFont QFontDialog::getFont( bool *ok, QW - return getFont( ok, 0, parent, name ); - } - -+extern bool qt_use_native_dialogs; -+ - QFont QFontDialog::getFont( bool *ok, const QFont *def, - QWidget *parent, const char* name) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getFont( ok, def, parent, name ); -+#endif - QFont result; - if ( def ) - result = *def; ---- src/dialogs/qcolordialog.cpp.sav 2004-04-30 12:00:05.000000000 +0200 -+++ src/dialogs/qcolordialog.cpp 2004-12-13 16:53:40.000000000 +0100 -@@ -60,6 +60,10 @@ QRgb macGetRgba( QRgb initial, bool *ok, - QColor macGetColor( const QColor& initial, QWidget *parent, const char *name ); - #endif - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - //////////// QWellArray BEGIN - - struct QWellArrayData; -@@ -1478,7 +1482,10 @@ QColorDialog::QColorDialog(QWidget* pare - QColor QColorDialog::getColor( const QColor& initial, QWidget *parent, - const char *name ) - { --#if defined(Q_WS_MAC) -+#if defined(Q_WS_X11) -+ if( QKDEIntegration::enabled()) -+ return QKDEIntegration::getColor( initial, parent, name ); -+#elif defined(Q_WS_MAC) - return macGetColor(initial, parent, name); - #endif - -@@ -1516,6 +1523,13 @@ QRgb QColorDialog::getRgba( QRgb initial - QWidget *parent, const char* name ) - { - #if defined(Q_WS_MAC) -+ if( QKDEIntegration::enabled()) { -+ QColor color = QKDEIntegration::getColor( QColor( initial ), parent, name ); -+ if( ok ) -+ *ok = color.isValid(); -+ return color.rgba(); -+ } -+#elif defined(Q_WS_MAC) - return macGetRgba(initial, ok, parent, name); - #endif - ---- src/kernel/qt_x11.pri.sav 2004-11-15 17:51:45.000000000 +0100 -+++ src/kernel/qt_x11.pri 2004-12-13 16:53:40.000000000 +0100 -@@ -10,6 +10,9 @@ 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 - } - - nas { ---- src/kernel/qt.h.sav 2004-02-16 15:05:19.000000000 +0100 -+++ src/kernel/qt.h 2004-12-13 16:53:40.000000000 +0100 -@@ -313,6 +313,10 @@ - #endif // Private headers - - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - #ifdef Q_WS_MAC - #include <qaquastyle.h> - #include <qmacstyle_mac.h> diff --git a/tqt3integration/utils/qt/CMakeLists.txt b/tqt3integration/utils/tqt/CMakeLists.txt index de5ffb4e8..de5ffb4e8 100644 --- a/tqt3integration/utils/qt/CMakeLists.txt +++ b/tqt3integration/utils/tqt/CMakeLists.txt diff --git a/tqt3integration/utils/tqt/Makefile.am b/tqt3integration/utils/tqt/Makefile.am new file mode 100644 index 000000000..5d77e5d2b --- /dev/null +++ b/tqt3integration/utils/tqt/Makefile.am @@ -0,0 +1 @@ +CLEANFILES = tqtkdeintegration_x11.cpp tqtkdeintegration_x11_p.h diff --git a/tqt3integration/utils/qt/in/CMakeLists.txt b/tqt3integration/utils/tqt/in/CMakeLists.txt index e6fa392d5..c9bc36f92 100644 --- a/tqt3integration/utils/qt/in/CMakeLists.txt +++ b/tqt3integration/utils/tqt/in/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -configure_file( qtkdeintegration_x11_0.cpp.cmake qtkdeintegration_x11_0.cpp @ONLY )
\ No newline at end of file +configure_file( tqtkdeintegration_x11_0.cpp.cmake tqtkdeintegration_x11_0.cpp @ONLY ) diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake index b0d5fd517..b0d5fd517 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake +++ b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp index 36d4e075c..36d4e075c 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp +++ b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp index ffd8d1fe6..f9ab72d70 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp +++ b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp @@ -23,28 +23,28 @@ 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, parentToWinId( 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, parentToWinId( 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, parentToWinId( 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, parentToWinId( parent ), caption, text, button0, button1, button2 ); } @@ -52,7 +52,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, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } @@ -60,7 +60,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, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } @@ -68,7 +68,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, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } @@ -76,6 +76,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, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h index 2a23b74b7..59a0127b9 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h +++ b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h @@ -32,4 +32,4 @@ class TQKDEIntegration { public: static bool enabled(); -// --- +// --- diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_2.h b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h index 63d569fc0..63d569fc0 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_2.h +++ b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h |