diff options
Diffstat (limited to 'tqt3integration/utils')
| -rw-r--r-- | tqt3integration/utils/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tqt3integration/utils/Makefile.am | 10 | ||||
| -rw-r--r-- | tqt3integration/utils/gen.cpp | 60 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/Makefile.am | 2 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/in/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake | 1 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake | 1 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp) | 14 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp) | 32 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h) | 6 | ||||
| -rw-r--r-- | tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h) | 0 |
11 files changed, 69 insertions, 69 deletions
diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt index ffdd72739..c75567af5 100644 --- a/tqt3integration/utils/CMakeLists.txt +++ b/tqt3integration/utils/CMakeLists.txt @@ -33,17 +33,17 @@ tde_add_executable( gen AUTOMOC ADD_CUSTOM_COMMAND( OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp + ${CMAKE_CURRENT_BINARY_DIR}/tqttde_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}/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 + COMMAND cat ${CMAKE_CURRENT_BINARY_DIR}/tqt/in/tqttdeintegration_x11_0.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_1.cpp ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11.cpp.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_2.cpp > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqttdeintegration_x11.cpp + COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_p_1.h ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11_p.h.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_p_2.h > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqttdeintegration_x11_p.h + COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11_p.h.gen DEPENDS gen ) ADD_CUSTOM_TARGET( generate_tqt3_bindings - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp ) diff --git a/tqt3integration/utils/Makefile.am b/tqt3integration/utils/Makefile.am index 88f92b52a..033e78b4a 100644 --- a/tqt3integration/utils/Makefile.am +++ b/tqt3integration/utils/Makefile.am @@ -3,16 +3,16 @@ gen_SOURCES = gen.cpp gen_LDADD = $(LIB_TDECORE) gen_LDFLAGS = $(all_libraries) INCLUDES = $(all_includes) -CLEANFILES = tqtkde_functions.cpp module_functions.cpp module_functions.h generated +CLEANFILES = tqttde_functions.cpp module_functions.cpp module_functions.h generated SUBDIRS = tqt generate: generated generated: gen gen.txt ./gen || exit 1 - 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 + cat tqt/in/tqttdeintegration_x11_0.cpp tqt/in/tqttdeintegration_x11_1.cpp tqttdeintegration_x11.cpp.gen tqt/in/tqttdeintegration_x11_2.cpp >tqt/tqttdeintegration_x11.cpp + cat tqt/in/tqttdeintegration_x11_p_1.h tqttdeintegration_x11_p.h.gen tqt/in/tqttdeintegration_x11_p_2.h >tqt/tqttdeintegration_x11_p.h + rm -f tqttdeintegration_x11.cpp.gen tqttdeintegration_x11_p.h.gen touch generated -tqtkde_functions.cpp module_functions.cpp module_functions.h : generated +tqttde_functions.cpp module_functions.cpp module_functions.h : generated diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp index 754aa9305..03a2bf422 100644 --- a/tqt3integration/utils/gen.cpp +++ b/tqt3integration/utils/gen.cpp @@ -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 tqtkde using function + CREATE <function> - doesn't exist in TQt, create in tqttde using function PARENT - the argument is a parent window to be used for windows ENDARG ENDFUNCTION @@ -366,7 +366,7 @@ void generateFunction( TQTextStream& stream, const Function& function, const TQS void generateTQtH() { - TQFile file( "tqtkdeintegration_x11_p.h.gen" ); + TQFile file( "tqttdeintegration_x11_p.h.gen" ); if( !file.open( IO_WriteOnly )) error(); TQTextStream stream( &file ); @@ -386,7 +386,7 @@ void generateTQtH() void generateTQtCpp() { - TQFile file( "tqtkdeintegration_x11.cpp.gen" ); + TQFile file( "tqttdeintegration_x11.cpp.gen" ); if( !file.open( IO_WriteOnly )) error(); TQTextStream stream( &file ); @@ -398,13 +398,13 @@ void generateTQtCpp() if( f.only_tqt ) continue; f.stripCreatedArguments(); - generateFunction( stream, f, "(*tqtkde_" + f.name + ")", 0, + generateFunction( stream, f, "(*tqttde_" + f.name + ")", 0, true /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ ); stream << ";\n"; } stream << "\n" -"void TQKDEIntegration::initLibrary()\n" +"void TQTDEIntegration::initLibrary()\n" " {\n" " if( !inited )\n" " {\n" @@ -424,17 +424,17 @@ void generateTQtCpp() Function function = *it; if( function.only_tqt ) continue; - stream << makeIndent( 8 ) + "tqtkde_" + function.name + " = (\n"; + stream << makeIndent( 8 ) + "tqttde_" + 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( tqtkde_" + (*it).name + " == NULL )\n"; + stream << makeIndent( 8 ) + "if( tqttde_" + (*it).name + " == NULL )\n"; stream << makeIndent( 12 ) + "return;\n"; } stream << -" enable = tqtkde_initializeIntegration();\n" +" enable = tqttde_initializeIntegration();\n" " }\n" " }\n" "\n"; @@ -446,11 +446,11 @@ void generateTQtCpp() if( function.skip_tqt || function.only_tqt ) continue; function.stripCreatedArguments(); - generateFunction( stream, function, "QKDEIntegration::" + function.name, 0, + generateFunction( stream, function, "TQTDEIntegration::" + function.name, 0, false /*static*/, true /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ ); stream << "\n"; stream << makeIndent( 4 ) + "{\n"; - stream << makeIndent( 4 ) + "return tqtkde_" + function.name + "(\n"; + stream << makeIndent( 4 ) + "return tqttde_" + function.name + "(\n"; stream << makeIndent( 8 ); bool need_comma = false; for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); @@ -479,9 +479,9 @@ void generateTQt() generateTQtCpp(); } -void generateTQtKde() +void generateTQtTDE() { - TQFile file( "tqtkde_functions.cpp" ); + TQFile file( "tqttde_functions.cpp" ); if( !file.open( IO_WriteOnly )) error(); TQTextStream stream( &file ); @@ -552,7 +552,7 @@ void generateTQtKde() } stream << ";\n"; } - stream << " if( !dcopClient()->call( \"kded\", \"kdeintegration\",\"" + function.name + "("; + stream << " if( !dcopClient()->call( \"kded\", \"tdeintegration\",\"" + function.name + "("; bool need_comma = false; for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); it2 != function.args.end(); @@ -640,7 +640,7 @@ void generateTQtKde() } } -void generateKdeDcop( TQTextStream& stream ) +void genarateTDEDcop( TQTextStream& stream ) { stream << "bool Module::process(const TQCString &fun, const TQByteArray &data,\n" @@ -717,13 +717,13 @@ void generateKdeDcop( TQTextStream& stream ) "QCStringList Module::interfaces()\n" " {\n" " QCStringList ifaces = KDEDModule::interfaces();\n" -" ifaces << \"KDEIntegration\";\n" +" ifaces << \"TDEIntegration\";\n" " return ifaces;\n" " }\n" "\n"; } -void generateKdePreStub( TQTextStream& stream ) +void genarateTDEPreStub( TQTextStream& stream ) { for( TQValueList< Function >::ConstIterator it1 = functions.begin(); it1 != functions.end(); @@ -796,7 +796,7 @@ void generateKdePreStub( TQTextStream& stream ) } } -void generateKdePostStub( TQTextStream& stream ) +void genarateTDEPostStub( TQTextStream& stream ) { for( TQValueList< Function >::ConstIterator it1 = functions.begin(); it1 != functions.end(); @@ -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 = \"tqtkde\";\n"; + stream << " TQCString replyType = \"tqttde\";\n"; } bool return_data = false; for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); @@ -876,24 +876,24 @@ void generateKdePostStub( TQTextStream& stream ) } } -void generateKdeStubs( TQTextStream& stream ) +void genarateTDEStubs( TQTextStream& stream ) { - generateKdePreStub( stream ); - generateKdePostStub( stream ); + genarateTDEPreStub( stream ); + genarateTDEPostStub( stream ); // TODO udelat i predbezne deklarace pro skutecne funkce? } -void generateKdeCpp() +void genarateTDECpp() { TQFile file( "module_functions.cpp" ); if( !file.open( IO_WriteOnly )) error(); TQTextStream stream( &file ); - generateKdeDcop( stream ); - generateKdeStubs( stream ); + genarateTDEDcop( stream ); + genarateTDEStubs( stream ); } -void generateKdeH() +void genarateTDEH() { TQFile file( "module_functions.h" ); if( !file.open( IO_WriteOnly )) @@ -944,17 +944,17 @@ void generateKdeH() } } -void generateKde() +void genarateTDE() { - generateKdeCpp(); - generateKdeH(); + genarateTDECpp(); + genarateTDEH(); } void generate() { generateTQt(); - generateTQtKde(); - generateKde(); + generateTQtTDE(); + genarateTDE(); } int main (int argc, char *argv[]) diff --git a/tqt3integration/utils/tqt/Makefile.am b/tqt3integration/utils/tqt/Makefile.am index 5d77e5d2b..f247852bb 100644 --- a/tqt3integration/utils/tqt/Makefile.am +++ b/tqt3integration/utils/tqt/Makefile.am @@ -1 +1 @@ -CLEANFILES = tqtkdeintegration_x11.cpp tqtkdeintegration_x11_p.h +CLEANFILES = tqttdeintegration_x11.cpp tqttdeintegration_x11_p.h diff --git a/tqt3integration/utils/tqt/in/CMakeLists.txt b/tqt3integration/utils/tqt/in/CMakeLists.txt index c9bc36f92..000fde3ba 100644 --- a/tqt3integration/utils/tqt/in/CMakeLists.txt +++ b/tqt3integration/utils/tqt/in/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -configure_file( tqtkdeintegration_x11_0.cpp.cmake tqtkdeintegration_x11_0.cpp @ONLY ) +configure_file( tqttdeintegration_x11_0.cpp.cmake tqttdeintegration_x11_0.cpp @ONLY ) diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake deleted file mode 100644 index bc6d9fda6..000000000 --- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake +++ /dev/null @@ -1 +0,0 @@ -#define TQTKDELIBDIR @TQT_PLUGINS_DIR@/integration diff --git a/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake new file mode 100644 index 000000000..00b0dc3de --- /dev/null +++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake @@ -0,0 +1 @@ +#define TQTTDELIBDIR @TQT_PLUGINS_DIR@/integration diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp index 36d4e075c..fc849142b 100644 --- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp +++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tqtkdeintegration_x11_p.h" +#include "tqttdeintegration_x11_p.h" #include <tqcolordialog.h> #include <tqfiledialog.h> @@ -29,10 +29,10 @@ #include <tqapplication.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(); @@ -45,10 +45,10 @@ static TQCString findLibrary() return ""; if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' ) return ""; - 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( TQTKDELIBDIR ) + "/libtqtkde"; + return TQCString( TQTTDELIBDIR ) + "/libtqttde"; } return ""; } diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp index f9ab72d70..ba365f7db 100644 --- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp +++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp @@ -20,62 +20,62 @@ // --- -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, parentToWinId( 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, parentToWinId( 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, parentToWinId( 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, parentToWinId( 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, parentToWinId( 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, parentToWinId( 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, parentToWinId( 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, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); } diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h index 59a0127b9..53990697a 100644 --- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h +++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TQKDEINTEGRATION_H -#define TQKDEINTEGRATION_H +#ifndef TQTDEINTEGRATION_H +#define TQTDEINTEGRATION_H #include <tqstringlist.h> @@ -28,7 +28,7 @@ class TQWidget; class TQColor; class TQFont; -class TQKDEIntegration +class TQTDEIntegration { public: static bool enabled(); diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h index 63d569fc0..63d569fc0 100644 --- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h +++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h |