diff options
Diffstat (limited to 'tqt3integration/module')
-rw-r--r-- | tqt3integration/module/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tqt3integration/module/Makefile.am | 12 | ||||
-rw-r--r-- | tqt3integration/module/module.cpp | 8 | ||||
-rw-r--r-- | tqt3integration/module/module.h | 2 | ||||
-rw-r--r-- | tqt3integration/module/tdeintegration.desktop (renamed from tqt3integration/module/kdeintegration.desktop) | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/tqt3integration/module/CMakeLists.txt b/tqt3integration/module/CMakeLists.txt index 93c059405..1457020af 100644 --- a/tqt3integration/module/CMakeLists.txt +++ b/tqt3integration/module/CMakeLists.txt @@ -25,12 +25,12 @@ link_directories( ##### 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 module.cpp diff --git a/tqt3integration/module/Makefile.am b/tqt3integration/module/Makefile.am index 1012d5e7a..99f3a3b2b 100644 --- a/tqt3integration/module/Makefile.am +++ b/tqt3integration/module/Makefile.am @@ -1,16 +1,16 @@ INCLUDES= $(all_includes) -kde_module_LTLIBRARIES = kded_kdeintegration.la +kde_module_LTLIBRARIES = kded_tdeintegration.la -kded_kdeintegration_la_SOURCES = module.cpp -kded_kdeintegration_la_METASOURCES = AUTO -kded_kdeintegration_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kdeintegration_la_LIBADD = $(LIB_TDEIO) +kded_tdeintegration_la_SOURCES = module.cpp +kded_tdeintegration_la_METASOURCES = AUTO +kded_tdeintegration_la_LDFLAGS = $(all_libraries) -module -avoid-version +kded_tdeintegration_la_LIBADD = $(LIB_TDEIO) CLEANFILES = module_functions.cpp module_functions.h servicesdir = $(kde_servicesdir)/kded -services_DATA = kdeintegration.desktop +services_DATA = tdeintegration.desktop module.lo : module_functions.cpp module_functions.h diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index a0be507b0..e397105b1 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -38,13 +38,13 @@ 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 ) @@ -61,7 +61,7 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1, info.geometry().y() + ( info.geometry().height()- w->height())/2 ); } -// duped in tqtkde +// duped in tqttde static TQString getHostname() { char hostname[ 256 ]; diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h index 1d805bcc7..cf136aa8c 100644 --- a/tqt3integration/module/module.h +++ b/tqt3integration/module/module.h @@ -30,7 +30,7 @@ class DCOPClientTransaction; -namespace KDEIntegration +namespace TDEIntegration { class Module diff --git a/tqt3integration/module/kdeintegration.desktop b/tqt3integration/module/tdeintegration.desktop index 406c1fd39..9a9b940d1 100644 --- a/tqt3integration/module/kdeintegration.desktop +++ b/tqt3integration/module/tdeintegration.desktop @@ -4,8 +4,8 @@ Type=Service X-TDE-ServiceTypes=KDEDModule X-TDE-ModuleType=Library -X-TDE-Library=kdeintegration -X-TDE-Factory=kdeintegration +X-TDE-Library=tdeintegration +X-TDE-Factory=tdeintegration X-TDE-Kded-autoload=false X-TDE-Kded-load-on-demand=true |