diff options
79 files changed, 127 insertions, 127 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e323139..3b235bb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ option( BUILD_KPROFILEMETHOD "Build kprofilemethod" ${BUILD_ALL} ) option( BUILD_KSPY "Build kspy" ${BUILD_ALL} ) option( BUILD_KSTARTPERF "Build kstartperf" ${BUILD_ALL} ) option( BUILD_KUIVIEWER "Build kuiviewer" ${BUILD_ALL} ) -option( BUILD_KUNITTEST "Build tdeunittest" ${BUILD_ALL} ) +option( BUILD_TDEUNITTEST "Build tdeunittest" ${BUILD_ALL} ) option( BUILD_POXML "Build poxml" ${BUILD_ALL} ) option( BUILD_SCHECK "Build scheck" ${BUILD_ALL} ) option( BUILD_SCRIPTS "Build scripts" ${BUILD_ALL} ) @@ -105,7 +105,7 @@ tde_conditional_add_subdirectory( BUILD_KPROFILEMETHOD kprofilemethod ) tde_conditional_add_subdirectory( BUILD_KSPY kspy ) tde_conditional_add_subdirectory( BUILD_KSTARTPERF kstartperf ) tde_conditional_add_subdirectory( BUILD_KUIVIEWER kuiviewer ) -tde_conditional_add_subdirectory( BUILD_KUNITTEST tdeunittest ) +tde_conditional_add_subdirectory( BUILD_TDEUNITTEST tdeunittest ) tde_conditional_add_subdirectory( BUILD_POXML poxml ) tde_conditional_add_subdirectory( BUILD_SCHECK scheck ) tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts ) diff --git a/cervisia/Makefile.am b/cervisia/Makefile.am index c2616e95..c0d067f8 100644 --- a/cervisia/Makefile.am +++ b/cervisia/Makefile.am @@ -25,13 +25,13 @@ libcervisiapart_la_SOURCES = updateview.cpp protocolview.cpp protocolview.skel \ entry_status.cpp stringmatcher.cpp cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.cpp \ globalignorelist.cpp editwithmenu.cpp logmessageedit.cpp libcervisiapart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libcervisiapart_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_KUTILS) \ +libcervisiapart_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEUTILS) \ cvsservice/libcvsservice.la libcervisia.la libcervisiapart_la_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h cervisia_la_SOURCES = main.cpp cervisiashell.cpp cervisia_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) -cervisia_la_LIBADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la +cervisia_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUTILS) cvsservice/libcvsservice.la libcervisia.la cervisia_la_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h man_MANS = cervisia.1 diff --git a/cervisia/cvsservice/Makefile.am b/cervisia/cvsservice/Makefile.am index b1ef39f0..939f8f60 100644 --- a/cervisia/cvsservice/Makefile.am +++ b/cervisia/cvsservice/Makefile.am @@ -12,7 +12,7 @@ bin_PROGRAMS = tdeinit_LTLIBRARIES = cvsservice.la cvsaskpass.la cvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -cvsservice_la_LIBADD = $(LIB_KIO) +cvsservice_la_LIBADD = $(LIB_TDEIO) cvsservice_la_SOURCES = main.cpp cvsservice.cpp cvsjob.cpp \ cvsservice.skel cvsservice.stub cvsjob.skel cvsjob.stub \ repository.cpp repository.skel repository.stub sshagent.cpp \ diff --git a/config.h.cmake b/config.h.cmake index 7ab8b078..eefae06e 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,4 +1,4 @@ #cmakedefine VERSION "@version@" -// kcachegrind +// tdecachegrind #cmakedefine HAVE_MMAP 1 diff --git a/kapptemplate/kpartapp/app-Makefile.am b/kapptemplate/kpartapp/app-Makefile.am index defeb588..63cacafc 100644 --- a/kapptemplate/kpartapp/app-Makefile.am +++ b/kapptemplate/kpartapp/app-Makefile.am @@ -29,7 +29,7 @@ bin_PROGRAMS = ${APP_NAME_LC} # the application source, library search path, and link libraries ${APP_NAME_LC}_SOURCES = main.cpp ${APP_NAME_LC}.cpp ${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries) -${APP_NAME_LC}_LDADD = \$(LIB_KPARTS) +${APP_NAME_LC}_LDADD = \$(LIB_TDEPARTS) # this is where the desktop file will go xdg_apps_DATA = ${APP_NAME_LC}.desktop @@ -46,7 +46,7 @@ kde_module_LTLIBRARIES = lib${APP_NAME_LC}part.la # the Part's source, library search path, and link libraries lib${APP_NAME_LC}part_la_SOURCES = ${APP_NAME_LC}_part.cpp lib${APP_NAME_LC}part_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries) -lib${APP_NAME_LC}part_la_LIBADD = \$(LIB_KPARTS) \$(LIB_TDEFILE) +lib${APP_NAME_LC}part_la_LIBADD = \$(LIB_TDEPARTS) \$(LIB_TDEFILE) # this is where the desktop file will go partdesktopdir = \$(kde_servicesdir) diff --git a/kapptemplate/kpartplugin/plugin-Makefile.am b/kapptemplate/kpartplugin/plugin-Makefile.am index 7c01ef75..cf8691c2 100644 --- a/kapptemplate/kpartplugin/plugin-Makefile.am +++ b/kapptemplate/kpartplugin/plugin-Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = lib${APP_NAME_LC}plugin.la # This is all standard. Remove the LIB_TDEHTML reference if you are not # using the TDEHTML Part lib${APP_NAME_LC}plugin_la_SOURCES = plugin_${APP_NAME_LC}.cpp -lib${APP_NAME_LC}plugin_la_LIBADD = \$(LIB_KPARTS) \$(LIB_TDEHTML) +lib${APP_NAME_LC}plugin_la_LIBADD = \$(LIB_TDEPARTS) \$(LIB_TDEHTML) lib${APP_NAME_LC}plugin_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries) # Install the .rc file in the Part's directory (in this case, the part diff --git a/kbabel/addons/tdefile-plugins/Makefile.am b/kbabel/addons/tdefile-plugins/Makefile.am index 2d2b252f..747f90fd 100644 --- a/kbabel/addons/tdefile-plugins/Makefile.am +++ b/kbabel/addons/tdefile-plugins/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_po.la tdefile_po_la_SOURCES = tdefile_po.cpp tdefile_po_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_po_la_LIBADD = ../../common/libkbabelcommon.la $(LIB_KIO) +tdefile_po_la_LIBADD = ../../common/libkbabelcommon.la $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am index 5f88bf70..900d8439 100644 --- a/kbabel/catalogmanager/Makefile.am +++ b/kbabel/catalogmanager/Makefile.am @@ -26,15 +26,15 @@ libcatalogmanager_la_SOURCES = catalogmanageriface.skel \ libcatalogmanager_la_LIBADD = ../commonui/libkbabelcommonui.la \ ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \ -./libsvn/libcatalogmanagersvn.la $(LIB_KIO) -libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) +./libsvn/libcatalogmanagersvn.la $(LIB_TDEIO) +libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) catalogmanager_SOURCES = main.cpp # the libraries to link against. catalogmanager_LDADD = libcatalogmanager.la -catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) +catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) # these are the headers for your project noinst_HEADERS = catalogmanageriface.h catalogmanager.h \ diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index 29de2fef..062326c3 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -524,7 +524,7 @@ void CatalogManagerView::saveMarks() } #if KDE_IS_VERSION( 3, 4, 92 ) - // Support for partially remote KIO slave like media: + // Support for partially remote TDEIO slave like media: const KURL url ( TDEIO::NetAccess::mostLocalURL( url2, this ) ); #else const KURL url ( url2 ); diff --git a/kbabel/common/Makefile.am b/kbabel/common/Makefile.am index eb455a7a..3ee6c0ea 100644 --- a/kbabel/common/Makefile.am +++ b/kbabel/common/Makefile.am @@ -25,7 +25,7 @@ libkbabelcommon_la_SOURCES = catalog.cpp catalogitem.cpp editcmd.cpp\ projectsettings.cpp \ stringdistance.cpp -libkbabelcommon_la_LIBADD = $(LIB_KIO) libgettext/libgettext.la +libkbabelcommon_la_LIBADD = $(LIB_TDEIO) libgettext/libgettext.la libkbabelcommon_la_LDFLAGS = $(all_libraries) -version-info 5:0:2 -no-undefined # these are the headers for your project diff --git a/kbabel/commonui/Makefile.am b/kbabel/commonui/Makefile.am index 94c5a18d..3c1e0a9b 100644 --- a/kbabel/commonui/Makefile.am +++ b/kbabel/commonui/Makefile.am @@ -19,7 +19,7 @@ libkbabelcommonui_la_SOURCES = tdelisteditor.ui context.cpp tdeactionselector.cp cmdedit.cpp \ diffpreferences.ui -libkbabelcommonui_la_LIBADD = $(LIB_KIO) -ltdetexteditor ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la +libkbabelcommonui_la_LIBADD = $(LIB_TDEIO) -ltdetexteditor ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la libkbabelcommonui_la_LDFLAGS = $(all_libraries) diff --git a/kbabel/commonui/tdeactionselector.h b/kbabel/commonui/tdeactionselector.h index 6f92484d..5dd371e4 100644 --- a/kbabel/commonui/tdeactionselector.h +++ b/kbabel/commonui/tdeactionselector.h @@ -27,8 +27,8 @@ * your version. * ***************************************************************************/ -#ifndef _KACTION_SELECTOR_H_ -#define _KACTION_SELECTOR_H_ +#ifndef _TDEACTION_SELECTOR_H_ +#define _TDEACTION_SELECTOR_H_ #include <tqwidget.h> @@ -408,4 +408,4 @@ private: TDEActionSelectorPrivate *d; }; -#endif // _KACTION_SELECTOR_H_ +#endif // _TDEACTION_SELECTOR_H_ diff --git a/kbabel/datatools/Makefile.am b/kbabel/datatools/Makefile.am index 45bd88b2..a82ce02c 100644 --- a/kbabel/datatools/Makefile.am +++ b/kbabel/datatools/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = $(all_includes) # which sources should be compiled for kbabeldict #libkbabeltools_la_SOURCES = toolaction.cpp tdeactionselector.cpp toolselectionwidget.cpp -#libkbabeltools_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) +#libkbabeltools_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) #libkbabeltools_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined # these are the headers for your project diff --git a/kbabel/datatools/accelerators/Makefile.am b/kbabel/datatools/accelerators/Makefile.am index f204e78a..5ee57aae 100644 --- a/kbabel/datatools/accelerators/Makefile.am +++ b/kbabel/datatools/accelerators/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_accelstool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_accelstool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/arguments/Makefile.am b/kbabel/datatools/arguments/Makefile.am index 5585d438..ab4e2f01 100644 --- a/kbabel/datatools/arguments/Makefile.am +++ b/kbabel/datatools/arguments/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_argstool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_argstool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/context/Makefile.am b/kbabel/datatools/context/Makefile.am index 4d4a7c0e..3b56628a 100644 --- a/kbabel/datatools/context/Makefile.am +++ b/kbabel/datatools/context/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_contexttool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_contexttool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/equations/Makefile.am b/kbabel/datatools/equations/Makefile.am index 9b49892d..dac35e6f 100644 --- a/kbabel/datatools/equations/Makefile.am +++ b/kbabel/datatools/equations/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_equationstool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_equationstool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/length/Makefile.am b/kbabel/datatools/length/Makefile.am index 62231402..2359a95b 100644 --- a/kbabel/datatools/length/Makefile.am +++ b/kbabel/datatools/length/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_lengthtool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_lengthtool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/not-translated/Makefile.am b/kbabel/datatools/not-translated/Makefile.am index 7ae7fe1c..40299023 100644 --- a/kbabel/datatools/not-translated/Makefile.am +++ b/kbabel/datatools/not-translated/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_nottranslatedtool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_nottranslatedtool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/pluralforms/Makefile.am b/kbabel/datatools/pluralforms/Makefile.am index b7d50e80..951e08cb 100644 --- a/kbabel/datatools/pluralforms/Makefile.am +++ b/kbabel/datatools/pluralforms/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_pluraltool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_pluraltool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/punctuation/Makefile.am b/kbabel/datatools/punctuation/Makefile.am index 5f00234c..1aceb053 100644 --- a/kbabel/datatools/punctuation/Makefile.am +++ b/kbabel/datatools/punctuation/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_punctuationtool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_punctuationtool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/regexp/Makefile.am b/kbabel/datatools/regexp/Makefile.am index e727ca25..42ebe1cb 100644 --- a/kbabel/datatools/regexp/Makefile.am +++ b/kbabel/datatools/regexp/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_regexptool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_regexptool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/whitespace/Makefile.am b/kbabel/datatools/whitespace/Makefile.am index f0987b4f..eb3937fb 100644 --- a/kbabel/datatools/whitespace/Makefile.am +++ b/kbabel/datatools/whitespace/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_whitespacetool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_whitespacetool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/datatools/xml/Makefile.am b/kbabel/datatools/xml/Makefile.am index dbba4740..3f116709 100644 --- a/kbabel/datatools/xml/Makefile.am +++ b/kbabel/datatools/xml/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../../common -I../../common $(all_includes) -kbabel_xmltool_la_LIBADD = $(LIB_KIO) ../../common/libkbabelcommon.la +kbabel_xmltool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la ####### Files diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am index 54e99daf..90ec3ea6 100644 --- a/kbabel/kbabel/Makefile.am +++ b/kbabel/kbabel/Makefile.am @@ -37,15 +37,15 @@ libkbabel_la_SOURCES = kbbookmarkhandler.cpp \ kde_kcfg_DATA=kbabel.kcfg -libkbabel_la_LIBADD = ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL) -libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) +libkbabel_la_LIBADD = ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_TDEIO) $(LIB_TDESPELL) +libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) kbabel_SOURCES = main.cpp # the libraries to link against. kbabel_LDADD = libkbabel.la -kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) +kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) # these are the headers for your project noinst_HEADERS = kbabel.h kbabelview.h \ diff --git a/kbabel/kbabeldict/Makefile.am b/kbabel/kbabeldict/Makefile.am index afcf95b9..61bfd4ed 100644 --- a/kbabel/kbabeldict/Makefile.am +++ b/kbabel/kbabeldict/Makefile.am @@ -19,20 +19,20 @@ INCLUDES = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_i lib_LTLIBRARIES = libkbabeldictplugin.la libkbabeldictplugin_la_SOURCES = searchengine.cpp libkbabeldictplugin_la_LIBADD = $(LIB_TDECORE) -libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkbabeldict_la_SOURCES = kbabeldictbox.cpp \ kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \ aboutmoduledlg.cpp libkbabeldict_la_LIBADD = ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_TDEUI) -libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp # the libraries to link against. -kbabeldict_LDADD = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kbabeldict_LDADD = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # these are the headers for your project noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h diff --git a/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am b/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am index c9e40c31..bc7b0fb7 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am +++ b/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm kbabeldict_dbsearchengine_la_SOURCES = KDBSearchEngine.cpp preferenceswidget.cpp \ dbse_factory.cpp dbseprefwidget.ui database.cpp dbscan.cpp #database.cpp dbscan.cpp -kbabeldict_dbsearchengine_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_DBIV) +kbabeldict_dbsearchengine_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_DBIV) kbabeldict_dbsearchengine_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined \ $(DBIV_LDFLAGS) diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am b/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am index bb907c73..983257cd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am +++ b/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/../../../common $(all_includes) kbabeldict_dbsearchengine2_la_SOURCES = dbscan.cpp preferenceswidget.cpp dbse2.ui KDBSearchEngine2.cpp database.cpp dbentries.cpp dbse2_factory.cpp sourcedialog.ui algorithms.cpp chunk.cpp #kbabeldict_dbsearchengine2_la_SOURCES = KDBSearchEngine2.cpp database.cpp dbentries.cpp dbse2_factory.cpp -kbabeldict_dbsearchengine2_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_DBIV)_cxx +kbabeldict_dbsearchengine2_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_DBIV)_cxx kbabeldict_dbsearchengine2_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -L$(DBIV_LDFLAGS) diff --git a/kbabel/kbabeldict/modules/poauxiliary/Makefile.am b/kbabel/kbabeldict/modules/poauxiliary/Makefile.am index cab9d75f..d2da715b 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/Makefile.am +++ b/kbabel/kbabeldict/modules/poauxiliary/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm kbabeldict_poauxiliary_la_SOURCES = poauxiliary.cpp preferenceswidget.cpp\ pa_factory.cpp pwidget.ui -kbabeldict_poauxiliary_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO) +kbabeldict_poauxiliary_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_TDEIO) kbabeldict_poauxiliary_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/kbabel/kbabeldict/modules/pocompendium/Makefile.am b/kbabel/kbabeldict/modules/pocompendium/Makefile.am index 836d3f3d..2ede0780 100644 --- a/kbabel/kbabeldict/modules/pocompendium/Makefile.am +++ b/kbabel/kbabeldict/modules/pocompendium/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm kbabeldict_pocompendium_la_SOURCES = pocompendium.cpp preferenceswidget.cpp \ pc_factory.cpp pwidget.ui compendiumdata.cpp -kbabeldict_pocompendium_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO) +kbabeldict_pocompendium_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_TDEIO) kbabeldict_pocompendium_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/kbabel/kbabeldict/modules/tmx/Makefile.am b/kbabel/kbabeldict/modules/tmx/Makefile.am index 6a1769e1..f3e3b679 100644 --- a/kbabel/kbabeldict/modules/tmx/Makefile.am +++ b/kbabel/kbabeldict/modules/tmx/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm kbabeldict_tmxcompendium_la_SOURCES = tmxcompendium.cpp preferenceswidget.cpp \ pc_factory.cpp pwidget.ui tmxcompendiumdata.cpp -kbabeldict_tmxcompendium_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO) +kbabeldict_tmxcompendium_la_LIBADD = ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_TDEIO) kbabeldict_tmxcompendium_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am index 23f98061..4a8ebde9 100644 --- a/kbugbuster/Makefile.am +++ b/kbugbuster/Makefile.am @@ -11,8 +11,8 @@ bin_PROGRAMS = kbugbuster kbugbuster_SOURCES = main.cpp kbugbuster_LDADD = -ltdeutils gui/libkbbmainwindow.la \ - backend/libkbbbackend.la $(LIB_TDEHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS) -kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS) + backend/libkbbbackend.la $(LIB_TDEHTML) $(LIB_TDEIO) -ltdefx $(LIB_TDEUTILS) +kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) xdg_apps_DATA = kbugbuster.desktop diff --git a/kdeaccounts-plugin/CMakeLists.txt b/kdeaccounts-plugin/CMakeLists.txt index 04fc43e8..6e9d5158 100644 --- a/kdeaccounts-plugin/CMakeLists.txt +++ b/kdeaccounts-plugin/CMakeLists.txt @@ -25,9 +25,9 @@ install( FILES kdeaccountsplugin.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats ) -##### kabcformat_kdeaccounts (module) ########### +##### tdeabcformat_kdeaccounts (module) ########### -tde_add_kpart( kabcformat_kdeaccounts +tde_add_kpart( tdeabcformat_kdeaccounts SOURCES kdeaccountsformat.cpp LINK tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kdeaccounts-plugin/Makefile.am b/kdeaccounts-plugin/Makefile.am index 1110c87c..79fb42ff 100644 --- a/kdeaccounts-plugin/Makefile.am +++ b/kdeaccounts-plugin/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) noinst_HEADERS = kdeaccountsformat.h -kde_module_LTLIBRARIES = kabcformat_kdeaccounts.la -kabcformat_kdeaccounts_la_SOURCES = kdeaccountsformat.cpp -kabcformat_kdeaccounts_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabcformat_kdeaccounts_la_LIBADD = -ltdeabc +kde_module_LTLIBRARIES = tdeabcformat_kdeaccounts.la +tdeabcformat_kdeaccounts_la_SOURCES = kdeaccountsformat.cpp +tdeabcformat_kdeaccounts_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabcformat_kdeaccounts_la_LIBADD = -ltdeabc # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/kdeaccounts-plugin/kdeaccountsplugin.desktop b/kdeaccounts-plugin/kdeaccountsplugin.desktop index f9c40532..a0905691 100644 --- a/kdeaccounts-plugin/kdeaccountsplugin.desktop +++ b/kdeaccounts-plugin/kdeaccountsplugin.desktop @@ -41,4 +41,4 @@ Name[zh_TW]=TDE 主目錄帳號 [Plugin] Type=text -X-TDE-Library=kabcformat_kdeaccounts +X-TDE-Library=tdeabcformat_kdeaccounts diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am index f0718598..6d6c5ffd 100644 --- a/kmtrace/Makefile.am +++ b/kmtrace/Makefile.am @@ -23,13 +23,13 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kmtrace demangle kmmatch kmtrace_SOURCES = kmtrace.cpp -kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor demangle_SOURCES = demangle.cpp -demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kmmatch_SOURCES = match.cpp -kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor bin_SCRIPTS = kminspector diff --git a/kompare/Makefile.am b/kompare/Makefile.am index 6413c160..d75c1121 100644 --- a/kompare/Makefile.am +++ b/kompare/Makefile.am @@ -26,8 +26,8 @@ bin_PROGRAMS = kompare # the application source, library search path, and link libraries kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp -kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kompare_LDADD = $(LIB_KPARTS) \ +kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kompare_LDADD = $(LIB_TDEPARTS) \ $(top_builddir)/kompare/interfaces/libkompareinterface.la \ $(top_builddir)/kompare/libdialogpages/libdialogpages.la \ -ltdetexteditor diff --git a/kompare/komparenavtreepart/Makefile.am b/kompare/komparenavtreepart/Makefile.am index cac18964..929d7cf1 100644 --- a/kompare/komparenavtreepart/Makefile.am +++ b/kompare/komparenavtreepart/Makefile.am @@ -20,7 +20,7 @@ libkomparenavtreepart_la_SOURCES = \ komparenavtreepart.cpp libkomparenavtreepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -libkomparenavtreepart_la_LIBADD = $(LIB_KPARTS) ../libdiff2/libdiff2.la +libkomparenavtreepart_la_LIBADD = $(LIB_TDEPARTS) ../libdiff2/libdiff2.la # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/kompare/komparepart/Makefile.am b/kompare/komparepart/Makefile.am index 1a8bdbd5..1638d3c6 100644 --- a/kompare/komparepart/Makefile.am +++ b/kompare/komparepart/Makefile.am @@ -34,7 +34,7 @@ libkomparepart_la_SOURCES = \ komparesaveoptionswidget.cpp libkomparepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -libkomparepart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) \ +libkomparepart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) \ ../libdialogpages/libdialogpages.la \ ../libdiff2/libdiff2.la \ ../interfaces/libkompareinterface.la diff --git a/kstartperf/Makefile.am b/kstartperf/Makefile.am index 3921d009..6228c9ad 100644 --- a/kstartperf/Makefile.am +++ b/kstartperf/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = $(all_includes) lib_LTLIBRARIES = libkstartperf.la -libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ldl -version-info 1:0 -no-undefined +libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ldl -version-info 1:0 -no-undefined libkstartperf_la_SOURCES = libkstartperf.c bin_PROGRAMS = kstartperf -kstartperf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) +kstartperf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) kstartperf_LDADD = $(LIB_TDECORE) kstartperf_SOURCES = kstartperf.cpp diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am index 90a639c3..52dcb3a4 100644 --- a/kuiviewer/Makefile.am +++ b/kuiviewer/Makefile.am @@ -25,8 +25,8 @@ bin_PROGRAMS = kuiviewer # the application source, library search path, and link libraries kuiviewer_SOURCES = main.cpp kuiviewer.cpp -kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kuiviewer_LDADD = $(LIB_KPARTS) +kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kuiviewer_LDADD = $(LIB_TDEPARTS) xdg_apps_DATA =kuiviewer.desktop @@ -42,7 +42,7 @@ kde_module_LTLIBRARIES = libkuiviewerpart.la quithumbnail.la # the Part's source, library search path, and link libraries libkuiviewerpart_la_SOURCES = kuiviewer_part.cpp libkuiviewerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libkuiviewerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_QUI) +libkuiviewerpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_QUI) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/poxml/Makefile.am b/poxml/Makefile.am index a17a445c..a0b202c2 100644 --- a/poxml/Makefile.am +++ b/poxml/Makefile.am @@ -7,23 +7,23 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS) SUBDIRS = antlr split2po_SOURCES = split.cpp parser.cpp -split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor split2po_LDADD = $(LIB_QT) xml2pot_SOURCES = xml2pot.cpp parser.cpp -xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor xml2pot_LDADD = $(LIB_QT) po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp -po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT) swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp -swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor swappo_LDADD = antlr/src/libantlr.la $(LIB_QT) transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp -transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor transxx_LDADD = antlr/src/libantlr.la $(LIB_QT) parser: diff --git a/poxml/lauri.po b/poxml/lauri.po index 6384835c..d212f69a 100644 --- a/poxml/lauri.po +++ b/poxml/lauri.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2001-02-09 01:25+0100\n" "PO-Revision-Date: 2001-07-02 20:31MET\n" "Last-Translator: Stephan Kulow <[email protected]>\n" -"Language-Team: german <[email protected]>\n" +"Language-Team: german <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp index ef451fe0..1ffff4a8 100644 --- a/poxml/transxx.cpp +++ b/poxml/transxx.cpp @@ -60,7 +60,7 @@ int main(int argc, char **argv) projectId += fi.baseName( false ); headerLines.gres( TQRegExp( "^Project-Id-Version:.*" ), projectId ); headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program <[email protected]>" ); - headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <[email protected]>" ); + headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <[email protected]>" ); TQString revisionDate ( "PO-Revision-Date: " ); const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC ); revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" ); diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp index d3af9a0e..47b8f547 100644 --- a/poxml/xml2pot.cpp +++ b/poxml/xml2pot.cpp @@ -46,7 +46,7 @@ int main( int argc, char **argv ) cout << "\"POT-Creation-Date: " << now.toString("yyyy-MM-dd hh:mm").utf8().data() << "+0000\\n\"\n"; cout << "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n"; cout << "\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n"; - cout << "\"Language-Team: LANGUAGE <[email protected]>\\n\"\n"; + cout << "\"Language-Team: LANGUAGE <[email protected]>\\n\"\n"; cout << "\"MIME-Version: 1.0\\n\"\n"; cout << "\"Content-Type: application/x-xml2pot; charset=UTF-8\\n\"\n"; cout << "\"Content-Transfer-Encoding: 8bit\\n\"\n"; diff --git a/tdecachegrind/CMakeLists.txt b/tdecachegrind/CMakeLists.txt index 8c2da806..1197869f 100644 --- a/tdecachegrind/CMakeLists.txt +++ b/tdecachegrind/CMakeLists.txt @@ -11,10 +11,10 @@ include( ConfigureChecks.cmake ) -set( KCACHEGRIND_VERSION "0.4.6kde" ) +set( TDECACHEGRIND_VERSION "0.4.6kde" ) configure_file( version.h.in version.h @ONLY ) -configure_file( tdecachegrind.spec.in kcachegrind.spec @ONLY ) -configure_file( tdecachegrind.lsm.in kcachegrind.lsm @ONLY ) +configure_file( tdecachegrind.spec.in tdecachegrind.spec @ONLY ) +configure_file( tdecachegrind.lsm.in tdecachegrind.lsm @ONLY ) add_subdirectory( tdecachegrind ) add_subdirectory( pics ) diff --git a/tdecachegrind/tdecachegrind/Makefile.am b/tdecachegrind/tdecachegrind/Makefile.am index f7c1bf8c..dd9266e9 100644 --- a/tdecachegrind/tdecachegrind/Makefile.am +++ b/tdecachegrind/tdecachegrind/Makefile.am @@ -21,7 +21,7 @@ tdecachegrind_SOURCES = \ tdecachegrind_COMPILE_FIRST = ../version.h -tdecachegrind_LDADD = $(LIB_KIO) +tdecachegrind_LDADD = $(LIB_TDEIO) KDE_ICON = AUTO @@ -44,7 +44,7 @@ INCLUDES= $(all_includes) METASOURCES = AUTO # the library search path. -tdecachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdecachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rcdir = $(kde_datadir)/tdecachegrind rc_DATA = tdecachegrindui.rc diff --git a/tdefile-plugins/c++/Makefile.am b/tdefile-plugins/c++/Makefile.am index f74cf59e..461dff9e 100644 --- a/tdefile-plugins/c++/Makefile.am +++ b/tdefile-plugins/c++/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_cpp.la tdefile_cpp_la_SOURCES = tdefile_cpp.cpp tdefile_cpp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_cpp_la_LIBADD = $(LIB_KIO) +tdefile_cpp_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/diff/Makefile.am b/tdefile-plugins/diff/Makefile.am index 5e9b087f..fb1f393f 100644 --- a/tdefile-plugins/diff/Makefile.am +++ b/tdefile-plugins/diff/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_diff.la tdefile_diff_la_SOURCES = tdefile_diff.cpp tdefile_diff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_diff_la_LIBADD = $(LIB_KSYCOCA) +tdefile_diff_la_LIBADD = $(LIB_TDESYCOCA) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/ts/Makefile.am b/tdefile-plugins/ts/Makefile.am index bb46c13c..034b8fbd 100644 --- a/tdefile-plugins/ts/Makefile.am +++ b/tdefile-plugins/ts/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = tdefile_ts.la tdefile_ts_la_SOURCES = tdefile_ts.cpp tdefile_ts_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_ts_la_LIBADD = $(LIB_KIO) +tdefile_ts_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdeioslave/svn/ksvnd/Makefile.am b/tdeioslave/svn/ksvnd/Makefile.am index 54eb2bee..f3f7918f 100644 --- a/tdeioslave/svn/ksvnd/Makefile.am +++ b/tdeioslave/svn/ksvnd/Makefile.am @@ -6,8 +6,8 @@ kde_module_LTLIBRARIES = kded_ksvnd.la kded_ksvnd_la_SOURCES = commitdlg.ui ksvnd.cpp ksvnd.skel kded_ksvnd_la_METASOURCES = AUTO kded_ksvnd_la_LDFLAGS = $(all_libraries) -module -avoid-version -#kded_ksvnd_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) -kded_ksvnd_la_LIBADD = $(LIB_KIO) +#kded_ksvnd_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_TDEIO) +kded_ksvnd_la_LIBADD = $(LIB_TDEIO) kded_DATA = ksvnd.desktop kdeddir = $(kde_servicesdir)/kded diff --git a/tdeioslave/svn/svnhelper/Makefile.am b/tdeioslave/svn/svnhelper/Makefile.am index 3f6e71c1..068212b9 100644 --- a/tdeioslave/svn/svnhelper/Makefile.am +++ b/tdeioslave/svn/svnhelper/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries) tdeio_svn_helper_SOURCES = tdeio_svn_helper.cpp subversioncheckout.ui subversionswitch.ui subversionlog.ui subversiondiff.ui -tdeio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KIO) $(all_libraries) +tdeio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEIO) $(all_libraries) servicemenudir = \ $(kde_datadir)/konqueror/servicemenus diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.h b/tdeioslave/svn/svnhelper/tdeio_svn_helper.h index 46f8fcb6..e14992e9 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.h +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KIO_SVN_HELPER_H_ -#define _KIO_SVN_HELPER_H_ +#ifndef _TDEIO_SVN_HELPER_H_ +#define _TDEIO_SVN_HELPER_H_ #include <tdeapplication.h> #include <tdeio/job.h> diff --git a/tdeunittest/Makefile.am b/tdeunittest/Makefile.am index 5393f517..28cfbcf6 100644 --- a/tdeunittest/Makefile.am +++ b/tdeunittest/Makefile.am @@ -4,15 +4,15 @@ METASOURCES = AUTO lib_LTLIBRARIES = libtdeunittestgui.la libtdeunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel -libtdeunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeunittest +libtdeunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest libtdeunittestgui_la_LIBADD = -ltdeunittest $(LIB_TDECORE) runnergui.lo : testerwidget.h bin_PROGRAMS = tdeunittestguimodrunner tdeunittestguimodrunner_SOURCES = guimodrunner.cpp -tdeunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeunittest -tdeunittestguimodrunner_LDADD = libtdeunittestgui.la $(LIB_TDECORE) $(LIB_KIO) +tdeunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest +tdeunittestguimodrunner_LDADD = libtdeunittestgui.la $(LIB_TDECORE) $(LIB_TDEIO) noinst_HEADERS = dcopinterface.h libtdeunittestinclude_HEADERS = runnergui.h diff --git a/tdeunittest/dcopinterface.h b/tdeunittest/dcopinterface.h index 50f15d3d..034c15c1 100644 --- a/tdeunittest/dcopinterface.h +++ b/tdeunittest/dcopinterface.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef KUNITTEST_DCOPINTERFACE_H -#define KUNITTEST_DCOPINTERFACE_H +#ifndef TDEUNITTEST_DCOPINTERFACE_H +#define TDEUNITTEST_DCOPINTERFACE_H #include <dcopobject.h> #include <tqstring.h> diff --git a/tdeunittest/example/module/samplemodule.cpp b/tdeunittest/example/module/samplemodule.cpp index 4ffadb6c..b100df08 100644 --- a/tdeunittest/example/module/samplemodule.cpp +++ b/tdeunittest/example/module/samplemodule.cpp @@ -31,7 +31,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" ) -KUNITTEST_MODULE_REGISTER_TESTER( SlotSampleTester ) -KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) -KUNITTEST_MODULE_REGISTER_TESTER( SomeExtraTester ) +TDEUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SlotSampleTester ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SomeExtraTester ) diff --git a/tdeunittest/example/module/samplemodule2.cpp b/tdeunittest/example/module/samplemodule2.cpp index 1e08f102..fcb00fc6 100644 --- a/tdeunittest/example/module/samplemodule2.cpp +++ b/tdeunittest/example/module/samplemodule2.cpp @@ -33,9 +33,9 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_samplemodule2, "Suite2::Sub" ) -KUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester ) -KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) +TDEUNITTEST_MODULE( tdeunittest_samplemodule2, "Suite2::Sub" ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) void SimpleSampleTester::allTests() { diff --git a/tdeunittest/example/simple/Makefile.am b/tdeunittest/example/simple/Makefile.am index 0ee63452..162741eb 100644 --- a/tdeunittest/example/simple/Makefile.am +++ b/tdeunittest/example/simple/Makefile.am @@ -4,11 +4,11 @@ METASOURCES = AUTO check_PROGRAMS = sampletests sampletestsgui sampletests_SOURCES = main.cpp sampletest.cpp -sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor sampletests_LDADD = -ltdeunittest sampletestsgui_SOURCES = maingui.cpp sampletest.cpp -sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Normally you would write -ltdeunittestgui here, but since the examples # are bundled with the library source code itself we don't want to # have you install the libraries before you can compile the examples. diff --git a/tdeunittest/example/simple/sampletest.cpp b/tdeunittest/example/simple/sampletest.cpp index 04be74de..30bdbfd9 100644 --- a/tdeunittest/example/simple/sampletest.cpp +++ b/tdeunittest/example/simple/sampletest.cpp @@ -32,9 +32,9 @@ using namespace KUnitTest; -KUNITTEST_SUITE("SampleSuite"); -KUNITTEST_REGISTER_TESTER(SimpleSampleTester); -KUNITTEST_REGISTER_TESTER(SomeSampleTester); +TDEUNITTEST_SUITE("SampleSuite"); +TDEUNITTEST_REGISTER_TESTER(SimpleSampleTester); +TDEUNITTEST_REGISTER_TESTER(SomeSampleTester); void SimpleSampleTester::allTests() { diff --git a/tdeunittest/runnergui.h b/tdeunittest/runnergui.h index 73d8863c..1c7d85a9 100644 --- a/tdeunittest/runnergui.h +++ b/tdeunittest/runnergui.h @@ -23,8 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _KUNITTEST_TESTER_H_ -#define _KUNITTEST_TESTER_H_ +#ifndef _TDEUNITTEST_TESTER_H_ +#define _TDEUNITTEST_TESTER_H_ #include <tqlistview.h> #include <tqhbox.h> diff --git a/umbrello/umbrello/Makefile.am b/umbrello/umbrello/Makefile.am index b19ecb18..a68fd709 100644 --- a/umbrello/umbrello/Makefile.am +++ b/umbrello/umbrello/Makefile.am @@ -113,8 +113,8 @@ widget_factory.cpp \ widget_utils.cpp \ worktoolbar.cpp -#umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_TDEPRINT) $(LIB_KIO) -umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_TDEPRINT) $(LIB_KIO) +#umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_TDEPRINT) $(LIB_TDEIO) +umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_TDEPRINT) $(LIB_TDEIO) ## See section "dnl Not GPL compatible" in ../configure.in.in # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp index 2c962e5d..8e6922ee 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h index e807225b..ed6d91b0 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index d892eafc..4077a3c0 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2002 by Roberto Raggi * - * [email protected] * + * [email protected] * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h index f84f7249..1f6209db 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2002 by Roberto Raggi * - * [email protected] * + * [email protected] * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index b3a7329c..daef65da 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h index a349b7c8..9c365129 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp index 133b3117..133d6726 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.h b/umbrello/umbrello/codeimport/kdevcppparser/errors.h index e0959250..6751475e 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/errors.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index e313052e..976888c1 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h index d27980f8..c0eca989 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp index 2d009294..a0ee3dbc 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp @@ -19,7 +19,7 @@ * */ -// adapted to tdevelop by Roberto Raggi <[email protected]> +// adapted to tdevelop by Roberto Raggi <[email protected]> #include "lookup.h" diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h index 615d8a00..cff7dded 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h @@ -19,7 +19,7 @@ * */ -// adapted to tdevelop by Roberto Raggi <[email protected]> +// adapted to tdevelop by Roberto Raggi <[email protected]> #ifndef _KJSLOOKUP_H_ #define _KJSLOOKUP_H_ diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index 653376a0..278690fc 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.h b/umbrello/umbrello/codeimport/kdevcppparser/parser.h index 930a563f..9be954c2 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp index d419336e..454c4b99 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h index 66fc05ef..5377358b 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/docgenerators/Makefile.am b/umbrello/umbrello/docgenerators/Makefile.am index f702ca72..bc657026 100644 --- a/umbrello/umbrello/docgenerators/Makefile.am +++ b/umbrello/umbrello/docgenerators/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr METASOURCES = AUTO bin_PROGRAMS = umbodoc -AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor umbodoc_COMPILE_FIRST = version.h umbodoc_SOURCES = main.cpp umbodoc_LDADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS) diff --git a/umbrello/umbrello/umlviewimageexportermodel.h b/umbrello/umbrello/umlviewimageexportermodel.h index 5e1b7dd5..ff14b3c5 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.h +++ b/umbrello/umbrello/umlviewimageexportermodel.h @@ -29,8 +29,8 @@ class KURL; * The methods in this class don't communicate with the user, so asking the format * to save the images in, checking if the target file exists and so on must be done before * calling those methods, if needed. - * The only exception is asking passwords for example when KIO slaves are used, as this - * operation is made automatically by the KIO classes. + * The only exception is asking passwords for example when TDEIO slaves are used, as this + * operation is made automatically by the TDEIO classes. */ class UMLViewImageExporterModel { public: @@ -96,7 +96,7 @@ public: * * This method creates the specified target directory if needed. If there was an * existing file with the same path as one to be created overwrites it without asking. - * The url used can be local or remote, using supported KIO slaves. + * The url used can be local or remote, using supported TDEIO slaves. * * @param imageType The type of the images the views will be exported to. * @param directory The url of the directory where the images will be saved. @@ -112,7 +112,7 @@ public: * * This method creates the needed directories, if any. If there was an existing * file in the specified url overwrites it without asking. - * The url used can be local or remote, using supported KIO slaves. + * The url used can be local or remote, using supported TDEIO slaves. * * If some problem occurs when exporting, an error message is returned. * |