TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename tqt-kde integration to tqt-tde.

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/37/head
Slávek Banko 5 years ago
parent 9d6d2fd57f
commit 1cf8018d1c
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
25 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File

2
tqt3integration/CMakeLists.txt
Unescape View File

@ -17,6 +17,6 @@ include( ConfigureChecks.cmake )
##### subdirectories ############################ ##### subdirectories ############################
add_subdirectory( libtqtkde ) add_subdirectory( libtqttde )
add_subdirectory( module ) add_subdirectory( module )
add_subdirectory( utils ) add_subdirectory( utils )

2
tqt3integration/Makefile.am
Unescape View File

@ -1 +1 @@
SUBDIRS = libtqtkde module utils SUBDIRS = libtqttde module utils

4
tqt3integration/README
Unescape View File

@ -1,5 +1,5 @@
TQt/KDE UI integration. Makes TQt-only apps use several KDE dialogs without any modifications TQt/TDE UI integration. Makes TQt-only apps use several TDE dialogs without any modifications
to these applications. Can be turned off by setting $TQT_NO_KDE_INTEGRATION. to these applications. Can be turned off by setting $TQT_NO_TDE_INTEGRATION.
Installation: Installation:
Just plain make && make install. Just plain make && make install.

10
tqt3integration/configure.in.in
Unescape View File

@ -1,5 +1,5 @@
tqtkdelibdir="\${kde_moduledir}/plugins/integration" tqttdelibdir="\${kde_moduledir}/plugins/integration"
KDE_EXPAND_MAKEVAR(ac_tqtkdelibdir,tqtkdelibdir) KDE_EXPAND_MAKEVAR(ac_tqttdelibdir,tqttdelibdir)
AC_SUBST(tqtkdelibdir) AC_SUBST(tqttdelibdir)
AC_SUBST(ac_tqtkdelibdir) AC_SUBST(ac_tqttdelibdir)
dnl AC_OUTPUT(tqtkdeintegration/utils/tqt/in/tqtkdeintegration_x11_0.cpp) dnl AC_OUTPUT(tqttdeintegration/utils/tqt/in/tqttdeintegration_x11_0.cpp)

15
tqt3integration/libtqtkde/Makefile.am
Unescape View File

@ -1,15 +0,0 @@
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

6
tqt3integration/libtqtkde/CMakeLists.txt → tqt3integration/libtqttde/CMakeLists.txt
Unescape View File

@ -23,10 +23,10 @@ link_directories(
) )
##### libtqtkde (shared) #################### ##### libtqttde (shared) ####################
tde_add_library( tqtkde SHARED AUTOMOC tde_add_library( tqttde SHARED AUTOMOC
SOURCES tqtkde.cpp SOURCES tqttde.cpp
VERSION 0.0.0 VERSION 0.0.0
LINK tdeui-shared LINK tdeui-shared
DEPENDENCIES generate_tqt3_bindings DEPENDENCIES generate_tqt3_bindings

15
tqt3integration/libtqttde/Makefile.am
Unescape View File

@ -0,0 +1,15 @@
tqttdelib_LTLIBRARIES = libtqttde.la
libtqttde_la_SOURCES = tqttde.cpp
libtqttde_la_LIBADD = -lDCOP
libtqttde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
CLEANFILES = tqttde_functions.cpp
INCLUDES = $(all_includes)
METASOURCES = AUTO
tqttde.lo : tqttde_functions.cpp
tqttde_functions.cpp : ../utils/tqttde_functions.cpp
cp -f ../utils/tqttde_functions.cpp . || exit 1

10
tqt3integration/libtqtkde/tqtkde.cpp → tqt3integration/libtqttde/tqttde.cpp
Unescape View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "tqtkde.h" #include "tqttde.h"
#include <assert.h> #include <assert.h>
#include <dcopclient.h> #include <dcopclient.h>
@ -89,7 +89,7 @@ static DCOPClient* dcopClient()
dcop->bindToApp(); dcop->bindToApp();
if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
{ {
static tqtkde_EventLoop* loop = new tqtkde_EventLoop; static tqttde_EventLoop* loop = new tqttde_EventLoop;
TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool ))); TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));
} }
} }
@ -122,7 +122,7 @@ static int input_filter( XEvent* e )
return false; return false;
} }
void tqtkde_EventLoop::block( bool b ) void tqttde_EventLoop::block( bool b )
{ {
if( b ) if( b )
old_filter = tqt_set_x11_event_filter( input_filter ); old_filter = tqt_set_x11_event_filter( input_filter );
@ -142,6 +142,6 @@ static TQString getHostname()
return ""; return "";
} }
#include "tqtkde_functions.cpp" #include "tqttde_functions.cpp"
#include "tqtkde.moc" #include "tqttde.moc"

6
tqt3integration/libtqtkde/tqtkde.h → tqt3integration/libtqttde/tqttde.h
Unescape View File

@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef _TQTKDE_H #ifndef _TQTTDE_H
#define _TQTKDE_H #define _TQTTDE_H
#include <tqobject.h> #include <tqobject.h>
class tqtkde_EventLoop class tqttde_EventLoop
: public TQObject : public TQObject
{ {
Q_OBJECT Q_OBJECT

6
tqt3integration/module/CMakeLists.txt
Unescape View File

@ -25,12 +25,12 @@ link_directories(
##### service desktop file(s) ########################## ##### service desktop file(s) ##########################
install( FILES kdeintegration.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) install( FILES tdeintegration.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
##### kded_kdeintegration (module) ##################### ##### kded_tdeintegration (module) #####################
set( target kded_kdeintegration ) set( target kded_tdeintegration )
set( ${target}_SRCS set( ${target}_SRCS
module.cpp module.cpp

12
tqt3integration/module/Makefile.am
Unescape View File

@ -1,16 +1,16 @@
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = kded_kdeintegration.la kde_module_LTLIBRARIES = kded_tdeintegration.la
kded_kdeintegration_la_SOURCES = module.cpp kded_tdeintegration_la_SOURCES = module.cpp
kded_kdeintegration_la_METASOURCES = AUTO kded_tdeintegration_la_METASOURCES = AUTO
kded_kdeintegration_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_tdeintegration_la_LDFLAGS = $(all_libraries) -module -avoid-version
kded_kdeintegration_la_LIBADD = $(LIB_TDEIO) kded_tdeintegration_la_LIBADD = $(LIB_TDEIO)
CLEANFILES = module_functions.cpp module_functions.h CLEANFILES = module_functions.cpp module_functions.h
servicesdir = $(kde_servicesdir)/kded servicesdir = $(kde_servicesdir)/kded
services_DATA = kdeintegration.desktop services_DATA = tdeintegration.desktop
module.lo : module_functions.cpp module_functions.h module.lo : module_functions.cpp module_functions.h

8
tqt3integration/module/module.cpp
Unescape View File

@ -38,13 +38,13 @@
extern "C" extern "C"
{ {
KDE_EXPORT KDEDModule *create_kdeintegration( const TQCString& obj ) KDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj )
{ {
return new KDEIntegration::Module( obj ); return new TDEIntegration::Module( obj );
} }
}; };
namespace KDEIntegration namespace TDEIntegration
{ {
static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1, const TQCString& wmclass2 ) static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1, const TQCString& wmclass2 )
@ -61,7 +61,7 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1,
info.geometry().y() + ( info.geometry().height()- w->height())/2 ); info.geometry().y() + ( info.geometry().height()- w->height())/2 );
} }
// duped in tqtkde // duped in tqttde
static TQString getHostname() static TQString getHostname()
{ {
char hostname[ 256 ]; char hostname[ 256 ];

2
tqt3integration/module/module.h
Unescape View File

@ -30,7 +30,7 @@
class DCOPClientTransaction; class DCOPClientTransaction;
namespace KDEIntegration namespace TDEIntegration
{ {
class Module class Module

4
tqt3integration/module/kdeintegration.desktop → tqt3integration/module/tdeintegration.desktop
Unescape View File

@ -4,8 +4,8 @@ Type=Service
X-TDE-ServiceTypes=KDEDModule X-TDE-ServiceTypes=KDEDModule
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=kdeintegration X-TDE-Library=tdeintegration
X-TDE-Factory=kdeintegration X-TDE-Factory=tdeintegration
X-TDE-Kded-autoload=false X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true X-TDE-Kded-load-on-demand=true

10
tqt3integration/utils/CMakeLists.txt
Unescape View File

@ -33,17 +33,17 @@ tde_add_executable( gen AUTOMOC
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT 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.cpp
${CMAKE_CURRENT_BINARY_DIR}/module_functions.h ${CMAKE_CURRENT_BINARY_DIR}/module_functions.h
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/tqt COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/tqt
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen ${CMAKE_CURRENT_SOURCE_DIR}/gen.txt 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_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/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 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}/tqtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11_p.h.gen COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11_p.h.gen
DEPENDS gen DEPENDS gen
) )
ADD_CUSTOM_TARGET( generate_tqt3_bindings ADD_CUSTOM_TARGET( generate_tqt3_bindings
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
) )

10
tqt3integration/utils/Makefile.am
Unescape View File

@ -3,16 +3,16 @@ gen_SOURCES = gen.cpp
gen_LDADD = $(LIB_TDECORE) gen_LDADD = $(LIB_TDECORE)
gen_LDFLAGS = $(all_libraries) gen_LDFLAGS = $(all_libraries)
INCLUDES = $(all_includes) 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 SUBDIRS = tqt
generate: generated generate: generated
generated: gen gen.txt generated: gen gen.txt
./gen || exit 1 ./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/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/tqtkdeintegration_x11_p_1.h tqtkdeintegration_x11_p.h.gen tqt/in/tqtkdeintegration_x11_p_2.h >tqt/tqtkdeintegration_x11_p.h 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 tqtkdeintegration_x11.cpp.gen tqtkdeintegration_x11_p.h.gen rm -f tqttdeintegration_x11.cpp.gen tqttdeintegration_x11_p.h.gen
touch generated touch generated
tqtkde_functions.cpp module_functions.cpp module_functions.h : generated tqttde_functions.cpp module_functions.cpp module_functions.h : generated

60
tqt3integration/utils/gen.cpp
Unescape View File

@ -44,7 +44,7 @@ FUNCTION <name>
OUT_ARGUMENT OUT_ARGUMENT
CONVERSION <function> CONVERSION <function>
BACK_CONVERSION <function> - for out arguments 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 PARENT - the argument is a parent window to be used for windows
ENDARG ENDARG
ENDFUNCTION ENDFUNCTION
@ -366,7 +366,7 @@ void generateFunction( TQTextStream& stream, const Function& function, const TQS
void generateTQtH() void generateTQtH()
{ {
TQFile file( "tqtkdeintegration_x11_p.h.gen" ); TQFile file( "tqttdeintegration_x11_p.h.gen" );
if( !file.open( IO_WriteOnly )) if( !file.open( IO_WriteOnly ))
error(); error();
TQTextStream stream( &file ); TQTextStream stream( &file );
@ -386,7 +386,7 @@ void generateTQtH()
void generateTQtCpp() void generateTQtCpp()
{ {
TQFile file( "tqtkdeintegration_x11.cpp.gen" ); TQFile file( "tqttdeintegration_x11.cpp.gen" );
if( !file.open( IO_WriteOnly )) if( !file.open( IO_WriteOnly ))
error(); error();
TQTextStream stream( &file ); TQTextStream stream( &file );
@ -398,13 +398,13 @@ void generateTQtCpp()
if( f.only_tqt ) if( f.only_tqt )
continue; continue;
f.stripCreatedArguments(); 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*/ ); true /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
stream << ";\n"; stream << ";\n";
} }
stream << stream <<
"\n" "\n"
"void TQKDEIntegration::initLibrary()\n" "void TQTDEIntegration::initLibrary()\n"
" {\n" " {\n"
" if( !inited )\n" " if( !inited )\n"
" {\n" " {\n"
@ -424,17 +424,17 @@ void generateTQtCpp()
Function function = *it; Function function = *it;
if( function.only_tqt ) if( function.only_tqt )
continue; continue;
stream << makeIndent( 8 ) + "tqtkde_" + function.name + " = (\n"; stream << makeIndent( 8 ) + "tqttde_" + function.name + " = (\n";
function.stripCreatedArguments(); function.stripCreatedArguments();
generateFunction( stream, function, "(*)", 12, generateFunction( stream, function, "(*)", 12,
false /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ ); false /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
stream << "\n" + makeIndent( 12 ) + ")\n"; stream << "\n" + makeIndent( 12 ) + ")\n";
stream << makeIndent( 12 ) + "lib.resolve(\"" + (*it).name + "\");\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 << makeIndent( 12 ) + "return;\n";
} }
stream << stream <<
" enable = tqtkde_initializeIntegration();\n" " enable = tqttde_initializeIntegration();\n"
" }\n" " }\n"
" }\n" " }\n"
"\n"; "\n";
@ -446,11 +446,11 @@ void generateTQtCpp()
if( function.skip_tqt || function.only_tqt ) if( function.skip_tqt || function.only_tqt )
continue; continue;
function.stripCreatedArguments(); 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*/ ); false /*static*/, true /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
stream << "\n"; stream << "\n";
stream << makeIndent( 4 ) + "{\n"; stream << makeIndent( 4 ) + "{\n";
stream << makeIndent( 4 ) + "return tqtkde_" + function.name + "(\n"; stream << makeIndent( 4 ) + "return tqttde_" + function.name + "(\n";
stream << makeIndent( 8 ); stream << makeIndent( 8 );
bool need_comma = false; bool need_comma = false;
for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
@ -479,9 +479,9 @@ void generateTQt()
generateTQtCpp(); generateTQtCpp();
} }
void generateTQtKde() void generateTQtTDE()
{ {
TQFile file( "tqtkde_functions.cpp" ); TQFile file( "tqttde_functions.cpp" );
if( !file.open( IO_WriteOnly )) if( !file.open( IO_WriteOnly ))
error(); error();
TQTextStream stream( &file ); TQTextStream stream( &file );
@ -552,7 +552,7 @@ void generateTQtKde()
} }
stream << ";\n"; stream << ";\n";
} }
stream << " if( !dcopClient()->call( \"kded\", \"kdeintegration\",\"" + function.name + "("; stream << " if( !dcopClient()->call( \"kded\", \"tdeintegration\",\"" + function.name + "(";
bool need_comma = false; bool need_comma = false;
for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
it2 != function.args.end(); it2 != function.args.end();
@ -640,7 +640,7 @@ void generateTQtKde()
} }
} }
void generateKdeDcop( TQTextStream& stream ) void genarateTDEDcop( TQTextStream& stream )
{ {
stream << stream <<
"bool Module::process(const TQCString &fun, const TQByteArray &data,\n" "bool Module::process(const TQCString &fun, const TQByteArray &data,\n"
@ -717,13 +717,13 @@ void generateKdeDcop( TQTextStream& stream )
"QCStringList Module::interfaces()\n" "QCStringList Module::interfaces()\n"
" {\n" " {\n"
" QCStringList ifaces = KDEDModule::interfaces();\n" " QCStringList ifaces = KDEDModule::interfaces();\n"
" ifaces << \"KDEIntegration\";\n" " ifaces << \"TDEIntegration\";\n"
" return ifaces;\n" " return ifaces;\n"
" }\n" " }\n"
"\n"; "\n";
} }
void generateKdePreStub( TQTextStream& stream ) void genarateTDEPreStub( TQTextStream& stream )
{ {
for( TQValueList< Function >::ConstIterator it1 = functions.begin(); for( TQValueList< Function >::ConstIterator it1 = functions.begin();
it1 != functions.end(); 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(); for( TQValueList< Function >::ConstIterator it1 = functions.begin();
it1 != functions.end(); it1 != functions.end();
@ -842,7 +842,7 @@ void generateKdePostStub( TQTextStream& stream )
stream << " JobData job = jobs[ handle ];\n"; stream << " JobData job = jobs[ handle ];\n";
stream << " jobs.remove( handle );\n"; stream << " jobs.remove( handle );\n";
stream << " TQByteArray replyData;\n"; stream << " TQByteArray replyData;\n";
stream << " TQCString replyType = \"tqtkde\";\n"; stream << " TQCString replyType = \"tqttde\";\n";
} }
bool return_data = false; bool return_data = false;
for( TQValueList< Arg >::ConstIterator it2 = function.args.begin(); 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 ); genarateTDEPreStub( stream );
generateKdePostStub( stream ); genarateTDEPostStub( stream );
// TODO udelat i predbezne deklarace pro skutecne funkce? // TODO udelat i predbezne deklarace pro skutecne funkce?
} }
void generateKdeCpp() void genarateTDECpp()
{ {
TQFile file( "module_functions.cpp" ); TQFile file( "module_functions.cpp" );
if( !file.open( IO_WriteOnly )) if( !file.open( IO_WriteOnly ))
error(); error();
TQTextStream stream( &file ); TQTextStream stream( &file );
generateKdeDcop( stream ); genarateTDEDcop( stream );
generateKdeStubs( stream ); genarateTDEStubs( stream );
} }
void generateKdeH() void genarateTDEH()
{ {
TQFile file( "module_functions.h" ); TQFile file( "module_functions.h" );
if( !file.open( IO_WriteOnly )) if( !file.open( IO_WriteOnly ))
@ -944,17 +944,17 @@ void generateKdeH()
} }
} }
void generateKde() void genarateTDE()
{ {
generateKdeCpp(); genarateTDECpp();
generateKdeH(); genarateTDEH();
} }
void generate() void generate()
{ {
generateTQt(); generateTQt();
generateTQtKde(); generateTQtTDE();
generateKde(); genarateTDE();
} }
int main (int argc, char *argv[]) int main (int argc, char *argv[])

2
tqt3integration/utils/tqt/Makefile.am
Unescape View File

@ -1 +1 @@
CLEANFILES = tqtkdeintegration_x11.cpp tqtkdeintegration_x11_p.h CLEANFILES = tqttdeintegration_x11.cpp tqttdeintegration_x11_p.h

2
tqt3integration/utils/tqt/in/CMakeLists.txt
Unescape View File

@ -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 )

1
tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
Unescape View File

@ -1 +0,0 @@
#define TQTKDELIBDIR @TQT_PLUGINS_DIR@/integration

1
tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake
Unescape View File

@ -0,0 +1 @@
#define TQTTDELIBDIR @TQT_PLUGINS_DIR@/integration

14
tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp → tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp
Unescape View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 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 <tqcolordialog.h>
#include <tqfiledialog.h> #include <tqfiledialog.h>
@ -29,10 +29,10 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <stdlib.h> #include <stdlib.h>
bool TQKDEIntegration::inited = false; bool TQTDEIntegration::inited = false;
bool TQKDEIntegration::enable = false; bool TQTDEIntegration::enable = false;
bool TQKDEIntegration::enabled() bool TQTDEIntegration::enabled()
{ {
if( !inited ) if( !inited )
initLibrary(); initLibrary();
@ -45,10 +45,10 @@ static TQCString findLibrary()
return ""; return "";
if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' ) if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' )
return ""; return "";
if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL if( getenv( "TQT_NO_TDE_INTEGRATION" ) == NULL
|| getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) || getenv( "TQT_NO_TDE_INTEGRATION" )[ 0 ] == '0' )
{ {
return TQCString( TQTKDELIBDIR ) + "/libtqtkde"; return TQCString( TQTTDELIBDIR ) + "/libtqttde";
} }
return ""; return "";
} }

32
tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp → tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp
Unescape View File

@ -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 ) const TQString& text, int button0, int button1, int button2 )
{ {
return tqtkde_messageBox1( return tqttde_messageBox1(
TQMessageBox::Information, parentToWinId( parent ), caption, text, button0, button1, button2 ); 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 ) const TQString& text, int button0, int button1, int button2 )
{ {
return tqtkde_messageBox1( return tqttde_messageBox1(
TQMessageBox::Question, parentToWinId( parent ), caption, text, button0, button1, button2 ); 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 ) const TQString& text, int button0, int button1, int button2 )
{ {
return tqtkde_messageBox1( return tqttde_messageBox1(
TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0, button1, button2 ); 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 ) const TQString& text, int button0, int button1, int button2 )
{ {
return tqtkde_messageBox1( return tqttde_messageBox1(
TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0, button1, button2 ); 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, const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton ) int defaultButton, int escapeButton )
{ {
return tqtkde_messageBox2( return tqttde_messageBox2(
TQMessageBox::Information, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); 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, const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton ) int defaultButton, int escapeButton )
{ {
return tqtkde_messageBox2( return tqttde_messageBox2(
TQMessageBox::Question, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); 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, const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton ) int defaultButton, int escapeButton )
{ {
return tqtkde_messageBox2( return tqttde_messageBox2(
TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); 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, const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton ) int defaultButton, int escapeButton )
{ {
return tqtkde_messageBox2( return tqttde_messageBox2(
TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
} }

6
tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h → tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h
Unescape View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef TQKDEINTEGRATION_H #ifndef TQTDEINTEGRATION_H
#define TQKDEINTEGRATION_H #define TQTDEINTEGRATION_H
#include <tqstringlist.h> #include <tqstringlist.h>
@ -28,7 +28,7 @@ class TQWidget;
class TQColor; class TQColor;
class TQFont; class TQFont;
class TQKDEIntegration class TQTDEIntegration
{ {
public: public:
static bool enabled(); static bool enabled();

0
tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h → tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h
Unescape View File

Write Preview
Loading…
Cancel
Save