Browse Source

qt => tqt conversion:

+ libqtkde => libtqtkde

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 6 months ago
parent
commit
a72081c423
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668

+ 4
- 4
tqt3integration/README View File

@@ -1,10 +1,10 @@
1
-Qt/KDE UI integration. Makes Qt-only apps use several KDE dialogs without any modifications
2
-to these applications. Can be turned off by setting $QT_NO_KDE_INTEGRATION.
1
+TQt/KDE UI integration. Makes TQt-only apps use several KDE dialogs without any modifications
2
+to these applications. Can be turned off by setting $TQT_NO_KDE_INTEGRATION.
3 3
 
4 4
 Installation:
5 5
 Just plain make && make install.
6
-Additionally 'make generate' needs to be done in utils/, and Qt needs to be patched using the sources
7
-generated in utils/qt . Patch should be applied, the .cpp/.h files belong to src/kernel/ ,
6
+Additionally 'make generate' needs to be done in utils/, and TQt needs to be patched using the sources
7
+generated in utils/tqt . Patch should be applied, the .cpp/.h files belong to src/kernel/ ,
8 8
 the .h file additionally should go to include/private .
9 9
 
10 10
 

+ 5
- 5
tqt3integration/configure.in.in View File

@@ -1,5 +1,5 @@
1
-qtkdelibdir="\${kde_moduledir}/plugins/integration"
2
-KDE_EXPAND_MAKEVAR(ac_qtkdelibdir,qtkdelibdir)
3
-AC_SUBST(qtkdelibdir)
4
-AC_SUBST(ac_qtkdelibdir)
5
-dnl AC_OUTPUT(qtkdeintegration/utils/qt/in/qtkdeintegration_x11_0.cpp)
1
+tqtkdelibdir="\${kde_moduledir}/plugins/integration"
2
+KDE_EXPAND_MAKEVAR(ac_tqtkdelibdir,tqtkdelibdir)
3
+AC_SUBST(tqtkdelibdir)
4
+AC_SUBST(ac_tqtkdelibdir)
5
+dnl AC_OUTPUT(tqtkdeintegration/utils/tqt/in/tqtkdeintegration_x11_0.cpp)

+ 0
- 15
tqt3integration/libqtkde/Makefile.am View File

@@ -1,15 +0,0 @@
1
-qtkdelib_LTLIBRARIES = libtqtkde.la
2
-
3
-libtqtkde_la_SOURCES = qtkde.cpp
4
-libtqtkde_la_LIBADD = -lDCOP
5
-libtqtkde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
6
-
7
-CLEANFILES = qtkde_functions.cpp
8
-
9
-INCLUDES = $(all_includes)
10
-METASOURCES = AUTO
11
-
12
-qtkde.lo : qtkde_functions.cpp
13
-
14
-qtkde_functions.cpp : ../utils/qtkde_functions.cpp
15
-	cp -f ../utils/qtkde_functions.cpp . || exit 1

tqt3integration/libqtkde/CMakeLists.txt → tqt3integration/libtqtkde/CMakeLists.txt View File

@@ -22,12 +22,13 @@ link_directories(
22 22
   ${TQT_LIBRARY_DIRS}
23 23
 )
24 24
 
25
+
25 26
 ##### libtqtkde (shared) ####################
26 27
 
27
-tde_add_library( qtkde SHARED AUTOMOC
28
-  SOURCES qtkde.cpp
28
+tde_add_library( tqtkde SHARED AUTOMOC
29
+  SOURCES tqtkde.cpp
29 30
   VERSION 0.0.0
30 31
   LINK tdeui-shared
31 32
   DEPENDENCIES generate_tqt3_bindings
32 33
   DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/"
33
-)
34
+)

+ 15
- 0
tqt3integration/libtqtkde/Makefile.am View File

@@ -0,0 +1,15 @@
1
+tqtkdelib_LTLIBRARIES = libtqtkde.la
2
+
3
+libtqtkde_la_SOURCES = tqtkde.cpp
4
+libtqtkde_la_LIBADD = -lDCOP
5
+libtqtkde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
6
+
7
+CLEANFILES = tqtkde_functions.cpp
8
+
9
+INCLUDES = $(all_includes)
10
+METASOURCES = AUTO
11
+
12
+tqtkde.lo : tqtkde_functions.cpp
13
+
14
+tqtkde_functions.cpp : ../utils/tqtkde_functions.cpp
15
+	cp -f ../utils/tqtkde_functions.cpp . || exit 1

tqt3integration/libqtkde/qtkde.cpp → tqt3integration/libtqtkde/tqtkde.cpp View File

@@ -18,7 +18,7 @@
18 18
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
19 19
  */
20 20
 
21
-#include "qtkde.h"
21
+#include "tqtkde.h"
22 22
 
23 23
 #include <assert.h>
24 24
 #include <dcopclient.h>
@@ -89,7 +89,7 @@ static DCOPClient* dcopClient()
89 89
         dcop->bindToApp();
90 90
         if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
91 91
             {
92
-            static qtkde_EventLoop* loop = new qtkde_EventLoop;
92
+            static tqtkde_EventLoop* loop = new tqtkde_EventLoop;
93 93
             TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));
94 94
             }
95 95
         }
@@ -122,7 +122,7 @@ static int input_filter( XEvent* e )
122 122
     return false;
123 123
     }
124 124
 
125
-void qtkde_EventLoop::block( bool b )
125
+void tqtkde_EventLoop::block( bool b )
126 126
     {
127 127
     if( b )
128 128
         old_filter = tqt_set_x11_event_filter( input_filter );
@@ -144,4 +144,4 @@ static TQString getHostname()
144 144
 
145 145
 #include "tqtkde_functions.cpp"
146 146
 
147
-#include "qtkde.moc"
147
+#include "tqtkde.moc"

tqt3integration/libqtkde/qtkde.h → tqt3integration/libtqtkde/tqtkde.h View File

@@ -23,11 +23,11 @@
23 23
 
24 24
 #include <tqobject.h>
25 25
 
26
-class qtkde_EventLoop
26
+class tqtkde_EventLoop
27 27
     : public TQObject
28 28
     {
29 29
     Q_OBJECT
30
-  
30
+
31 31
     public slots:
32 32
         void block( bool );
33 33
     };

+ 3
- 1
tqt3integration/module/CMakeLists.txt View File

@@ -22,10 +22,12 @@ link_directories(
22 22
   ${TQT_LIBRARY_DIRS}
23 23
 )
24 24
 
25
+
25 26
 ##### service desktop file(s) ##########################
26 27
 
27 28
 install( FILES kdeintegration.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
28 29
 
30
+
29 31
 ##### kded_kdeintegration (module) #####################
30 32
 
31 33
 set( target kded_kdeintegration )
@@ -39,4 +41,4 @@ tde_add_kpart( ${target} AUTOMOC
39 41
   LINK tdeinit_kded-shared
40 42
   DEPENDENCIES generate_tqt3_bindings
41 43
   DESTINATION ${PLUGIN_INSTALL_DIR}
42
-)
44
+)

+ 2
- 2
tqt3integration/module/module.cpp View File

@@ -60,8 +60,8 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1,
60 60
         w->move( info.geometry().x() + ( info.geometry().width() - w->width())/2,
61 61
             info.geometry().y() + ( info.geometry().height()- w->height())/2 );
62 62
     }
63
-    
64
-// duped in qtkde
63
+
64
+// duped in tqtkde
65 65
 static TQString getHostname()
66 66
     {
67 67
     char hostname[ 256 ];

+ 13
- 8
tqt3integration/utils/CMakeLists.txt View File

@@ -9,7 +9,7 @@
9 9
 #
10 10
 #################################################
11 11
 
12
-add_subdirectory( qt )
12
+add_subdirectory( tqt )
13 13
 
14 14
 include_directories(
15 15
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -32,13 +32,18 @@ tde_add_executable( gen AUTOMOC
32 32
 )
33 33
 
34 34
 ADD_CUSTOM_COMMAND(
35
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qtkde_functions.cpp ${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp ${CMAKE_CURRENT_BINARY_DIR}/module_functions.h
36
-  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/qt
35
+  OUTPUT
36
+    ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp
37
+    ${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp
38
+    ${CMAKE_CURRENT_BINARY_DIR}/module_functions.h
39
+  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/tqt
37 40
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen ${CMAKE_CURRENT_SOURCE_DIR}/gen.txt
38
-  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
39
-  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
40
-  COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/qtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/qtkdeintegration_x11_p.h.gen
41
-#  COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/qt/in/qt.patch ${CMAKE_CURRENT_BINARY_DIR}/qt/
41
+  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
42
+  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
43
+  COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11_p.h.gen
42 44
   DEPENDS gen
43 45
 )
44
-ADD_CUSTOM_TARGET(generate_tqt3_bindings DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qtkde_functions.cpp)
46
+
47
+ADD_CUSTOM_TARGET( generate_tqt3_bindings
48
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp
49
+)

+ 6
- 7
tqt3integration/utils/Makefile.am View File

@@ -3,17 +3,16 @@ gen_SOURCES = gen.cpp
3 3
 gen_LDADD = $(LIB_TDECORE)
4 4
 gen_LDFLAGS = $(all_libraries)
5 5
 INCLUDES = $(all_includes)
6
-CLEANFILES = qtkde_functions.cpp module_functions.cpp module_functions.h generated
7
-SUBDIRS = qt
6
+CLEANFILES = tqtkde_functions.cpp module_functions.cpp module_functions.h generated
7
+SUBDIRS = tqt
8 8
 
9 9
 generate: generated
10 10
 
11 11
 generated: gen gen.txt
12 12
 	./gen || exit 1
13
-	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
14
-	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
15
-	rm -f qtkdeintegration_x11.cpp.gen qtkdeintegration_x11_p.h.gen
16
-	cp -f qt/in/qt.patch qt/
13
+	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
14
+	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
15
+	rm -f tqtkdeintegration_x11.cpp.gen tqtkdeintegration_x11_p.h.gen
17 16
 	touch generated
18 17
 
19
-qtkde_functions.cpp module_functions.cpp module_functions.h : generated
18
+tqtkde_functions.cpp module_functions.cpp module_functions.h : generated

+ 28
- 28
tqt3integration/utils/gen.cpp View File

@@ -31,8 +31,8 @@
31 31
 FUNCTION <name>
32 32
  RETURN_TYPE <type>
33 33
  DELAYED_RETURN   - use DCOP transaction in kded module, function will take some time to finish
34
- SKIP_QT - don't generate in qt file
35
- ONLY_QT - generate only in qt file
34
+ SKIP_TQT - don't generate in tqt file
35
+ ONLY_TQT - generate only in tqt file
36 36
  ADD_APPINFO - generate wmclass arguments
37 37
  ARG <name>
38 38
   TYPE <type>
@@ -44,7 +44,7 @@ FUNCTION <name>
44 44
   OUT_ARGUMENT
45 45
   CONVERSION <function>
46 46
   BACK_CONVERSION <function> - for out arguments
47
-  CREATE <function>  - doesn't exist in TQt, create in qtkde using function
47
+  CREATE <function>  - doesn't exist in TQt, create in tqtkde using function
48 48
   PARENT - the argument is a parent window to be used for windows
49 49
  ENDARG
50 50
 ENDFUNCTION
@@ -70,12 +70,12 @@ struct Arg
70 70
 
71 71
 struct Function
72 72
     {
73
-    Function() : delayed_return( false ), skip_qt( false ), only_qt( false ), add_appinfo( false ) {}
73
+    Function() : delayed_return( false ), skip_tqt( false ), only_tqt( false ), add_appinfo( false ) {}
74 74
     TQString name;
75 75
     TQString return_type;
76 76
     bool delayed_return;
77
-    bool skip_qt;
78
-    bool only_qt;
77
+    bool skip_tqt;
78
+    bool only_tqt;
79 79
     bool add_appinfo;
80 80
     TQValueList< Arg > args;
81 81
     void stripNonOutArguments();
@@ -274,10 +274,10 @@ void parseFunction( const TQString& details )
274 274
             }
275 275
         else if( line.startsWith( "DELAYED_RETURN" ))
276 276
             function.delayed_return = true;
277
-        else if( line.startsWith( "SKIP_QT" ))
278
-            function.skip_qt = true;
279
-        else if( line.startsWith( "ONLY_QT" ))
280
-            function.only_qt = true;
277
+        else if( line.startsWith( "SKIP_TQT" ))
278
+            function.skip_tqt = true;
279
+        else if( line.startsWith( "ONLY_TQT" ))
280
+            function.only_tqt = true;
281 281
         else if( line.startsWith( "ADD_APPINFO" ))
282 282
             function.add_appinfo = true;
283 283
         else if( line.startsWith( "ARG" ))
@@ -366,7 +366,7 @@ void generateFunction( TQTextStream& stream, const Function& function, const TQS
366 366
 
367 367
 void generateTQtH()
368 368
     {
369
-    TQFile file( "qtkdeintegration_x11_p.h.gen" );
369
+    TQFile file( "tqtkdeintegration_x11_p.h.gen" );
370 370
     if( !file.open( IO_WriteOnly ))
371 371
         error();
372 372
     TQTextStream stream( &file );
@@ -375,7 +375,7 @@ void generateTQtH()
375 375
          ++it )
376 376
         {
377 377
         Function f = *it;
378
-        if( f.skip_qt )
378
+        if( f.skip_tqt )
379 379
             continue;
380 380
         f.stripCreatedArguments();
381 381
         generateFunction( stream, f, f.name, 8,
@@ -386,7 +386,7 @@ void generateTQtH()
386 386
 
387 387
 void generateTQtCpp()
388 388
     {
389
-    TQFile file( "qtkdeintegration_x11.cpp.gen" );
389
+    TQFile file( "tqtkdeintegration_x11.cpp.gen" );
390 390
     if( !file.open( IO_WriteOnly ))
391 391
         error();
392 392
     TQTextStream stream( &file );
@@ -395,10 +395,10 @@ void generateTQtCpp()
395 395
          ++it )
396 396
         {
397 397
         Function f = *it;
398
-        if( f.only_qt )
398
+        if( f.only_tqt )
399 399
             continue;
400 400
         f.stripCreatedArguments();
401
-        generateFunction( stream, f, "(*qtkde_" + f.name + ")", 0,
401
+        generateFunction( stream, f, "(*tqtkde_" + f.name + ")", 0,
402 402
             true /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
403 403
         stream << ";\n";
404 404
         }
@@ -422,19 +422,19 @@ void generateTQtCpp()
422 422
          ++it )
423 423
         {
424 424
         Function function = *it;
425
-        if( function.only_qt )
425
+        if( function.only_tqt )
426 426
             continue;
427
-        stream << makeIndent( 8 ) + "qtkde_" + function.name + " = (\n";
427
+        stream << makeIndent( 8 ) + "tqtkde_" + function.name + " = (\n";
428 428
         function.stripCreatedArguments();
429 429
         generateFunction( stream, function, "(*)", 12,
430 430
             false /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
431 431
         stream << "\n" + makeIndent( 12 ) + ")\n";
432 432
         stream << makeIndent( 12 ) + "lib.resolve(\"" + (*it).name + "\");\n";
433
-        stream << makeIndent( 8 ) + "if( qtkde_" + (*it).name + " == NULL )\n";
433
+        stream << makeIndent( 8 ) + "if( tqtkde_" + (*it).name + " == NULL )\n";
434 434
         stream << makeIndent( 12 ) + "return;\n";
435 435
         }
436 436
     stream <<
437
-"        enable = qtkde_initializeIntegration();\n"
437
+"        enable = tqtkde_initializeIntegration();\n"
438 438
 "        }\n"
439 439
 "    }\n"
440 440
 "\n";
@@ -443,14 +443,14 @@ void generateTQtCpp()
443 443
          ++it1 )
444 444
         {
445 445
         Function function = *it1;
446
-        if( function.skip_qt || function.only_qt )
446
+        if( function.skip_tqt || function.only_tqt )
447 447
             continue;
448 448
         function.stripCreatedArguments();
449 449
         generateFunction( stream, function, "QKDEIntegration::" + function.name, 0,
450 450
             false /*static*/, true /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
451 451
         stream << "\n";
452 452
         stream << makeIndent( 4 ) + "{\n";
453
-        stream << makeIndent( 4 ) + "return qtkde_" + function.name + "(\n";
453
+        stream << makeIndent( 4 ) + "return tqtkde_" + function.name + "(\n";
454 454
         stream << makeIndent( 8 );
455 455
         bool need_comma = false;
456 456
         for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
@@ -490,7 +490,7 @@ void generateTQtKde()
490 490
          ++it1 )
491 491
         {
492 492
         const Function& function = *it1;
493
-        if( function.only_qt )
493
+        if( function.only_tqt )
494 494
             continue;
495 495
         Function stripped_function = function;
496 496
         stripped_function.stripCreatedArguments();
@@ -651,7 +651,7 @@ void generateKdeDcop( TQTextStream& stream )
651 651
          ++it1 )
652 652
         {
653 653
         const Function& function = *it1;
654
-        if( function.only_qt )
654
+        if( function.only_tqt )
655 655
             continue;
656 656
         stream << "    if( fun == \"" + function.name + "(";
657 657
         bool need_comma = false;
@@ -692,7 +692,7 @@ void generateKdeDcop( TQTextStream& stream )
692 692
          ++it1 )
693 693
         {
694 694
         const Function& function = *it1;
695
-        if( function.only_qt )
695
+        if( function.only_tqt )
696 696
             continue;
697 697
         stream << "    funcs << \"" + function.name + "(";
698 698
         bool need_comma = false;
@@ -730,7 +730,7 @@ void generateKdePreStub( TQTextStream& stream )
730 730
          ++it1 )
731 731
         {
732 732
         const Function& function = *it1;
733
-        if( function.only_qt )
733
+        if( function.only_tqt )
734 734
             continue;
735 735
         stream << "void Module::pre_" + function.name + "( const TQByteArray& "
736 736
             + ( function.args.isEmpty() ? "" : "data" )
@@ -803,7 +803,7 @@ void generateKdePostStub( TQTextStream& stream )
803 803
          ++it1 )
804 804
         {
805 805
         const Function& function = *it1;
806
-        if( function.only_qt )
806
+        if( function.only_tqt )
807 807
             continue;
808 808
         stream << "void Module::post_" + function.name + "( ";
809 809
         bool needs_comma = false;
@@ -842,7 +842,7 @@ void generateKdePostStub( TQTextStream& stream )
842 842
             stream << "    JobData job = jobs[ handle ];\n";
843 843
             stream << "    jobs.remove( handle );\n";
844 844
             stream << "    TQByteArray replyData;\n";
845
-            stream << "    TQCString replyType = \"qtkde\";\n";
845
+            stream << "    TQCString replyType = \"tqtkde\";\n";
846 846
             }
847 847
         bool return_data = false;
848 848
         for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
@@ -904,7 +904,7 @@ void generateKdeH()
904 904
          ++it1 )
905 905
         {
906 906
         const Function& function = *it1;
907
-        if( function.only_qt )
907
+        if( function.only_tqt )
908 908
             continue;
909 909
         Function real_function = function;
910 910
         if( function.delayed_return )

+ 8
- 8
tqt3integration/utils/gen.txt View File

@@ -218,7 +218,7 @@ ENDFUNCTION
218 218
 FUNCTION information
219 219
     RETURN_TYPE int
220 220
     DELAYED_RETURN
221
-    ONLY_QT
221
+    ONLY_TQT
222 222
     ARG parent
223 223
         TYPE long
224 224
         ORIG_TYPE TQWidget*
@@ -249,7 +249,7 @@ ENDFUNCTION
249 249
 FUNCTION question
250 250
     RETURN_TYPE int
251 251
     DELAYED_RETURN
252
-    ONLY_QT
252
+    ONLY_TQT
253 253
     ARG parent
254 254
         TYPE long
255 255
         ORIG_TYPE TQWidget*
@@ -280,7 +280,7 @@ ENDFUNCTION
280 280
 FUNCTION warning
281 281
     RETURN_TYPE int
282 282
     DELAYED_RETURN
283
-    ONLY_QT
283
+    ONLY_TQT
284 284
     ARG parent
285 285
         TYPE long
286 286
         ORIG_TYPE TQWidget*
@@ -311,7 +311,7 @@ ENDFUNCTION
311 311
 FUNCTION critical
312 312
     RETURN_TYPE int
313 313
     DELAYED_RETURN
314
-    ONLY_QT
314
+    ONLY_TQT
315 315
     ARG parent
316 316
         TYPE long
317 317
         ORIG_TYPE TQWidget*
@@ -387,7 +387,7 @@ ENDFUNCTION
387 387
 FUNCTION information
388 388
     RETURN_TYPE int
389 389
     DELAYED_RETURN
390
-    ONLY_QT
390
+    ONLY_TQT
391 391
     ARG parent
392 392
         TYPE long
393 393
         ORIG_TYPE TQWidget*
@@ -428,7 +428,7 @@ ENDFUNCTION
428 428
 FUNCTION question
429 429
     RETURN_TYPE int
430 430
     DELAYED_RETURN
431
-    ONLY_QT
431
+    ONLY_TQT
432 432
     ARG parent
433 433
         TYPE long
434 434
         ORIG_TYPE TQWidget*
@@ -469,7 +469,7 @@ ENDFUNCTION
469 469
 FUNCTION warning
470 470
     RETURN_TYPE int
471 471
     DELAYED_RETURN
472
-    ONLY_QT
472
+    ONLY_TQT
473 473
     ARG parent
474 474
         TYPE long
475 475
         ORIG_TYPE TQWidget*
@@ -510,7 +510,7 @@ ENDFUNCTION
510 510
 FUNCTION critical
511 511
     RETURN_TYPE int
512 512
     DELAYED_RETURN
513
-    ONLY_QT
513
+    ONLY_TQT
514 514
     ARG parent
515 515
         TYPE long
516 516
         ORIG_TYPE TQWidget*

+ 0
- 1
tqt3integration/utils/qt/Makefile.am View File

@@ -1 +0,0 @@
1
-CLEANFILES = qt.patch qtkdeintegration_x11.cpp qtkdeintegration_x11_p.h

+ 0
- 270
tqt3integration/utils/qt/in/qt.patch View File

@@ -1,270 +0,0 @@
1
---- src/dialogs/qfiledialog.cpp.sav	2004-12-08 15:39:41.000000000 +0100
2
-+++ src/dialogs/qfiledialog.cpp	2004-12-13 16:53:40.000000000 +0100
3
-@@ -92,6 +92,10 @@
4
- #include "qvbox.h"
5
- #include "qwidgetstack.h"
6
- 
7
-+#ifdef Q_WS_X11
8
-+#include "private/qtkdeintegration_x11_p.h"
9
-+#endif
10
-+
11
- #ifdef Q_WS_WIN
12
- #ifdef TQT_THREAD_SUPPORT
13
- #  include <private/qmutexpool_p.h>
14
-@@ -3428,7 +3432,11 @@ QString QFileDialog::getOpenFileName( co
15
-     if ( workingDirectory->isNull() )
16
- 	*workingDirectory = QDir::currentDirPath();
17
- 
18
--#if defined(Q_WS_WIN)
19
-+#if defined(Q_WS_X11)
20
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
21
-+	return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name,
22
-+				    caption, selectedFilter, false ).first();
23
-+#elif defined(Q_WS_WIN)
24
-     if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle )
25
- 	return winGetOpenFileName( initialSelection, filter, workingDirectory,
26
- 				   parent, name, caption, selectedFilter );
27
-@@ -3546,7 +3554,11 @@ QString QFileDialog::getSaveFileName( co
28
-     if ( workingDirectory->isNull() )
29
- 	*workingDirectory = QDir::currentDirPath();
30
- 
31
--#if defined(Q_WS_WIN)
32
-+#if defined(Q_WS_X11)
33
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
34
-+	return QKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory,
35
-+				   parent, name, caption, selectedFilter );
36
-+#elif defined(Q_WS_WIN)
37
-     if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle )
38
- 	return winGetSaveFileName( initialSelection, filter, workingDirectory,
39
- 				   parent, name, caption, selectedFilter );
40
-@@ -4433,7 +4445,17 @@ QString QFileDialog::getExistingDirector
41
-     if ( workingDirectory )
42
- 	wd = *workingDirectory;
43
- 
44
--#if defined(Q_WS_WIN)
45
-+#if defined(Q_WS_X11)
46
-+    QString initialDir;
47
-+    if ( !dir.isEmpty() ) {
48
-+	QUrlOperator u( dir );
49
-+	if ( QFileInfo( u.path() ).isDir() )
50
-+	    initialDir = dir;
51
-+    } else
52
-+	initialDir = QString::null;
53
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
54
-+        return QKDEIntegration::getExistingDirectory( initialDir, parent, name, caption );
55
-+#elif defined(Q_WS_WIN)
56
-     QString initialDir;
57
-     if ( !dir.isEmpty() ) {
58
- 	QUrlOperator u( dir );
59
-@@ -5586,7 +5608,10 @@ QStringList QFileDialog::getOpenFileName
60
- 	}
61
-     }
62
- 
63
--#if defined(Q_WS_WIN)
64
-+#if defined(Q_WS_X11)
65
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
66
-+	return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true );
67
-+#elif defined(Q_WS_WIN)
68
-     if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle )
69
- 	return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter );
70
- #elif defined(Q_WS_MAC)
71
---- src/dialogs/qmessagebox.cpp.sav	2003-12-22 12:24:32.000000000 +0100
72
-+++ src/dialogs/qmessagebox.cpp	2005-01-05 18:05:29.638723917 +0100
73
-@@ -54,6 +54,12 @@
74
- #endif
75
- 
76
- 
77
-+#ifdef Q_WS_X11
78
-+#include "private/qtkdeintegration_x11_p.h"
79
-+#endif
80
-+
81
-+extern bool qt_use_native_dialogs;
82
-+
83
- // Internal class - don't touch
84
- 
85
- class QMessageBoxLabel : public QLabel
86
-@@ -1104,6 +1110,10 @@ int QMessageBox::information( QWidget *p
87
-                               const QString& caption, const QString& text,
88
-                               int button0, int button1, int button2 )
89
- {
90
-+#if defined(Q_WS_X11)
91
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
92
-+        return QKDEIntegration::information( parent, caption, text, button0, button1, button2 );
93
-+#endif
94
-     QMessageBox *mb = new QMessageBox( caption, text, Information,
95
-                                        button0, button1, button2,
96
-                                        parent, "qt_msgbox_information", TRUE,
97
-@@ -1151,6 +1161,10 @@ int QMessageBox::question( QWidget *pare
98
-                            const QString& caption, const QString& text,
99
-                            int button0, int button1, int button2 )
100
- {
101
-+#if defined(Q_WS_X11)
102
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
103
-+        return QKDEIntegration::question( parent, caption, text, button0, button1, button2 );
104
-+#endif
105
-     QMessageBox *mb = new QMessageBox( caption, text, Question,
106
-                                        button0, button1, button2,
107
-                                        parent, "qt_msgbox_information", TRUE,
108
-@@ -1199,6 +1213,10 @@ int QMessageBox::warning( QWidget *paren
109
-                           const QString& caption, const QString& text,
110
-                           int button0, int button1, int button2 )
111
- {
112
-+#if defined(Q_WS_X11)
113
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
114
-+        return QKDEIntegration::warning( parent, caption, text, button0, button1, button2 );
115
-+#endif
116
-     QMessageBox *mb = new QMessageBox( caption, text, Warning,
117
-                                        button0, button1, button2,
118
-                                        parent, "qt_msgbox_warning", TRUE,
119
-@@ -1247,6 +1265,10 @@ int QMessageBox::critical( QWidget *pare
120
-                            const QString& caption, const QString& text,
121
-                            int button0, int button1, int button2 )
122
- {
123
-+#if defined(Q_WS_X11)
124
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
125
-+        return QKDEIntegration::critical( parent, caption, text, button0, button1, button2 );
126
-+#endif
127
-     QMessageBox *mb = new QMessageBox( caption, text, Critical,
128
-                                        button0, button1, button2,
129
-                                        parent, "qt_msgbox_critical", TRUE,
130
-@@ -1394,6 +1416,11 @@ int QMessageBox::information( QWidget *p
131
-                               int defaultButtonNumber,
132
-                               int escapeButtonNumber )
133
- {
134
-+#if defined(Q_WS_X11)
135
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
136
-+        return QKDEIntegration::information( parent, caption, text,
137
-+            button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
138
-+#endif
139
-     return textBox( parent, Information, caption, text,
140
-                     button0Text, button1Text, button2Text,
141
-                     defaultButtonNumber, escapeButtonNumber );
142
-@@ -1436,6 +1463,11 @@ int QMessageBox::question( QWidget *pare
143
-                            int defaultButtonNumber,
144
-                            int escapeButtonNumber )
145
- {
146
-+#if defined(Q_WS_X11)
147
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
148
-+        return QKDEIntegration::question( parent, caption, text,
149
-+            button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
150
-+#endif
151
-     return textBox( parent, Question, caption, text,
152
-                     button0Text, button1Text, button2Text,
153
-                     defaultButtonNumber, escapeButtonNumber );
154
-@@ -1480,6 +1512,11 @@ int QMessageBox::warning( QWidget *paren
155
-                                  int defaultButtonNumber,
156
-                                  int escapeButtonNumber )
157
- {
158
-+#if defined(Q_WS_X11)
159
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
160
-+        return QKDEIntegration::warning( parent, caption, text,
161
-+            button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
162
-+#endif
163
-     return textBox( parent, Warning, caption, text,
164
-                     button0Text, button1Text, button2Text,
165
-                     defaultButtonNumber, escapeButtonNumber );
166
-@@ -1520,6 +1557,11 @@ int QMessageBox::critical( QWidget *pare
167
-                                   int defaultButtonNumber,
168
-                                   int escapeButtonNumber )
169
- {
170
-+#if defined(Q_WS_X11)
171
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
172
-+        return QKDEIntegration::critical( parent, caption, text,
173
-+            button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
174
-+#endif
175
-     return textBox( parent, Critical, caption, text,
176
-                     button0Text, button1Text, button2Text,
177
-                     defaultButtonNumber, escapeButtonNumber );
178
---- src/dialogs/qfontdialog.cpp.sav	2004-08-12 14:32:06.000000000 +0200
179
-+++ src/dialogs/qfontdialog.cpp	2004-12-13 19:02:31.000000000 +0100
180
-@@ -56,6 +56,10 @@
181
- #include <private/qfontdata_p.h>
182
- #include <qvalidator.h>
183
- 
184
-+#ifdef Q_WS_X11
185
-+#include "private/qtkdeintegration_x11_p.h"
186
-+#endif
187
-+
188
- /*!
189
-   \class QFontDialog qfontdialog.h
190
-   \ingroup dialogs
191
-@@ -384,9 +388,15 @@ QFont QFontDialog::getFont( bool *ok, QW
192
-     return getFont( ok, 0, parent, name );
193
- }
194
- 
195
-+extern bool qt_use_native_dialogs;
196
-+
197
- QFont QFontDialog::getFont( bool *ok, const QFont *def,
198
- 			    QWidget *parent, const char* name)
199
- {
200
-+#if defined(Q_WS_X11)
201
-+    if ( qt_use_native_dialogs && QKDEIntegration::enabled())
202
-+        return QKDEIntegration::getFont( ok, def, parent, name );
203
-+#endif
204
-     QFont result;
205
-     if ( def )
206
- 	result = *def;
207
---- src/dialogs/qcolordialog.cpp.sav	2004-04-30 12:00:05.000000000 +0200
208
-+++ src/dialogs/qcolordialog.cpp	2004-12-13 16:53:40.000000000 +0100
209
-@@ -60,6 +60,10 @@ QRgb macGetRgba( QRgb initial, bool *ok,
210
- QColor macGetColor( const QColor& initial, QWidget *parent, const char *name );
211
- #endif
212
- 
213
-+#ifdef Q_WS_X11
214
-+#include "private/qtkdeintegration_x11_p.h"
215
-+#endif
216
-+
217
- //////////// QWellArray BEGIN
218
- 
219
- struct QWellArrayData;
220
-@@ -1478,7 +1482,10 @@ QColorDialog::QColorDialog(QWidget* pare
221
- QColor QColorDialog::getColor( const QColor& initial, QWidget *parent,
222
- 			       const char *name )
223
- {
224
--#if defined(Q_WS_MAC)
225
-+#if defined(Q_WS_X11)
226
-+    if( QKDEIntegration::enabled())
227
-+        return QKDEIntegration::getColor( initial, parent, name );
228
-+#elif defined(Q_WS_MAC)
229
-     return macGetColor(initial, parent, name);
230
- #endif
231
- 
232
-@@ -1516,6 +1523,13 @@ QRgb QColorDialog::getRgba( QRgb initial
233
- 			    QWidget *parent, const char* name )
234
- {
235
- #if defined(Q_WS_MAC)
236
-+    if( QKDEIntegration::enabled()) {
237
-+        QColor color = QKDEIntegration::getColor( QColor( initial ), parent, name );
238
-+        if( ok )
239
-+            *ok = color.isValid();
240
-+        return color.rgba();
241
-+    }
242
-+#elif defined(Q_WS_MAC)
243
-     return macGetRgba(initial, ok, parent, name);
244
- #endif
245
- 
246
---- src/kernel/qt_x11.pri.sav	2004-11-15 17:51:45.000000000 +0100
247
-+++ src/kernel/qt_x11.pri	2004-12-13 16:53:40.000000000 +0100
248
-@@ -10,6 +10,9 @@ unix {
249
- 
250
- 	SOURCES += $$KERNEL_CPP/qtaddons_x11.cpp
251
- 	PRECOMPILED_HEADER = kernel/qt_pch.h
252
-+        
253
-+        SOURCES += $$KERNEL_CPP/qtkdeintegration_x11.cpp
254
-+        HEADERS += $$KERNEL_H/qtkdeintegration_x11_p.h
255
- }
256
- 
257
- nas {
258
---- src/kernel/qt.h.sav	2004-02-16 15:05:19.000000000 +0100
259
-+++ src/kernel/qt.h	2004-12-13 16:53:40.000000000 +0100
260
-@@ -313,6 +313,10 @@
261
- #endif // Private headers
262
- 
263
- 
264
-+#ifdef Q_WS_X11
265
-+#include "private/qtkdeintegration_x11_p.h"
266
-+#endif
267
-+
268
- #ifdef Q_WS_MAC
269
- #include <qaquastyle.h>
270
- #include <qmacstyle_mac.h>

tqt3integration/utils/qt/CMakeLists.txt → tqt3integration/utils/tqt/CMakeLists.txt View File


+ 1
- 0
tqt3integration/utils/tqt/Makefile.am View File

@@ -0,0 +1 @@
1
+CLEANFILES = tqtkdeintegration_x11.cpp tqtkdeintegration_x11_p.h

tqt3integration/utils/qt/in/CMakeLists.txt → tqt3integration/utils/tqt/in/CMakeLists.txt View File

@@ -9,4 +9,4 @@
9 9
 #
10 10
 #################################################
11 11
 
12
-configure_file( qtkdeintegration_x11_0.cpp.cmake qtkdeintegration_x11_0.cpp @ONLY )
12
+configure_file( tqtkdeintegration_x11_0.cpp.cmake tqtkdeintegration_x11_0.cpp @ONLY )

tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake → tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake View File


tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp → tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp View File


tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp → tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp View File

@@ -23,28 +23,28 @@
23 23
 int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
24 24
     const TQString& text, int button0, int button1, int button2 )
25 25
     {
26
-    return qtkde_messageBox1(
26
+    return tqtkde_messageBox1(
27 27
         TQMessageBox::Information, parentToWinId( parent ), caption, text, button0, button1, button2 );
28 28
     }
29 29
 
30 30
 int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
31 31
     const TQString& text, int button0, int button1, int button2 )
32 32
     {
33
-    return qtkde_messageBox1(
33
+    return tqtkde_messageBox1(
34 34
         TQMessageBox::Question, parentToWinId( parent ), caption, text, button0, button1, button2 );
35 35
     }
36 36
 
37 37
 int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
38 38
     const TQString& text, int button0, int button1, int button2 )
39 39
     {
40
-    return qtkde_messageBox1(
40
+    return tqtkde_messageBox1(
41 41
         TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0, button1, button2 );
42 42
     }
43 43
 
44 44
 int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
45 45
     const TQString& text, int button0, int button1, int button2 )
46 46
     {
47
-    return qtkde_messageBox1(
47
+    return tqtkde_messageBox1(
48 48
         TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0, button1, button2 );
49 49
     }
50 50
 
@@ -52,7 +52,7 @@ int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
52 52
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
53 53
     int defaultButton, int escapeButton )
54 54
     {
55
-    return qtkde_messageBox2(
55
+    return tqtkde_messageBox2(
56 56
         TQMessageBox::Information, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
57 57
     }
58 58
 
@@ -60,7 +60,7 @@ int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
60 60
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
61 61
     int defaultButton, int escapeButton )
62 62
     {
63
-    return qtkde_messageBox2(
63
+    return tqtkde_messageBox2(
64 64
         TQMessageBox::Question, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
65 65
     }
66 66
 
@@ -68,7 +68,7 @@ int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
68 68
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
69 69
     int defaultButton, int escapeButton )
70 70
     {
71
-    return qtkde_messageBox2(
71
+    return tqtkde_messageBox2(
72 72
         TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
73 73
     }
74 74
 
@@ -76,6 +76,6 @@ int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
76 76
     const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
77 77
     int defaultButton, int escapeButton )
78 78
     {
79
-    return qtkde_messageBox2(
79
+    return tqtkde_messageBox2(
80 80
         TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
81 81
     }

tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h → tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h View File

@@ -32,4 +32,4 @@ class TQKDEIntegration
32 32
     {
33 33
     public:
34 34
         static bool enabled();
35
-// --- 
35
+// ---

tqt3integration/utils/qt/in/qtkdeintegration_x11_p_2.h → tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h View File


Loading…
Cancel
Save