diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:31:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:31:13 -0600 |
| commit | 0ae5679aa160245af248836e1d7743aeff63f2e1 (patch) | |
| tree | 64608dccc9bfd57800995a414f6287b7605ca637 | |
| parent | d3b5575f31f14629dbd3fd900665e1a69aa7bcd5 (diff) | |
| download | tdelibs-0ae5679aa160245af248836e1d7743aeff63f2e1.tar.gz tdelibs-0ae5679aa160245af248836e1d7743aeff63f2e1.zip | |
Additional kde to tde renaming
847 files changed, 2344 insertions, 2344 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 569129be7..5837d0f0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -412,7 +412,7 @@ if( WITH_SUDO_KDESU_BACKEND ) if( __PATH_SUDO ) set( DEFAULT_SUPER_USER_COMMAND ${__PATH_SUDO} ) else( __PATH_SUDO ) - message( FATAL_ERROR "sudo was chosen as kdesu backend, but was not found in path." ) + message( FATAL_ERROR "sudo was chosen as tdesu backend, but was not found in path." ) endif( __PATH_SUDO ) endif( WITH_SUDO_KDESU_BACKEND ) @@ -740,7 +740,7 @@ endif( WITH_HSPELL ) configure_file( config.h.cmake config.h ) configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h ) -configure_file( kdecore/kdemacros.h.cmake kdecore/kdemacros.h ) +configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h ) configure_file( kjs/global.h.in kjs/global.h ) configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h ) configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) @@ -751,7 +751,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl ) set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp ) set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc ) -set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_compiler ) +set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler ) ##### global compiler settings ################## @@ -777,11 +777,11 @@ install( FILES add_subdirectory( dcop ) add_subdirectory( libltdl ) add_subdirectory( kglib ) -add_subdirectory( kdefx ) -add_subdirectory( kdecore ) +add_subdirectory( tdefx ) +add_subdirectory( tdecore ) add_subdirectory( kunittest ) -add_subdirectory( kdeui ) -add_subdirectory( kdesu ) +add_subdirectory( tdeui ) +add_subdirectory( tdesu ) add_subdirectory( kjs ) add_subdirectory( kwallet ) add_subdirectory( kio ) @@ -797,7 +797,7 @@ add_subdirectory( kutils ) add_subdirectory( kspell2 ) add_subdirectory( kmdi ) add_subdirectory( kinit ) -add_subdirectory( kdeprint ) +add_subdirectory( tdeprint ) add_subdirectory( kab ) add_subdirectory( kresources ) add_subdirectory( kabc ) @@ -102,11 +102,11 @@ Makefile.am but not a Makefile. If you try to compile such a directory you will get an error like: Making all in management - make[3]: Entering directory /home/gregturp/KDE/kdelibs/kdeprint/management' + make[3]: Entering directory /home/gregturp/KDE/kdelibs/tdeprint/management' make[3]: *** No rule to make target all'. Stop. - make[3]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint/management' + make[3]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint/management' make[2]: *** [all-recursive] Error 1 - make[2]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint' + make[2]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory /home/gregturp/KDE/kdelibs' make: *** [all-recursive-am] Error 2 diff --git a/KDE2PORTING.html b/KDE2PORTING.html index 111d2c45f..da4cd7312 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -30,7 +30,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <LI><A HREF="#launching">Starting other programs</A></LI> <LI><A HREF="#khtmlw">khtmlw</A></LI> <LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI> -<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></LI> +<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI> <LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI> <LI><A HREF="#libkfm">libkfm</A></LI> <LI><A HREF="#KDialog">KDialog</A></LI> @@ -175,7 +175,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> certain option was specified on the command line and your application now automatically supports --help and --version. It aborts with a useful error message when the command line contains a syntax error. - See kdelibs/kdecore/kcmdlineargs.h for more info.<P> + See kdelibs/tdecore/kcmdlineargs.h for more info.<P> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> @@ -285,7 +285,7 @@ The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication have all been removed. If you need direct access to these or need access to a help menu in a class that is not derived from KMainWindow then allocate an instance of the new class KHelpMenu. -See KDE 2.0 API reference or khelpmenu.h (kdeui) for additional info.<P> +See KDE 2.0 API reference or khelpmenu.h (tdeui) for additional info.<P> Espen Sand <<A HREF="mailto:espen@kde.org">espen@kde.org</A>><P> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> @@ -430,7 +430,7 @@ khtmlw has been replaced with khtml.<BR> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></H3> +<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></H3> KDE Drag and Drop is Dead. Long live Qt Xdnd.<P> @@ -481,7 +481,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P> Much more extensive documentation on the KConfig and friends API can be found in the kdoc generated documentation from the header files, - and in kdecore/KCONFIG_DESIGN.<P> + and in tdecore/KCONFIG_DESIGN.<P> To use the new iterator, you will probably want to do something like this:<P> @@ -515,7 +515,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P> <TR><TD>KFM::exec </TD><TD>-> "(void) new KRun (url)" (kdelibs/kio/krun.h)</TD></TR> <TR><TD>KFM::copy, KFM::move </TD><TD>-> KIO::Job (async, see kio/job.h)<BR> or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR> -<TR><TD>DlgLocation </TD><TD>-> Use KLineEditDlg (kdeui/klineeditdlg.h) instead</TD></TR> +<TR><TD>DlgLocation </TD><TD>-> Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR> </TABLE> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> diff --git a/KDE3PORTING.html b/KDE3PORTING.html index c86394543..7ef397c0b 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -17,8 +17,8 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P> <UL> <LI><A HREF="#gettingstarted">Getting Started</A></LI> <LI><A HREF="#kab">Changes in kab</A></LI> -<LI><A HREF="#kdecore">Changes in kdecore</A></LI> -<LI><A HREF="#kdeui">Changes in kdeui</A></LI> +<LI><A HREF="#tdecore">Changes in tdecore</A></LI> +<LI><A HREF="#tdeui">Changes in tdeui</A></LI> <LI><A HREF="#kio">Changes in kio</A></LI> <LI><A HREF="#kparts">Changes in kparts</A></LI> <LI><A HREF="#kspell">Changes in kspell</A></LI> @@ -65,7 +65,7 @@ The old name will still work unless KDE_NO_COMPAT is defined. <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="kdecore">Changes in kdecore</A></H3> +<H3><A NAME="tdecore">Changes in tdecore</A></H3> <H4>KDesktopWidget</H4> KDesktopWidget is obsolete. Include <tqdesktopwidget.h> and use QDesktopWidget @@ -109,7 +109,7 @@ The <i>filename()</i> method has been renamed to <i>fileName()</i>. The old name will still work unless KDE_NO_COMPAT is defined. <H4>KPixmapSplitter</H4> -KPixmapSplitter has now been moved to the new kdefx library. +KPixmapSplitter has now been moved to the new tdefx library. <H4>KStringHandler</H4> The <i>matchFilename( const TQString& filename, const TQString& pattern )</i> method has been @@ -121,8 +121,8 @@ Due to the major changes in the TQStyle API in Qt3, KStyle has been completely re-written. KStyle is now a thin wrapper around TQCommonStyle with a few extra primitive elements and a simple popupMenu transparency engine. All KStyles can now style Qt apps like designer and assistant automatically. KStyle is no longer -present in kdecore. It is now in a new library called kdefx to allow Qt apps to -use KDE's styles without having the styles linked to kdecore/kdeui. +present in tdecore. It is now in a new library called tdefx to allow Qt apps to +use KDE's styles without having the styles linked to tdecore/tdeui. <H4>KURL</H4> The <i>filename( bool _ignore_trailing_slash_in_path = true )</i> method has been @@ -219,7 +219,7 @@ KURLBar and KURLBarItem. <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="kdeui">Changes in kdeui</A></H3> +<H3><A NAME="tdeui">Changes in tdeui</A></H3> <H4>KAccelMenu</H4> This class has been removed, Qt offers the same functionality. @@ -281,7 +281,7 @@ KEdit is now deprecated. You should use use KTextEditor::Editor or KTextEdit instead. <H4>KImageEffect</H4> -KImageEffect has now been moved to the new kdefx library. +KImageEffect has now been moved to the new tdefx library. <H4>KMessageBox</H4> KMessageBox now does automatic line-breaking. When using plain-text, you should @@ -303,7 +303,7 @@ at run-time). See KDE 3.0 documentation for more informations on this new extension. <H4>KPixmapEffect</H4> -PixmapEffect has now been moved to the new kdefx library. +PixmapEffect has now been moved to the new tdefx library. <H4>KProgress</H4> KProgress is now based on TQProgressBar. @@ -319,7 +319,7 @@ The old name will still work unless KDE_NO_COMPAT is defined. <H4>KThemeBase, KThemeStyle</H4> KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API -present in Qt3/KDE3. KThemeBase is no longer in kdeui, but in kstyles/kthemestyle +present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle as its use is basically limited to KThemeStyle. <H4>KAction, KToolBar, KToolBarButton and icons</H4> diff --git a/Mainpage.dox b/Mainpage.dox index 368f25baa..f1d31fae9 100644 --- a/Mainpage.dox +++ b/Mainpage.dox @@ -8,11 +8,11 @@ * can subscribe or read the mailing lists for any additions and/or * modifications to the API. * - * - <a target="_top" href="kdecore/html/index.html"><b>kdecore</b></a> - * (<a target="_top" href="kdecore/html/classes.html">classes</a>)\n + * - <a target="_top" href="tdecore/html/index.html"><b>tdecore</b></a> + * (<a target="_top" href="tdecore/html/classes.html">classes</a>)\n * <i>Core Trinity classes that are not related to the user interface.</i> - * - <a target="_top" href="kdeui/html/index.html"><b>kdeui</b></a> - * (<a target="_top" href="kdeui/html/classes.html">classes</a>)\n + * - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a> + * (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n * <i>Trinity User interface classes such as widgets.</i> * - <a target="_top" href="khtml/html/index.html"><b>khtml</b></a> * (<a target="_top" href="khtml/html/classes.html">classes</a>)\n @@ -30,8 +30,8 @@ * - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a> * (<a target="_top" href="dcop/html/classes.html">classes</a>)\n * <i>The DCOP communications library.</i> - * - <a target="_top" href="kdefx/html/index.html"><b>kdefx</b></a> - * (<a target="_top" href="kdefx/html/classes.html">classes</a>)\n + * - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a> + * (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n * <i>A library with pixmap effects.</i> * - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a> * (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n @@ -39,8 +39,8 @@ * - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a> * (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n * <i>Midi library.</i> - * - <a target="_top" href="kdeprint/html/index.html"><b>kdeprint</b></a> - * (<a target="_top" href="kdeprint/html/classes.html">classes</a>)\n + * - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a> + * (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n * <i>High level printer control functionality.</i> * - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a> * (<a target="_top" href="krandr/html/classes.html">classes</a>)\n diff --git a/Makefile.am.in b/Makefile.am.in index ba1149e5e..6a92a88af 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -18,10 +18,10 @@ # Boston, MA 02110-1301, USA. -COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio kded kded_post +COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post COMPILE_BEFORE_doc = kdoctools -COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml krandr -COMPILE_AFTER_kdeprint = kate khtml +COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr +COMPILE_AFTER_tdeprint = kate khtml COMPILE_BEFORE_khtml = kutils COMPILE_BEFORE_kabc = kab kresources COMPILE_BEFORE_kate = interfaces kutils @@ -53,7 +53,7 @@ messages: find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\ find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ - echo ./kdecore/kde-config.cpp.in >> files ;\ + echo ./tdecore/kde-config.cpp.in >> files ;\ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \ : > kde.pot ;\ $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot @@ -16,7 +16,7 @@ use both "xxxx.la" and "libxxxx.la" as names for DSOs!! KDEInit Loadable Modules ======================== Name: <appname>.la -Definition: kdeinit_LTLIBRARIES = <appname>.la +Definition: tdeinit_LTLIBRARIES = <appname>.la LDFLAGS: -module $(KDE_PLUGIN) @@ -45,23 +45,23 @@ Here is an alphabetical list: * kconf_update Auto-Updater for config files. -* kdecore +* tdecore This is the core collection of KDE stuff. Non GUI classes reside here. * kded The KDE daemon checks for newly installed software, update files or hostname changes and takes according actions. -* kdefx +* tdefx Library with pixmap effects. -* kdeprint +* tdeprint The very versatile printing subsystem of KDE. -* kdesu +* tdesu Library for password entering and handling -* kdeui +* tdeui The main collection of misc. user interface classes (widgets). KSpell and related classes are a frontend to ispell for use within a GUI app. @@ -71,7 +71,7 @@ that we would like to make for the next binary incompatible release. - Solve need for casting when using bitfield enums (e.g. KProcess::Communication), if Simon's solution works. -- Merge kdelibs/kdecore/kuser.h and kdeadmin/kuser/kuser.h. +- Merge kdelibs/tdecore/kuser.h and kdeadmin/kuser/kuser.h. - Simplify memory management with KParts. The part and the widget delete each other, which in fact makes it more complex to handle. The part owns the widget so it @@ -173,7 +173,7 @@ that we would like to make for the next binary incompatible release. - Get rid of KXMLClient::conserveMemory() and the conserveMemory argument in createGUI. It created too many problems in the past. Not worth the trouble. -- Split KProtocolInfo into KProtocolInfoBase in kdecore (with almost everything) +- Split KProtocolInfo into KProtocolInfoBase in tdecore (with almost everything) and KProtocolInfo in kio (with the methods taking a KURL, which need KProtocolManager) - Rename KDirNotify_stub and update API (no need for '*' arguments anymore) @@ -221,7 +221,7 @@ an alternative help->contents action) just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea to have here for later doing. -- Move KRichTextLabel into kdeui if still required with Qt 4. +- Move KRichTextLabel into tdeui if still required with Qt 4. - Add the concept of a session to KIO, in particular for KHTML so that it can have all of its jobs associated in some way (a unique key of sorts). Will diff --git a/arts/Makefile.am b/arts/Makefile.am index 31bd7bbbd..f15b8b7be 100644 --- a/arts/Makefile.am +++ b/arts/Makefile.am @@ -4,6 +4,6 @@ else SUBDIRS = knotify endif -DOXYGEN_REFERENCES = kio kdecore kdeui +DOXYGEN_REFERENCES = kio tdecore tdeui include ../admin/Doxyfile.am diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt index 9c8028bb7..3877ddb9d 100644 --- a/arts/kde/CMakeLists.txt +++ b/arts/kde/CMakeLists.txt @@ -15,9 +15,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index a1b75e2f5..50e8b3a2a 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -77,7 +77,7 @@ Arts::SoundServerV2 KArtsServer::server(void) X11CommConfig.sync(); - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data(); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data(); if(rt) proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data(); @@ -91,7 +91,7 @@ Arts::SoundServerV2 KArtsServer::server(void) // We could have a race-condition here. // The correct way to do it is to make artsd fork-and-exit // after starting to listen to connections (and running artsd - // directly instead of using kdeinit), but this is better + // directly instead of using tdeinit), but this is better // than nothing. int time = 0; do diff --git a/arts/kde/mcop-dcop/Makefile.am b/arts/kde/mcop-dcop/Makefile.am index 6e2b90eac..07d5e7a0f 100644 --- a/arts/kde/mcop-dcop/Makefile.am +++ b/arts/kde/mcop-dcop/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= -I$(includedir)/arts -I$(top_srcdir)/arts/kde $(all_includes) bin_PROGRAMS= lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kmcop.la +tdeinit_LTLIBRARIES = kmcop.la kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel kmcop_la_LIBADD = ../libartskde.la diff --git a/arts/knotify/CMakeLists.txt b/arts/knotify/CMakeLists.txt index 7871b1813..c290e9188 100644 --- a/arts/knotify/CMakeLists.txt +++ b/arts/knotify/CMakeLists.txt @@ -14,11 +14,11 @@ include_directories( ${ARTS_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/arts/kde ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -43,7 +43,7 @@ set( ${target}_SRCS if( ARTS_FOUND ) set( LIBS artskde-shared ) else( ARTS_FOUND ) - set( LIBS kdeui-shared ) + set( LIBS tdeui-shared ) endif( ARTS_FOUND ) tde_add_kpart( ${target} AUTOMOC diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am index 9472b5dec..fea1a9e9c 100644 --- a/arts/knotify/Makefile.am +++ b/arts/knotify/Makefile.am @@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO check_PROGRAMS = knotifytest knotifytest_SOURCES = knotifytest.cpp knotifytest_LDADD = $(LIB_KDECORE) -knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = knotify.h diff --git a/arts/message/CMakeLists.txt b/arts/message/CMakeLists.txt index 1a07d3d94..12e91f65e 100644 --- a/arts/message/CMakeLists.txt +++ b/arts/message/CMakeLists.txt @@ -11,9 +11,9 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -31,6 +31,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/arts/message/Makefile.am b/arts/message/Makefile.am index 19dbe8f2f..24b7a6d18 100644 --- a/arts/message/Makefile.am +++ b/arts/message/Makefile.am @@ -4,5 +4,5 @@ bin_PROGRAMS = artsmessage artsmessage_SOURCES = artsmessage.cc -artsmessage_LDADD = ../../kdeui/libtdeui.la +artsmessage_LDADD = ../../tdeui/libtdeui.la artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS) diff --git a/config.h.cmake b/config.h.cmake index 99562b3a6..cc009095f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -692,10 +692,10 @@ /* Enable prevention against poor Linux OOM-killer */ #cmakedefine KDEINIT_OOM_PROTECT 1 -/* Use FontConfig in kdeinit */ +/* Use FontConfig in tdeinit */ #cmakedefine KDEINIT_USE_FONTCONFIG 1 -/* Use Xft preinitialization in kdeinit */ +/* Use Xft preinitialization in tdeinit */ #cmakedefine KDEINIT_USE_XFT 1 /* Suffix for lib directories */ diff --git a/configure.in.bot b/configure.in.bot index 8c6d85bf6..4383af879 100644 --- a/configure.in.bot +++ b/configure.in.bot @@ -52,7 +52,7 @@ if test -z "$LIBXML_CFLAGS"; then echo "so if you want helpfiles you should consider installing it." echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary" echo "package for your platform." - echo "You can find a copy of libxml2 in the kdesupport module if you're using CVS." + echo "You can find a copy of libxml2 in the tdesupport module if you're using CVS." echo "" all_tests=bad fi @@ -64,7 +64,7 @@ if test -z "$LIBXSLT_CFLAGS"; then echo "so if you want helpfiles you should consider installing it." echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary" echo "package for your platform." - echo "You can find a copy of libxslt in the kdesupport module if you're using CVS." + echo "You can find a copy of libxslt in the tdesupport module if you're using CVS." echo "" all_tests=bad fi diff --git a/configure.in.in b/configure.in.in index 658ca039e..5eae312c6 100644 --- a/configure.in.in +++ b/configure.in.in @@ -250,13 +250,13 @@ AC_SUBST(LIBICE) AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la') AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la') -AC_SUBST(LIB_KDECORE, '$(top_builddir)/kdecore/libtdecore.la') -AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libtdeui.la') +AC_SUBST(LIB_KDECORE, '$(top_builddir)/tdecore/libtdecore.la') +AC_SUBST(LIB_KDEUI, '$(top_builddir)/tdeui/libtdeui.la') AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la') AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la') AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la') AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la') -AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/kdeprint/libtdeprint.la') +AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la') AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la') AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la') AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la') @@ -308,7 +308,7 @@ AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl') AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng') AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp') AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets') -AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/kdecore/kconfig_compiler/kconfig_compiler') +AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler') ac_save_LIBS="$LIBS" LIBS="$LIBS $X_LDFLAGS -lICE" diff --git a/configure.in.mid b/configure.in.mid index 30814e3a7..669f0d13c 100644 --- a/configure.in.mid +++ b/configure.in.mid @@ -1,7 +1,7 @@ dnl put here things which have to be done after all usual autoconf macros dnl have been run, but before the Makefiles are created -all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/kdefx -I$(top_builddir)/kdecore -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)' +all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)' AC_SUBST(all_includes) CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" diff --git a/dcop/CMakeLists.txt b/dcop/CMakeLists.txt index 8854ba88a..ed35d6572 100644 --- a/dcop/CMakeLists.txt +++ b/dcop/CMakeLists.txt @@ -20,8 +20,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -53,7 +53,7 @@ tde_add_library( ${target} SHARED AUTOMOC ) -#### dcopserver (kdeinit) ####################### +#### dcopserver (tdeinit) ####################### set( target dcopserver ) @@ -61,7 +61,7 @@ set( ${target}_SRCS dcopserver.cpp dcopsignals.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kICE-static DCOP-shared ) diff --git a/dcop/HOWTO b/dcop/HOWTO index 8609021c0..c12939ce9 100644 --- a/dcop/HOWTO +++ b/dcop/HOWTO @@ -464,7 +464,7 @@ Sometimes it might be interesting to use DCOP between processes belonging to different users, e.g. a frontend process running with the user's id, and a backend process running as root. -For this you can use kdesu with the --nonewdcop option. kdesu will +For this you can use tdesu with the --nonewdcop option. tdesu will then forward the address of the DCOP server as well as the authentication information to the new user. @@ -479,9 +479,9 @@ carefully reviewed that your DCOPClient does not provide objects/functions that could be abused for privilege escalation. -Example: kdesu --nonewdcop -u root -c kcmroot +Example: tdesu --nonewdcop -u root -c kcmroot -This will, after kdesu got the root password, execute kcmroot as root, +This will, after tdesu got the root password, execute kcmroot as root, talking to the user's dcop server. @@ -503,7 +503,7 @@ int main(int argc, char **argv) Compiled with: -g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -lkdecore +g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore on Linux yields the following memory use statistics: diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox index d573b01b5..ece626186 100644 --- a/dcop/Mainpage.dox +++ b/dcop/Mainpage.dox @@ -377,15 +377,15 @@ second process where to find the authentication information. (Note that this implies that the second process is able to read the authentication file, so it will probably only work if the second process runs as root. If it should run as another -user, a similar approach to what kdesu does with xauth must +user, a similar approach to what tdesu does with xauth must be taken. In fact, it would be a very good idea to add DCOP -support to kdesu!) +support to tdesu!) For example -ICEAUTHORITY=~user/.ICEauthority kdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver` +ICEAUTHORITY=~user/.ICEauthority tdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver` -will, after kdesu got the root password, execute kcmroot as root, talking +will, after tdesu got the root password, execute kcmroot as root, talking to the user's dcop server. diff --git a/dcop/Makefile.am b/dcop/Makefile.am index ced19c79e..187395189 100644 --- a/dcop/Makefile.am +++ b/dcop/Makefile.am @@ -33,7 +33,7 @@ lib_LTLIBRARIES = libDCOP.la libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries) libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck -libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck +libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h noinst_HEADERS = version.h dcopglobal.h dcopserver.h testdcop.h dcopsignals.h dcop-path.h @@ -43,27 +43,27 @@ METASOURCES = AUTO # dcopstub needs to go first for --enable-final to work libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp -kdeinit_LTLIBRARIES = dcopserver.la +tdeinit_LTLIBRARIES = dcopserver.la dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries) dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp dcopserver_la_LIBADD = libDCOP.la $(LIB_QT) dcopserver_shutdown_SOURCES = dcopserver_shutdown.c -testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdcop_SOURCES = testdcop.cpp testdcop_LDADD = libDCOP.la -dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp -dcop_deadlock_test_LDADD = ../kdecore/libtdecore.la +dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la -testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdcopc_SOURCES = testdcopc.c dcopc.c testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM) EXTRA_DIST = HOWTO ICE Mainpage.dox -DOXYGEN_REFERENCES = kdecore +DOXYGEN_REFERENCES = tdecore DOXYGEN_EXCLUDE = KDE-ICE include ../admin/Doxyfile.am diff --git a/dcop/client/CMakeLists.txt b/dcop/client/CMakeLists.txt index 51aca7527..d0b0ee935 100644 --- a/dcop/client/CMakeLists.txt +++ b/dcop/client/CMakeLists.txt @@ -13,8 +13,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_BINARY_DIR}/tdecore ) link_directories( diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index 9defa6d47..e848ac761 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #define KDE_QT_ONLY -#include "../../kdecore/kurl.cpp" +#include "../../tdecore/kurl.cpp" bool mkBool( const TQString& s ) { diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index 50984b71f..3df24100b 100644 --- a/dnssd/CMakeLists.txt +++ b/dnssd/CMakeLists.txt @@ -13,9 +13,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -44,7 +44,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DEPENDENCIES kconfig_compiler DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/dnssd/Mainpage.dox b/dnssd/Mainpage.dox index 81ab7c98b..1a0567638 100644 --- a/dnssd/Mainpage.dox +++ b/dnssd/Mainpage.dox @@ -33,8 +33,8 @@ Jakub Stachowski */ -// Trinity5: get rid of kdeui reference when settings.kcfgc is changed -// DOXYGEN_REFERENCES = kdecore kdeui +// Trinity5: get rid of tdeui reference when settings.kcfgc is changed +// DOXYGEN_REFERENCES = tdecore tdeui // DOXYGEN_SET_PROJECT_NAME = DNSSD // DOXYGEN_SET_EXCLUDE_PATTERNS += */dnssd/avahi* */dnssd/mdnsd* // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am index 37df3485c..c24bdd6ba 100644 --- a/dnssd/Makefile.am +++ b/dnssd/Makefile.am @@ -14,7 +14,7 @@ libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \ dnssdincludedir = $(includedir)/dnssd dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \ publicservice.h servicebase.h servicebrowser.h settings.h -libkdnssd_la_LIBADD = ../kdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT) +libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT) libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0 #kde_kcfg_DATA = kcm_kdnssd.kcfg diff --git a/doc/common/README.Doxygen b/doc/common/README.Doxygen index 77b6bfe5f..708f224c4 100644 --- a/doc/common/README.Doxygen +++ b/doc/common/README.Doxygen @@ -75,14 +75,14 @@ Differences with current dox: <TODO> # autoconf and configure. Run it in the "top builddir" with one argument, # the "top srcdir". Something like this: # -# cd /mnt/build/kdepim -# sh /mnt/src/kdepim/doc/api/doxygen.sh /mnt/src/kdepim +# cd /mnt/build/tdepim +# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim # # You can also build single subdirs (for instance, after updating some # dox and you don't want to rebuild for the enitre module) by giving the # subdirectory _relative to the top srcdir_ as a second argument: # -# sh /mnt/src/kdepim/doc/api/doxygen.sh /mnt/src/kdepim kpilot/lib +# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim kpilot/lib # # When generating dox for kdelibs, a tag file for Qt is also created. # The location of Qt is specified indirectly through $QTDOCDIR or, diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am index 7fc75c1e3..583a7055d 100644 --- a/interfaces/Makefile.am +++ b/interfaces/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech -DOXYGEN_REFERENCES = kdecore kdefx kdeui kparts dcop +DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop DOXYGEN_SET_RECURSIVE = YES include ../admin/Doxyfile.am diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/kimproxy/library/CMakeLists.txt index fb9584973..347e552a5 100644 --- a/interfaces/kimproxy/library/CMakeLists.txt +++ b/interfaces/kimproxy/library/CMakeLists.txt @@ -14,10 +14,10 @@ add_subdirectory( icons ) include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/kmediaplayer/CMakeLists.txt index 06e14d9d1..98346388c 100644 --- a/interfaces/kmediaplayer/CMakeLists.txt +++ b/interfaces/kmediaplayer/CMakeLists.txt @@ -16,12 +16,12 @@ endif( ARTS_FOUND ) include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( diff --git a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt index a316b4ffc..03237da87 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt +++ b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${ARTS_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/interfaces - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/interfaces/kscript/CMakeLists.txt b/interfaces/kscript/CMakeLists.txt index 98afa228d..233dc1c49 100644 --- a/interfaces/kscript/CMakeLists.txt +++ b/interfaces/kscript/CMakeLists.txt @@ -15,10 +15,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am index dbb2843bb..1d60cae7d 100644 --- a/interfaces/kscript/Makefile.am +++ b/interfaces/kscript/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_ #lib_LTLIBRARIES = libkscriptloader.la libkscript.la lib_LTLIBRARIES = libkscript.la #libkscriptloader_la_SOURCES = scriptloader.cpp -#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #libkscriptloader_la_LIBADD = $(LIB_KPARTS) libkscript_la_SOURCES = scriptmanager.cpp diff --git a/interfaces/kscript/sample/CMakeLists.txt b/interfaces/kscript/sample/CMakeLists.txt index eb28b1883..cdb2505e9 100644 --- a/interfaces/kscript/sample/CMakeLists.txt +++ b/interfaces/kscript/sample/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/interfaces/kscript ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( diff --git a/interfaces/kspeech/Makefile.am b/interfaces/kspeech/Makefile.am index a1ecda67f..f8f2b936d 100644 --- a/interfaces/kspeech/Makefile.am +++ b/interfaces/kspeech/Makefile.am @@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h # Define DCOP/Text-to-Speech Service Type. kde_servicetypes_DATA = dcoptexttospeech.desktop -DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts +DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts include ../../admin/Doxyfile.am diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt index a011f2122..3f430b50c 100644 --- a/interfaces/ktexteditor/CMakeLists.txt +++ b/interfaces/ktexteditor/CMakeLists.txt @@ -14,12 +14,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/kabc ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kabc @@ -90,7 +90,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kdeui-shared kabc-shared kparts-shared + LINK tdeui-shared kabc-shared kparts-shared DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/ktexteditor/Makefile.am index d2095e780..8881648ef 100644 --- a/interfaces/ktexteditor/Makefile.am +++ b/interfaces/ktexteditor/Makefile.am @@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \ texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp -libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI) ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \ diff --git a/kab/CMakeLists.txt b/kab/CMakeLists.txt index acf8663cb..12e1ced42 100644 --- a/kab/CMakeLists.txt +++ b/kab/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( diff --git a/kab/Makefile.am b/kab/Makefile.am index e29e87b9c..89e1aab8e 100644 --- a/kab/Makefile.am +++ b/kab/Makefile.am @@ -10,6 +10,6 @@ libkab_la_SOURCES = \ qconfigDB.cc libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -libkab_la_LIBADD = ../kdeui/libtdeui.la +libkab_la_LIBADD = ../tdeui/libtdeui.la libkab_la_METASOURCES = AUTO diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt index 1db5f73c9..3cca65863 100644 --- a/kabc/CMakeLists.txt +++ b/kabc/CMakeLists.txt @@ -24,11 +24,11 @@ include_directories( # external includes ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kab diff --git a/kabc/Makefile.am b/kabc/Makefile.am index 52b8bcb48..76e37e2b0 100644 --- a/kabc/Makefile.am +++ b/kabc/Makefile.am @@ -52,7 +52,7 @@ METASOURCES = AUTO bin_PROGRAMS = kab2kabc -kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kab2kabc_LDADD = libkabc.la ../kab/libkab.la kab2kabc_SOURCES = kab2kabc.cpp @@ -62,7 +62,7 @@ autostartdir = $(datadir)/autostart manager_DATA = kabc_manager.desktop managerdir = $(kde_servicesdir)/kresources -DOXYGEN_REFERENCES = kdecore kdeui +DOXYGEN_REFERENCES = tdecore tdeui map_DATA = countrytransl.map mapdir = $(kde_datadir)/kabc diff --git a/kabc/formats/CMakeLists.txt b/kabc/formats/CMakeLists.txt index 47ad9f37a..327cb1ea6 100644 --- a/kabc/formats/CMakeLists.txt +++ b/kabc/formats/CMakeLists.txt @@ -14,10 +14,10 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt index f25967dc8..1bc7d8daf 100644 --- a/kabc/plugins/dir/CMakeLists.txt +++ b/kabc/plugins/dir/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am index 0ffc7e18d..5967b9433 100644 --- a/kabc/plugins/evolution/Makefile.am +++ b/kabc/plugins/evolution/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp kabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../kdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la +kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la METASOURCES = AUTO diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt index e3a0fc3ae..0c767b00d 100644 --- a/kabc/plugins/file/CMakeLists.txt +++ b/kabc/plugins/file/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt index b0e2b0d07..57370c9cf 100644 --- a/kabc/plugins/ldapkio/CMakeLists.txt +++ b/kabc/plugins/ldapkio/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfiles diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt index e7336f1ff..5433af217 100644 --- a/kabc/plugins/net/CMakeLists.txt +++ b/kabc/plugins/net/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am index 1998296a7..f4183d442 100644 --- a/kabc/plugins/net/Makefile.am +++ b/kabc/plugins/net/Makefile.am @@ -11,7 +11,7 @@ libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h kde_module_LTLIBRARIES = kabc_net.la kabc_net_la_SOURCES = resourcenetplugin.cpp -kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../kdecore/.libs/ -lkdecore +kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore kabc_net_la_LIBADD = libkabc_net.la METASOURCES = AUTO diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am index 810938683..6d638936f 100644 --- a/kabc/plugins/sql/Makefile.am +++ b/kabc/plugins/sql/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_sql.la kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp kabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_sql_la_LIBADD = ../../libkabc.la ../../../kdeui/libtdeui.la +kabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la METASOURCES = AUTO diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am index 12651b8f0..3c40ccb63 100644 --- a/kabc/tests/Makefile.am +++ b/kabc/tests/Makefile.am @@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient testlock_LDFLAGS = $(all_libraries) testlock_SOURCES = testlock.cpp -testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testldapclient_SOURCES = testldapclient.cpp EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \ testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit -testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabc_SOURCES = testkabc.cpp -testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressee_SOURCES = testaddressee.cpp -testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresseelist_SOURCES = testaddresseelist.cpp -testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressfmt_SOURCES = testaddressfmt.cpp -testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabcdlg_SOURCES = testkabcdlg.cpp -testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdistlist_SOURCES = testdistlist.cpp -testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresslineedit_SOURCES = testaddresslineedit.cpp -bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigread_SOURCES = bigread.cpp -bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigwrite_SOURCES = bigwrite.cpp -testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdb_SOURCES = testdb.cpp -kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kabcargl_SOURCES = kabcargl.cpp diff --git a/kabc/vcard/CMakeLists.txt b/kabc/vcard/CMakeLists.txt index f2ac63bac..8ad988434 100644 --- a/kabc/vcard/CMakeLists.txt +++ b/kabc/vcard/CMakeLists.txt @@ -15,8 +15,8 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/generated - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -35,6 +35,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am index 20d9b640e..94d08e292 100644 --- a/kabc/vcard/Makefile.am +++ b/kabc/vcard/Makefile.am @@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) check_PROGRAMS = testwrite testread -testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testwrite_LDADD = libvcard.la testwrite_SOURCES = testwrite.cpp -testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread_LDADD = libvcard.la testread_SOURCES = testread.cpp diff --git a/kabc/vcardparser/CMakeLists.txt b/kabc/vcardparser/CMakeLists.txt index e68bd8fb1..2c6fa112a 100644 --- a/kabc/vcardparser/CMakeLists.txt +++ b/kabc/vcardparser/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am index 0b30120cd..5978a8f38 100644 --- a/kabc/vcardparser/Makefile.am +++ b/kabc/vcardparser/Makefile.am @@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h check_PROGRAMS = testread testwrite testread2 -testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread_SOURCES = testread.cpp -testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread2_SOURCES = testread2.cpp testutils.cpp -testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testwrite_SOURCES = testwrite.cpp diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox index 301d5788b..8d8515b52 100644 --- a/kate/Mainpage.dox +++ b/kate/Mainpage.dox @@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\> @lgpl */ -// DOXYGEN_REFERENCES = kdecore kio kdeui kparts interfaces/kdocument interfaces/ktexteditor kjs +// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs // DOXYGEN_SET_PROJECT_NAME = Kate // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kate/Makefile.am b/kate/Makefile.am index 180e86dab..04666d8cb 100644 --- a/kate/Makefile.am +++ b/kate/Makefile.am @@ -6,6 +6,6 @@ messages: $(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp $(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot -DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts +DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts include ../admin/Doxyfile.am diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt index 07f13aa6f..c747f184c 100644 --- a/kate/interfaces/CMakeLists.txt +++ b/kate/interfaces/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index 9d0392254..11e347212 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -15,18 +15,18 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kjs ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kjs ${CMAKE_SOURCE_DIR}/kutils - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdeprint ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor ${LUA_INCLUDE_DIRS} @@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy tde_add_kpart( ${target} SOURCES dummy.cpp EMBED kate-static - LINK kjs-shared kdeprint-shared katepartinterfaces-shared kutils-shared + LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am index 9be7a9e6d..5b9cea187 100644 --- a/kate/part/Makefile.am +++ b/kate/part/Makefile.am @@ -20,7 +20,7 @@ libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_ libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/kdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes) +INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes) METASOURCES = AUTO diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index 837d773e5..925c99e1a 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk> * Copyright (c) 2002, 2003 Anders Lund <anders@alweb.dk> * diff --git a/kate/part/kateprinter.h b/kate/part/kateprinter.h index 09f63d744..283c2b58e 100644 --- a/kate/part/kateprinter.h +++ b/kate/part/kateprinter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk> * * This library is free software; you can redistribute it and/or diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt index f6e0d25d0..8f4390f64 100644 --- a/kate/plugins/insertfile/CMakeLists.txt +++ b/kate/plugins/insertfile/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt index 8a9c7652f..693c3a409 100644 --- a/kate/plugins/isearch/CMakeLists.txt +++ b/kate/plugins/isearch/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt index c073d234b..aba50c79f 100644 --- a/kate/plugins/kdatatool/CMakeLists.txt +++ b/kate/plugins/kdatatool/CMakeLists.txt @@ -12,11 +12,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/interfaces diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am index 02aaff789..aa1e68bba 100644 --- a/kate/plugins/kdatatool/Makefile.am +++ b/kate/plugins/kdatatool/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt index f93e03291..007b93f20 100644 --- a/kate/plugins/wordcompletion/CMakeLists.txt +++ b/kate/plugins/wordcompletion/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/kcert/CMakeLists.txt b/kcert/CMakeLists.txt index 52d8aa82b..b8bf6c84b 100644 --- a/kcert/CMakeLists.txt +++ b/kcert/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/kio/kssl ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt index 46e8f28ab..fafd6c2b1 100644 --- a/kcmshell/CMakeLists.txt +++ b/kcmshell/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kutils @@ -34,7 +34,7 @@ set( ${target}_SRCS main.cpp main.skel ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kutils-shared DEPENDENCIES dcopidl diff --git a/kcmshell/Makefile.am b/kcmshell/Makefile.am index e26b0c6fa..bc89bed8f 100644 --- a/kcmshell/Makefile.am +++ b/kcmshell/Makefile.am @@ -23,7 +23,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = bin_PROGRAMS = -kdeinit_LTLIBRARIES = kcmshell.la +tdeinit_LTLIBRARIES = kcmshell.la kcmshell_la_SOURCES = main.cpp main.skel kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE) diff --git a/kconf_update/CMakeLists.txt b/kconf_update/CMakeLists.txt index ec5291656..2e25811a7 100644 --- a/kconf_update/CMakeLists.txt +++ b/kconf_update/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -28,7 +28,7 @@ set( ${target}_SRCS kconf_update.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdecore-shared + LINK tdecore-shared ) diff --git a/kconf_update/Makefile.am b/kconf_update/Makefile.am index 6d181faee..34e03cf8d 100644 --- a/kconf_update/Makefile.am +++ b/kconf_update/Makefile.am @@ -20,7 +20,7 @@ INCLUDES= -I../kded $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kconf_update.la +tdeinit_LTLIBRARIES = kconf_update.la kconf_update_la_SOURCES = kconf_update.cpp kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index 2cad31cb0..348e80451 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -27,8 +27,8 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/network ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/libltdl - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio/kio ${LIBART_INCLUDE_DIRS} ${LIBIDN_INCLUDE_DIRS} @@ -90,7 +90,7 @@ install( FILES eventsrc ##### libtdecore ################################ -set( target kdecore ) +set( target tdecore ) set( ${target}_SRCS libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp @@ -120,7 +120,7 @@ set( ${target}_SRCS kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp - kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp + kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp kqiodevicegzip_p.cpp ktimezones.cpp ) @@ -128,16 +128,16 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - EMBED kdecorenetwork-static - LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM + EMBED tdecorenetwork-static + LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${LIB_INSTALL_DIR} ) -##### kdefakes_nonpic ########################### +##### tdefakes_nonpic ########################### -set( target kdefakes_nonpic ) +set( target tdefakes_nonpic ) set( ${target}_SRCS fakes.c vsnprintf.c @@ -148,9 +148,9 @@ tde_add_library( ${target} STATIC DESTINATION ${LIB_INSTALL_DIR} ) -##### kdefakes_pic ############################## +##### tdefakes_pic ############################## -set( target kdefakes_pic ) +set( target tdefakes_pic ) set( ${target}_SRCS fakes.c vsnprintf.c @@ -164,7 +164,7 @@ tde_add_library( ${target} STATIC_PIC ##### libtdefakes ############################### -set( target kdefakes ) +set( target tdefakes ) set( ${target}_SRCS fakes.c vsnprintf.c @@ -185,7 +185,7 @@ configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY ) tde_add_executable( kde-config SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -204,6 +204,6 @@ tde_add_executable(kgrantpty SETUID tde_add_executable( kdetcompmgr SOURCES kdetcompmgr.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdecore/MAINTAINERS b/kdecore/MAINTAINERS index 50820b5f0..64b825f06 100644 --- a/kdecore/MAINTAINERS +++ b/kdecore/MAINTAINERS @@ -104,7 +104,7 @@ klockfile.cpp Waldo Bastian <bastian@kde.org> (copyright) kmacroexpander.cpp kmanagerselection.cpp Lubos Lunak <l.lunak@kde.org> (copyright) kmountpoint.cpp Waldo Bastian <bastian@kde.org> (copyright) -kprotocolinfo_kdecore.cpp Torben Weis <weis@kde.org> (copyright) +kprotocolinfo_tdecore.cpp Torben Weis <weis@kde.org> (copyright) kprotocolinfofactory.cpp Torben Weis <weis@kde.org> (copyright) kprotocolinfofactory.cpp Waldo Bastian <bastian@kde.org> (copyright) kpty.cpp diff --git a/kdecore/Mainpage.dox b/kdecore/Mainpage.dox index 987080ad2..c0e13a339 100644 --- a/kdecore/Mainpage.dox +++ b/kdecore/Mainpage.dox @@ -5,7 +5,7 @@ as the configuration system, IPC, internationalization and locale support, site-independent access to the filesystem and a large number of other (but no less important) things. <p> -All Trinity applications should link to the kdecore library. Also, using a +All Trinity applications should link to the tdecore library. Also, using a KApplication derived class instead of TQApplication is almost mandatory if you expect your application to behave nicely within the Trinity environment. diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am index 32ccec1ca..92ee7ebfc 100644 --- a/kdecore/Makefile.am +++ b/kdecore/Makefile.am @@ -20,7 +20,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes) $(LIBART_CFLAGS) +INCLUDES = -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdecore/network $(all_includes) $(LIBART_CFLAGS) if include_SVGICONS SVGICONS=svgicons @@ -117,20 +117,20 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \ kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \ kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \ ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp \ - kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \ + kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \ kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ kqiodevicegzip_p.cpp ktimezones.cpp libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \ - $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL) + $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL) libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ - $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck libtdecore_la_METASOURCES = AUTO -SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore +SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/tdecore kdebugdir = $(kde_confdir) kdebug_DATA = kdebug.areas kdebugrc language.codes @@ -154,7 +154,7 @@ install-data-local: uninstall-local: -rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h -# If you add a color palette file here, please change kdelibs/kdeui/kcolordialog.cpp too to allow to translate the name +# If you add a color palette file here, please change kdelibs/tdeui/kcolordialog.cpp too to allow to translate the name colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors colorsdir = $(kde_confdir)/colors @@ -188,7 +188,7 @@ install-exec-hook: DISTCLEANFILES = kde-config.cpp -DOXYGEN_REFERENCES = dcop kdeui kparts kio +DOXYGEN_REFERENCES = dcop tdeui kparts kio DOXYGEN_EXCLUDE = malloc kde_file.h DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES diff --git a/kdecore/README b/kdecore/README index 0788341af..ec99f440f 100644 --- a/kdecore/README +++ b/kdecore/README @@ -1,3 +1,3 @@ -This is the KDE "core" library. The kdecore library provides basic non user +This is the KDE "core" library. The tdecore library provides basic non user interface functionality. diff --git a/kdecore/README.kstartupinfo b/kdecore/README.kstartupinfo index 233ccde1e..cbb6a6dfb 100644 --- a/kdecore/README.kstartupinfo +++ b/kdecore/README.kstartupinfo @@ -88,7 +88,7 @@ The KStartupInfo classes : -------------------------- In some cases, or if you are interested in getting the ASN information, you -have to use the KStartupInfo classes in kdelibs/kdecore. +have to use the KStartupInfo classes in kdelibs/tdecore. Receiving the application startup notification information : ------------------------------------------------------------ diff --git a/kdecore/configure.in.in b/kdecore/configure.in.in index b2fe9bd6e..7439a7c12 100644 --- a/kdecore/configure.in.in +++ b/kdecore/configure.in.in @@ -1,7 +1,7 @@ dnl Compile in the exec prefix to help kstddirs in finding dynamic libs AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading]) -dnl Compile in kde_bindir to safely find kdesu_stub. +dnl Compile in kde_bindir to safely find tdesu_stub. if test "$exec_prefix" = "NONE"; then bindir_str="\"$prefix/bin\"" else @@ -167,9 +167,9 @@ AC_TRY_LINK(dnl AC_CHECK_HEADERS(sys/mount.h) -dnl AC_OUTPUT(kdecore/kde-config.cpp) +dnl AC_OUTPUT(tdecore/kde-config.cpp) -AM_CONFIG_HEADER(kdecore/kdemacros.h) +AM_CONFIG_HEADER(tdecore/kdemacros.h) SVGICONS= diff --git a/kdecore/kaccel.cpp b/kdecore/kaccel.cpp index 75cd7aecf..b1fe773c6 100644 --- a/kdecore/kaccel.cpp +++ b/kdecore/kaccel.cpp @@ -523,7 +523,7 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut ) const TQString& KAccel::configGroup() const { return d->configGroup(); } -// for kdegames/ksirtet +// for tdegames/ksirtet void KAccel::setConfigGroup( const TQString& s ) { d->setConfigGroup( s ); } diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp index 7dc49ce78..6e8f08e0a 100644 --- a/kdecore/kaccelmanager.cpp +++ b/kdecore/kaccelmanager.cpp @@ -46,7 +46,7 @@ #include "kaccelmanager_private.h" -#include "../kdeui/kstdaction_p.h" +#include "../tdeui/kstdaction_p.h" #include "../kutils/kmultitabbar.h" diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index 1f0db7240..9fdcfbcb9 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -1440,18 +1440,18 @@ bool KApplication::sessionSaving() const void KApplication::startKdeinit() { #ifndef Q_WS_WIN //TODO - KInstance inst( "startkdeinitlock" ); - KLockFile lock( locateLocal( "tmp", "startkdeinitlock", &inst )); + KInstance inst( "starttdeinitlock" ); + KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst )); if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) { lock.lock(); DCOPClient cl; if( cl.attach()) return; // whoever held the lock has already started dcopserver } - // Try to launch kdeinit. - TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit")); + // Try to launch tdeinit. + TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit")); if (srv.isEmpty()) - srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); + srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) @@ -2884,7 +2884,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString error; // TODO this should check if cmd has a .desktop file, and use data from it, together // with sending more ASN data - if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) + if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) if (Tty != kapp->type()) TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"), i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK")); @@ -3006,7 +3006,7 @@ startServiceInternal( const TQCString &function, // make sure there is id, so that user timestamp exists stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id ); #endif - if( function.left( 12 ) != "kdeinit_exec" ) + if( function.left( 12 ) != "tdeinit_exec" ) stream << noWait; if (!dcopClient->call(_launcher, _launcher, @@ -3100,32 +3100,32 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi } int -KApplication::kdeinitExec( const TQString& name, const TQStringList &args, +KApplication::tdeinitExec( const TQString& name, const TQStringList &args, TQString *error, int *pid ) { - return kdeinitExec( name, args, error, pid, "" ); + return tdeinitExec( name, args, error, pid, "" ); } int -KApplication::kdeinitExec( const TQString& name, const TQStringList &args, +KApplication::tdeinitExec( const TQString& name, const TQStringList &args, TQString *error, int *pid, const TQCString& startup_id ) { - return startServiceInternal("kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)", + return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)", name, args, error, 0, pid, startup_id, false); } int -KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args, +KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args, TQString *error, int *pid ) { - return kdeinitExecWait( name, args, error, pid, "" ); + return tdeinitExecWait( name, args, error, pid, "" ); } int -KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args, +KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args, TQString *error, int *pid, const TQCString& startup_id ) { - return startServiceInternal("kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)", + return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)", name, args, error, 0, pid, startup_id, false); } diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h index 25ecb6ee3..f1be3bfb8 100644 --- a/kdecore/kapplication.h +++ b/kdecore/kapplication.h @@ -814,10 +814,10 @@ public: TQString *error=0, TQCString *dcopService=0, int *pid = 0, const TQCString &startup_id = "", bool noWait = false ); /** - * Starts a program via kdeinit. + * Starts a program via tdeinit. * * program name and arguments are converted to according to the - * local encoding and passed as is to kdeinit. + * local encoding and passed as is to tdeinit. * * @param name Name of the program to start * @param args Arguments to pass to the program @@ -830,16 +830,16 @@ public: * "" ( empty string ) is the default * @return an error code indicating success (== 0) or failure (> 0). */ - static int kdeinitExec( const TQString& name, const TQStringList &args, + static int tdeinitExec( const TQString& name, const TQStringList &args, TQString *error, int *pid, const TQCString& startup_id ); // KDE4 merge with above with startup_id = "" - static int kdeinitExec( const TQString& name, const TQStringList &args=TQStringList(), + static int tdeinitExec( const TQString& name, const TQStringList &args=TQStringList(), TQString *error=0, int *pid = 0 ); /** - * Starts a program via kdeinit and wait for it to finish. + * Starts a program via tdeinit and wait for it to finish. * - * Like kdeinitExec(), but it waits till the program is finished. + * Like tdeinitExec(), but it waits till the program is finished. * As such it behaves similar to the system(...) function. * * @param name Name of the program to start @@ -853,10 +853,10 @@ public: * "" ( empty string ) is the default * @return an error code indicating success (== 0) or failure (> 0). */ - static int kdeinitExecWait( const TQString& name, const TQStringList &args, + static int tdeinitExecWait( const TQString& name, const TQStringList &args, TQString *error, int *pid, const TQCString& startup_id ); // KDE4 merge with above with startup_id = "" - static int kdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(), + static int tdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(), TQString *error=0, int *pid = 0 ); /** diff --git a/kdecore/kconfig.cpp b/kdecore/kconfig.cpp index 2531034ee..709e39de3 100644 --- a/kdecore/kconfig.cpp +++ b/kdecore/kconfig.cpp @@ -294,7 +294,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile) { TQStringList args; args << "--check" << updateFile; - KApplication::kdeinitExecWait("kconf_update", args); + KApplication::tdeinitExecWait("kconf_update", args); reparseConfiguration(); } setGroup(oldGroup); diff --git a/kdecore/kconfig_compiler/CMakeLists.txt b/kdecore/kconfig_compiler/CMakeLists.txt index d256d21c3..4acc09f51 100644 --- a/kdecore/kconfig_compiler/CMakeLists.txt +++ b/kdecore/kconfig_compiler/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -24,6 +24,6 @@ link_directories( tde_add_executable( kconfig_compiler SOURCES kconfig_compiler.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdecore/kconfig_compiler/Makefile.am b/kdecore/kconfig_compiler/Makefile.am index e80f24d0e..d7b1400a4 100644 --- a/kdecore/kconfig_compiler/Makefile.am +++ b/kdecore/kconfig_compiler/Makefile.am @@ -1,10 +1,10 @@ SUBDIRS = example tests -AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes) +AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes) bin_PROGRAMS = kconfig_compiler -kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kconfig_compiler_LDADD = $(LIB_KDECORE) kconfig_compiler_SOURCES = kconfig_compiler.cpp @@ -13,6 +13,6 @@ TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg check-local: for i in $(TESTFILES); \ do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \ - perl $(top_srcdir)/kdecore/kconfig_compiler/checkkcfg.pl \ - $(top_srcdir)/kdecore/kconfig_compiler/tests/$$i; done + perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \ + $(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done diff --git a/kdecore/kconfig_compiler/example/Makefile.am b/kdecore/kconfig_compiler/example/Makefile.am index 4359c429e..9c0454ad8 100644 --- a/kdecore/kconfig_compiler/example/Makefile.am +++ b/kdecore/kconfig_compiler/example/Makefile.am @@ -1,13 +1,13 @@ -AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes) +AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes) check_PROGRAMS = example # autoexample EXTRA_PROGRAMS = autoexample -example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor example_LDADD = $(LIB_KDECORE) example_SOURCES = example.cpp exampleprefs_base.cpp -autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI) autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \ autoexample.cpp diff --git a/kdecore/kconfig_compiler/tests/Makefile.am b/kdecore/kconfig_compiler/tests/Makefile.am index 01a510f31..0b47449fa 100644 --- a/kdecore/kconfig_compiler/tests/Makefile.am +++ b/kdecore/kconfig_compiler/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\" +AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\" check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer @@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \ test_dpointer.cpp test_dpointer.h \ md5sums -test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test1_LDADD = $(LIB_KDECORE) test1_SOURCES = test1main.cpp test1.cpp -test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test2_LDADD = $(LIB_KDECORE) test2_SOURCES = test2main.cpp test2.cpp -test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test3_LDADD = $(LIB_KDECORE) test3_SOURCES = test3main.cpp test3.cpp -test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test4_LDADD = $(LIB_KDECORE) test4_SOURCES = test4main.cpp test4.cpp -test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test5_LDADD = $(LIB_KDECORE) test5_SOURCES = test5main.cpp test5.cpp -test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test6_LDADD = $(LIB_KDECORE) test6_SOURCES = test6main.cpp test6.cpp -test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test7_LDADD = $(LIB_KDECORE) test7_SOURCES = test7main.cpp test7.cpp -test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test8_LDADD = $(LIB_KDECORE) test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp -test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test9_LDADD = $(LIB_KDECORE) test9_SOURCES = test9main.cpp test9.cpp -test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_dpointer_LDADD = $(LIB_KDECORE) test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp diff --git a/kdecore/kcrash.cpp b/kdecore/kcrash.cpp index dd758f034..dbbd41338 100644 --- a/kdecore/kcrash.cpp +++ b/kdecore/kcrash.cpp @@ -177,7 +177,7 @@ KCrash::defaultCrashHandler (int sig) argv[i++] = "--appname"; argv[i++] = appName; if (KApplication::loadedByKdeinit) - argv[i++] = "--kdeinit"; + argv[i++] = "--tdeinit"; // only add apppath if it's not NULL if (appPath) { @@ -314,10 +314,10 @@ void KCrash::startDrKonqi( const char* argv[], int argc ) } } -// If we can't reach kdeinit we can still at least try to fork() +// If we can't reach tdeinit we can still at least try to fork() void KCrash::startDirectly( const char* argv[], int ) { - fprintf( stderr, "KCrash cannot reach kdeinit, launching directly.\n" ); + fprintf( stderr, "KCrash cannot reach tdeinit, launching directly.\n" ); pid_t pid = fork(); if (pid <= 0) { @@ -483,13 +483,13 @@ static int openSocket() return -1; } - if (strlen(sock_file)+strlen(display)+strlen("/kdeinit_")+2 > MAX_SOCK_FILE) + if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE) { fprintf(stderr, "Warning: Socket name will be too long.\n"); free(display); return -1; } - strcat(sock_file, "/kdeinit_"); + strcat(sock_file, "/tdeinit_"); strcat(sock_file, display); free(display); diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas index e4c526be1..efa46034c 100644 --- a/kdecore/kdebug.areas +++ b/kdecore/kdebug.areas @@ -5,48 +5,48 @@ # #Format : number<tab>description -125 kdecore (KAccel) -126 kdecore (KURL) +125 tdecore (KAccel) +126 tdecore (KURL) 127 kio (KProtocolInfo) -128 kdecore (KRegExp) -129 kdecore (KAction) +128 tdecore (KRegExp) +129 tdecore (KAction) 130 kio (KPasswdServer) -131 kdecore (KAcceleratorManager) -150 kdecore (KLibLoader) -160 kdecore (KNotifyClient) -170 kdecore (KNetwork socket) -171 kdecore (KSocks) -172 kdecore (KStartupInfo) -173 kdecore (KLocale) -174 kdecore (KProcIO) -175 kdecore (KProcess) -176 kdecore (KWin) -177 kdecore (KConfigSkeleton) -178 kdecore (KConfigDialogManager) -179 kdecore (KNetwork resolver) -180 kdecore (kdelibs) -200 kdeui (KMainWindow) -220 kdeui (KToolBar) -230 kdeui (KCommand) -240 kdeui (kdelibs) +131 tdecore (KAcceleratorManager) +150 tdecore (KLibLoader) +160 tdecore (KNotifyClient) +170 tdecore (KNetwork socket) +171 tdecore (KSocks) +172 tdecore (KStartupInfo) +173 tdecore (KLocale) +174 tdecore (KProcIO) +175 tdecore (KProcess) +176 tdecore (KWin) +177 tdecore (KConfigSkeleton) +178 tdecore (KConfigDialogManager) +179 tdecore (KNetwork resolver) +180 tdecore (kdelibs) +200 tdeui (KMainWindow) +220 tdeui (KToolBar) +230 tdeui (KCommand) +240 tdeui (kdelibs) 250 kfile (kdelibs) -264 kdecore (KIconLoader) -265 kdecore (KIconEffect) -270 kdeui (KRootPixmap) -280 kdeui (KSharedPixmap) -281 kdeui (KCModule) -282 kdeui (KDockWidget) -290 kdeui (KPixmapIO) -291 kdeui (KAboutDialog) -292 kdeui (KComboBox) -293 kdeui (KLineEdit) -294 kdeui (KEdit) -295 kdeui (KMenuBar) -296 kdeui (KPopupMenu) -298 kdeui (KDatePicker) +264 tdecore (KIconLoader) +265 tdecore (KIconEffect) +270 tdeui (KRootPixmap) +280 tdeui (KSharedPixmap) +281 tdeui (KCModule) +282 tdeui (KDockWidget) +290 tdeui (KPixmapIO) +291 tdeui (KAboutDialog) +292 tdeui (KComboBox) +293 tdeui (KLineEdit) +294 tdeui (KEdit) +295 tdeui (KMenuBar) +296 tdeui (KPopupMenu) +298 tdeui (KDatePicker) 399 kimgio 400 artskde -500 kdeprint +500 tdeprint 700 kutils (KSettings::Dialog) 701 kutils (KSettings::Dispatcher) 702 kutils (KPluginSelector) @@ -61,7 +61,7 @@ 780 kcmshell (kdelibs) 790 kimproxy (kdelibs) 800 kabapi (kdelibs) -900 kdesu (kdelibs) +900 tdesu (kdelibs) 912 ksmartcard (kdelibs) @@ -74,8 +74,8 @@ 1202 konqueror 1203 libkonq 1204 kdesktop -1205 kdesud -1206 kdesu +1205 tdesud +1206 tdesu 1207 kdesktop (Minicli) 1208 kcontrol 1210 kicker @@ -151,7 +151,7 @@ 5150 libkleopatra -# kdepim +# tdepim 5200 kitchensync 5201 kitchensync (Konnector) 5202 kitchensync (OpieKonnector) diff --git a/kdecore/kdebug.cpp b/kdecore/kdebug.cpp index 8b7b4d88d..ed1a3d60d 100644 --- a/kdecore/kdebug.cpp +++ b/kdecore/kdebug.cpp @@ -289,7 +289,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char } case 1: // Message Box { - // Since we are in kdecore here, we cannot use KMsgBox and use + // Since we are in tdecore here, we cannot use KMsgBox and use // TQMessageBox instead if ( !kDebug_data->aAreaName.isEmpty() ) aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) ); diff --git a/kdecore/kdelibs_export.h b/kdecore/kdelibs_export.h index 5624fcddb..220657d0b 100644 --- a/kdecore/kdelibs_export.h +++ b/kdecore/kdelibs_export.h @@ -67,7 +67,7 @@ #endif /*_KDELIBS_EXPORT_H*/ -/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros +/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros between 'class' keyword and <classname>: */ #ifdef KDE_DEPRECATED # ifndef KDECORE_EXPORT_DEPRECATED diff --git a/kdecore/kglobal.h b/kdecore/kglobal.h index c00279e1b..08e12767e 100644 --- a/kdecore/kglobal.h +++ b/kdecore/kglobal.h @@ -227,7 +227,7 @@ int KDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 ); * support, site-independent access to the filesystem and a large number * of other (but no less important) things. * - * All KDE applications should link to the kdecore library. Also, using a + * All KDE applications should link to the tdecore library. Also, using a * KApplication derived class instead of TQApplication is almost * mandatory if you expect your application to behave nicely within the * KDE environment. diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp index dddfba556..9c76c7e4d 100644 --- a/kdecore/kiconeffect.cpp +++ b/kdecore/kiconeffect.cpp @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * $Id$ * - * This file is part of the KDE project, module kdecore. + * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * with minor additions and based on ideas from * Torsten Rahn <torsten@kde.org> @@ -279,7 +279,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value, return result; } -// Taken from KImageEffect. We don't want to link kdecore to kdeui! As long +// Taken from KImageEffect. We don't want to link tdecore to tdeui! As long // as this code is not too big, it doesn't seem much of a problem to me. void KIconEffect::toGray(TQImage &img, float value) diff --git a/kdecore/kiconeffect.h b/kdecore/kiconeffect.h index b5f84cc20..a8e7b685e 100644 --- a/kdecore/kiconeffect.h +++ b/kdecore/kiconeffect.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdecore. + * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * with minor additions and based on ideas from * Torsten Rahn <torsten@kde.org> diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp index 62950e5d8..317a56add 100644 --- a/kdecore/kiconloader.cpp +++ b/kdecore/kiconloader.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdecore. + * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Antonio Larrosa <larrosa@kde.org> * diff --git a/kdecore/kiconloader.h b/kdecore/kiconloader.h index f8ac3fbc7..b7f1478f6 100644 --- a/kdecore/kiconloader.h +++ b/kdecore/kiconloader.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdecore. + * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Antonio Larrosa <larrosa@kde.org> * diff --git a/kdecore/kiconloader_p.h b/kdecore/kiconloader_p.h index e6ae13659..4a7695390 100644 --- a/kdecore/kiconloader_p.h +++ b/kdecore/kiconloader_p.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdecore. + * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Antonio Larrosa <larrosa@kde.org> * diff --git a/kdecore/kicontheme.cpp b/kdecore/kicontheme.cpp index ea91ab418..0f7d3b605 100644 --- a/kdecore/kicontheme.cpp +++ b/kdecore/kicontheme.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdecore. + * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Antonio Larrosa <larrosa@kde.org> * diff --git a/kdecore/kicontheme.h b/kdecore/kicontheme.h index 3a1f14fa4..d8e29d339 100644 --- a/kdecore/kicontheme.h +++ b/kdecore/kicontheme.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdecore. + * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Antonio Larrosa <larrosa@kde.org> * diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp index 1a90881df..290e23154 100644 --- a/kdecore/klibloader.cpp +++ b/kdecore/klibloader.cpp @@ -362,7 +362,7 @@ TQString KLibLoader::findLibrary( const char * name, const KInstance * instance { libfile = instance->dirs()->findResource( "lib", libname ); #ifndef NDEBUG - if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules + if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for tdeinit modules kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl; #endif } diff --git a/kdecore/kstartupinfo.cpp b/kdecore/kstartupinfo.cpp index 98195e8e5..12825e805 100644 --- a/kdecore/kstartupinfo.cpp +++ b/kdecore/kstartupinfo.cpp @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. ****************************************************************************/ -// kdDebug() can't be turned off in kdeinit +// kdDebug() can't be turned off in tdeinit #if 0 #define KSTARTUPINFO_ALL_DEBUG #warning Extra KStartupInfo debug messages enabled. @@ -66,7 +66,7 @@ DEALINGS IN THE SOFTWARE. static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO"; static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID"; // DESKTOP_STARTUP_ID is used also in kinit/wrapper.c , -// kdesu in both kdelibs and kdebase and who knows where else +// tdesu in both kdelibs and kdebase and who knows where else static const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID"; static bool auto_app_started_sending = true; diff --git a/kdecore/kstartupinfo.h b/kdecore/kstartupinfo.h index da3018d8c..807e484c5 100644 --- a/kdecore/kstartupinfo.h +++ b/kdecore/kstartupinfo.h @@ -49,7 +49,7 @@ class KStartupInfoPrivate; * * This class can be used to send information about started application, * change the information and receive this information. For detailed - * description, see kdelibs/kdecore/README.kstartupinfo. + * description, see kdelibs/tdecore/README.kstartupinfo. * * You usually don't need to use this class for sending the notification * information, as KDE libraries should do this when an application is diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp index 2df7ae772..3a655d617 100644 --- a/kdecore/ksycoca.cpp +++ b/kdecore/ksycoca.cpp @@ -98,7 +98,7 @@ KSycoca::KSycoca() } // We register with DCOP _before_ we try to open the database. // This way we can be relative sure that the KDE framework is - // up and running (kdeinit, dcopserver, klaucnher, kded) and + // up and running (tdeinit, dcopserver, klaucnher, kded) and // that the database is up to date. openDatabase(); _self = this; @@ -332,7 +332,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id) if (!triedLaunchingKdeinit) // try only once { triedLaunchingKdeinit = true; - kdDebug(7011) << "findFactory: we have no database.... launching kdeinit" << endl; + kdDebug(7011) << "findFactory: we have no database.... launching tdeinit" << endl; KApplication::startKdeinit(); // Ok, the new database should be here now, open it. } diff --git a/kdecore/kuniqueapplication.cpp b/kdecore/kuniqueapplication.cpp index 7cd0575cc..193aafcd3 100644 --- a/kdecore/kuniqueapplication.cpp +++ b/kdecore/kuniqueapplication.cpp @@ -164,7 +164,7 @@ KUniqueApplication::start() ::exit(255); } - // Try to launch kdeinit. + // Try to launch tdeinit. startKdeinit(); regName = dc->registerAs(appName, false); if (regName.isEmpty()) diff --git a/kdecore/libkdecore.nmcheck b/kdecore/libkdecore.nmcheck index b8057d350..7c017a6e4 100644 --- a/kdecore/libkdecore.nmcheck +++ b/kdecore/libkdecore.nmcheck @@ -1,6 +1,6 @@ # KDE namespace check file -# kdecore classes +# tdecore classes K*::* # these should preferably go in some namespace in KDE4 @@ -48,7 +48,7 @@ kasciistricmp # from libtldl lt_dl* -# from kdefakes +# from tdefakes setenv unsetenv usleep diff --git a/kdecore/network/CMakeLists.txt b/kdecore/network/CMakeLists.txt index e00fdd0c8..101da4843 100644 --- a/kdecore/network/CMakeLists.txt +++ b/kdecore/network/CMakeLists.txt @@ -13,8 +13,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_BINARY_DIR}/tdecore ) @@ -35,9 +35,9 @@ install( FILES install( FILES ipv6blacklist DESTINATION ${CONFIG_INSTALL_DIR} ) -##### kdecorenetwork ############################ +##### tdecorenetwork ############################ -set( target kdecorenetwork ) +set( target tdecorenetwork ) set( ${target}_SRCS kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp diff --git a/kdecore/svgicons/CMakeLists.txt b/kdecore/svgicons/CMakeLists.txt index 714925667..4f2345510 100644 --- a/kdecore/svgicons/CMakeLists.txt +++ b/kdecore/svgicons/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${LIBART_INCLUDE_DIRS} ) diff --git a/kdecore/tests/Makefile.am b/kdecore/tests/Makefile.am index 71e6faa92..e35ae68a4 100644 --- a/kdecore/tests/Makefile.am +++ b/kdecore/tests/Makefile.am @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES = -I$(top_srcdir)/kdecore $(all_includes) +INCLUDES = -I$(top_srcdir)/tdecore $(all_includes) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH) diff --git a/kdecore/tests/testqtargs.cpp b/kdecore/tests/testqtargs.cpp index 3853bc035..d1c8ff244 100644 --- a/kdecore/tests/testqtargs.cpp +++ b/kdecore/tests/testqtargs.cpp @@ -5,7 +5,7 @@ g++ -g -Wall -o testqtargs testqtargs.cpp -I/usr/X11R6/include \ -I/opt/qt3/include -I/opt/trinity/include -L/usr/X11R6/lib -L/opt/qt3/lib \ - -L/opt/trinity/lib -lqt -lkdecore + -L/opt/trinity/lib -lqt -ltdecore if invoked like this ./testqtargs --bg blue --caption something --hello hi @@ -28,7 +28,7 @@ --bg is aliased to --background but If you try it with --background or -background, you get the same thing. - in kdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used + in tdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used by the static method Kapplication::addCmdLineOptions to add the Qt options but its' entries look like this: diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index aa466d999..0b9a3d72a 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -14,10 +14,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) @@ -47,9 +47,9 @@ set( ${target}_SRCS kded.cpp kdedmodule.cpp ) -# we must to export kdeinit_kded-shared because various +# we must to export tdeinit_kded-shared because various # modules need this library -tde_add_kdeinit_executable( ${target} AUTOMOC EXPORT +tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT SOURCES ${${target}_SRCS} LINK kio-shared ) @@ -66,7 +66,7 @@ set( ${target}_SRCS kctimefactory.cpp vfolder_menu.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared ) @@ -82,7 +82,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox index 47f010f9d..50c0493d8 100644 --- a/kded/Mainpage.dox +++ b/kded/Mainpage.dox @@ -4,7 +4,7 @@ TrinityD runs in the background and performs a number of small tasks. Some of these tasks are built in, others are started on demand. <p> The chances are you are looking here because you want to write a -TrinityD module. For that, see TrinityDModule in kdecore and the +TrinityD module. For that, see TrinityDModule in tdecore and the <a href="http://websvn.kde.org/trunk/Trinity/kdelibs/kded/README.kded?view=markup">TrinityD README</a>. @@ -21,6 +21,6 @@ Waldo Bastian \<bastian@kde.org\> */ -// DOXYGEN_REFERENCES = kdecore kdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui kio // DOXYGEN_SET_PROJECT_NAME = TrinityD // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kded/Makefile.am b/kded/Makefile.am index 554a0e536..c91804b4b 100644 --- a/kded/Makefile.am +++ b/kded/Makefile.am @@ -20,7 +20,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kded.la kbuildsycoca.la +tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la kded_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) @@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist -kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdontchangethehostname_LDADD = $(LIB_KDECORE) kdontchangethehostname_SOURCES = khostname.cpp -kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmimelist_LDADD = ../kio/libkio.la kmimelist_SOURCES = kmimelist.cpp -kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_menu_LDADD = $(LIB_KIO) kde_menu_SOURCES = kde-menu.cpp diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp index 873ce154d..33faf6c7c 100644 --- a/kded/kde-menu.cpp +++ b/kded/kde-menu.cpp @@ -148,7 +148,7 @@ int main(int argc, char **argv) args.append("--checkstamps"); TQString command = "kbuildsycoca"; TQCString _launcher = KApplication::launcher(); - if (!DCOPRef(_launcher, _launcher).call("kdeinit_exec_wait", command, args).isValid()) + if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { qWarning("Can't talk to klauncher!"); command = KGlobal::dirs()->findExe(command); diff --git a/kded/kded.cpp b/kded/kded.cpp index 1d234ac06..2a634ff5c 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -75,17 +75,17 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0) dataStream << TQString("kbuildsycoca") << args; TQCString _launcher = KApplication::launcher(); - kapp->dcopClient()->callAsync(_launcher, _launcher, "kdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot); + kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot); } else { - KApplication::kdeinitExecWait( "kbuildsycoca", args ); + KApplication::tdeinitExecWait( "kbuildsycoca", args ); } } static void runKonfUpdate() { - KApplication::kdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); + KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); } static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName) @@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new TQStringList args; args.append(TQFile::decodeName(oldName)); args.append(TQFile::decodeName(newName)); - KApplication::kdeinitExecWait( "kdontchangethehostname", args ); + KApplication::tdeinitExecWait( "kdontchangethehostname", args ); } Kded::Kded(bool checkUpdates, bool new_startup) diff --git a/kdefx/CMakeLists.txt b/kdefx/CMakeLists.txt index 1c33bb8f6..1aa52627f 100644 --- a/kdefx/CMakeLists.txt +++ b/kdefx/CMakeLists.txt @@ -14,8 +14,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -33,7 +33,7 @@ install( FILES ##### libtdefx ################################## -set( target kdefx ) +set( target tdefx ) set( ${target}_SRCS kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp diff --git a/kdefx/Makefile.am b/kdefx/Makefile.am index 5c88a6e7e..2b588ba54 100644 --- a/kdefx/Makefile.am +++ b/kdefx/Makefile.am @@ -26,8 +26,8 @@ lib_LTLIBRARIES = libtdefx.la libtdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2 libtdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11) libtdefx_la_NMCHECK = $(srcdir)/libtdefx.nmcheck -libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \ - $(top_srcdir)/kdecore/standard_weak.nmcheck +libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck \ + $(top_srcdir)/tdecore/standard_weak.nmcheck include_HEADERS = kpixmap.h kpixmapsplitter.h \ kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h @@ -40,6 +40,6 @@ METASOURCES = AUTO EXTRA_DIST = Mainpage.dox -DOXYGEN_REFERENCES = kdecore +DOXYGEN_REFERENCES = tdecore include ../admin/Doxyfile.am diff --git a/kdefx/libkdefx.nmcheck b/kdefx/libkdefx.nmcheck index a0bf7e60c..bebebf28c 100644 --- a/kdefx/libkdefx.nmcheck +++ b/kdefx/libkdefx.nmcheck @@ -1,6 +1,6 @@ # KDE namespace check file -# kdefx classes +# tdefx classes K*::* # these should preferably go in some namespace in KDE4 diff --git a/kdeprint/CMakeLists.txt b/kdeprint/CMakeLists.txt index fa77fd3b4..bdbacc0bb 100644 --- a/kdeprint/CMakeLists.txt +++ b/kdeprint/CMakeLists.txt @@ -26,12 +26,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile @@ -53,16 +53,16 @@ install( FILES kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h driver.h kmjobmanager.h kmjob.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint ) ##### other data ################################ install( FILES kprintpreviewui.rc DESTINATION ${CONFIG_INSTALL_DIR}/ui ) -install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) -install( FILES kdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES kdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} ) -install( FILES kdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) +install( FILES tdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( FILES tdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES tdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) ##### driverparse ############################### @@ -74,25 +74,25 @@ tde_add_library( ${target} STATIC_PIC ) -##### kded_kdeprintd ############################ +##### kded_tdeprintd ############################ -set( target kded_kdeprintd ) +set( target kded_tdeprintd ) set( ${target}_SRCS - kdeprintd.cpp kprintprocess.cpp kdeprintd.skel + tdeprintd.cpp kprintprocess.cpp tdeprintd.skel ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared kdeinit_kded-shared + LINK kio-shared tdeinit_kded-shared DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${PLUGIN_INSTALL_DIR} ) -#### kdeprint ################################### +#### tdeprint ################################### -set( target kdeprint ) +set( target tdeprint ) set( ${target}_SRCS kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp @@ -103,7 +103,7 @@ set( ${target}_SRCS kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp kmspecialmanager.cpp - kdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp + tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp diff --git a/kdeprint/ChangeLog b/kdeprint/ChangeLog index 182044501..5ce11bd36 100644 --- a/kdeprint/ChangeLog +++ b/kdeprint/ChangeLog @@ -1,10 +1,10 @@ -Since 2.2 release, Michael Goffioul <kdeprint@swing.be> +Since 2.2 release, Michael Goffioul <tdeprint@swing.be> * automatic filtering: if the input file format is not directly supported - by the print spooler, kdeprint will try to convert the file to the + by the print spooler, tdeprint will try to convert the file to the primary supported input format (usually PostScript). To achieve this, - kdeprint uses the available filters (defined in XML files) and tries to + tdeprint uses the available filters (defined in XML files) and tries to build up a filter chain. - * mime type checking: when building a filter chain, kdeprint checks that + * mime type checking: when building a filter chain, tdeprint checks that each output format is supported as an input by the next filter * possibility to specify input file from the print dialog in StandAlone mode (like XPP) @@ -20,7 +20,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * print dialog: possibility to select the files to print in standalone mode (like XPP). -27/08/2001 Michael Goffioul <kdeprint@swing.be> +27/08/2001 Michael Goffioul <tdeprint@swing.be> * implementation of "Schedule" tab in print dialog for the CUPS plugin (job-hold-until attribute). * Printer aliases are now handled gracefully in the LPR plugin (they @@ -29,30 +29,30 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> setOption("kde-isspecial", "1"); setOption("kde-special-command", cmd); -28/08/2001 Michael Goffioul <kdeprint@swing.be> +28/08/2001 Michael Goffioul <tdeprint@swing.be> * implementation of KPrintAction, which provides a quick access to a class of printers (special, regular or both). An application just needs to create a KPrintAction anc connect to print(KPrinter*). -31/08/2001 Michael Goffioul <kdeprint@swing.be> +31/08/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: fix crash for Qt3 port, must check if attr->name is NULL before comparing it with strcmp or strncmp. -12/09/2001 Michael Goffioul <kdeprint@swing.be> +12/09/2001 Michael Goffioul <tdeprint@swing.be> * Management library: set all toolbars non movable to avoid move handles -13/09/2001 Michael Goffioul <kdeprint@swing.be> +13/09/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: fix multiple showing of password dialog for password- protected printers (timer is now blocked when the password dialog is shown) -14/09/2001 Michael Goffioul <kdeprint@swing.be> +14/09/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: configuration wizard rewritten using the structure of ESP PrintPro: more consistent, less pages and widgets. Not used as default config wizard yet. * QList -> QPtrList -25/09/2001 Michael Goffioul <kdeprint@swing.be> +25/09/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: made the new configuration wizard as default one. * other QList -> QPtrList fixes (committed to CVS) * Avoid to call plugin functions "completePrinter<xxx>" for pseudo @@ -64,21 +64,21 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * Wizard: fix buffer overflow when adding a remote LPD queue having a lot of jobs waiting -03/10/2001 Michael Goffioul <kdeprint@swing.be> +03/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: make use of GET/PUT request to handle configuration file. Possibility to admin a remote CUPS server (if allowed) * CUPS plugin: added "/jobs" in the available resources list -09/10/2001 Michael Goffioul <kdeprint@swing.be> +09/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: added 2 missing pages in stand-alone mode, "Image" and "Text". -10/10/2001 Michael Goffioul <kdeprint@swing.be> +10/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: "HP-GL/2" page added * General: added a GUI to configure the preview program, into the config dialog of the print manager -12/10/2001 Michael Goffioul <kdeprint@swing.be> +12/10/2001 Michael Goffioul <tdeprint@swing.be> * general: added the possibility for a plugin to add new actions to the toolbar and context menu (main use = export driver in CUPS). @@ -86,16 +86,16 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> through samba. Threaded operation with progress bar to notify the user. Graphical equivalent to cupsaddsmb from cups-1.1.11. -16/10/2001 Michael Goffioul <kdeprint@swing.be> +16/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: removed the "file" backend as it doesn't seem to be available since a couple of releases, and added a "Other" page to the wizard for any third-party backend (like pdf). -18/10/2001 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: don't hardcode program path, use the $PATH variable +18/10/2001 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: don't hardcode program path, use the $PATH variable first to find the program. Default to /usr/bin if not found. -02/11/2001 Michael Goffioul <kdeprint@swing.be> +02/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: . fix for remote printers when there's also a local printer with the same name: the printer-uri-supported @@ -104,22 +104,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> as well as detected IPP printers on the network (in the wizard) -05/11/2001 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: added possibility to view files being faxed and +05/11/2001 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: added possibility to view files being faxed and file action (remove and view) are enabled only when needed. * KPrinter: when printing to a file, support encoding and spaces in file names + system --> KProcess. -07/11/2001 Michael Goffioul <kdeprint@swing.be> - * kdeprint: fixed some problems: - . collate entirely handled by kdeprint, even in the case +07/11/2001 Michael Goffioul <tdeprint@swing.be> + * tdeprint: fixed some problems: + . collate entirely handled by tdeprint, even in the case of page selection on application-side. . set KPrinter object in KPrintDialog before adding other dialog pages (some pages may need it) * wizard: changed button layout and added a side graphic. Not committed as the graphic comes from HP driver (copyright). -08/11/2001 Michael Goffioul <kdeprint@swing.be> +08/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: . complete IPP report for job added . implementation of dynamically added plugin menus for @@ -127,24 +127,24 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . printer infos are now retrieved from the correct host for remote printers and classes (idem for IPP report) * general: implementation of a DCOP signal communication to - synchronize all kdeprint apps, a plugin change in one app is + synchronize all tdeprint apps, a plugin change in one app is notified to all other opened apps (via DCOP). * kicker extension: made extension aware of plugin change in other apps (using new DCOP signal comm). -09/11/2001 Michael Goffioul <kdeprint@swing.be> +09/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: added the possibility to list jobs on remote printers. No management is allowed on remote jobs (yet?). -10/11/2001 Michael Goffioul <kdeprint@swing.be> +10/11/2001 Michael Goffioul <tdeprint@swing.be> * general: use KShellProcess::quote() for any quoting. Normally, all quoting problem should be fixed now. -12/11/2001 Michael Goffioul <kdeprint@swing.be> +12/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS: redesigned the "cups-add-smb" dialog to make it more user-driendly. -13/11/2001 Michael GOffioul <kdeprint@swing.be> +13/11/2001 Michael GOffioul <tdeprint@swing.be> * general: implementation of a KActiveLabel class to embed active links in labels. Clicking on it "exec" the associated URL. * general: make use of KActiveLabel in the first page of the @@ -154,7 +154,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> correctly when scanning the network (however it should be avoided as smbspool seems to be unable to handle it). -14/11/2001 Michael Goffioul <kdeprint@swing.be> +14/11/2001 Michael Goffioul <tdeprint@swing.be> * ioslave: uploaded new templates from Chris (which adds support for pseudo printers * manager: modified RootOnly message for better consistency between @@ -168,13 +168,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . added hiding mechanism to make the dialog more compact (show/hide button can probably be improved) -15/11/2001 Michael Goffioul <kdeprint@swing.be> +15/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS: drivers are now downloaded from the actual server for remote printers. This allows to have access to all options set for any printer (even remote ones). However remote printer's drivers are kept read-only. -16/11/2001 Michael Goffioul <kdeprint@swing.be> +16/11/2001 Michael Goffioul <tdeprint@swing.be> * print dialog: instances are now presented in a tree structure in the combo box -> cleaner view. * general: ported the use of a global instance file to 2.2 branch @@ -185,7 +185,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> numerical option and update the corresponding enum one with the closest value. -21/11/2001 Michael Goffioul <kdeprint@swing.be> +21/11/2001 Michael Goffioul <tdeprint@swing.be> * job viewer: clicking on 'x' button only hide the job viewer but doesn't quit the app. To quit, either use menu item (from window or system tray) or accel when job viewer is visible. @@ -193,13 +193,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> it is always centered on its parent now. It also have the dialog buttons in title bar (no minimize). -23/11/2001 Michael Goffioul <kdeprint@swing.be> +23/11/2001 Michael Goffioul <tdeprint@swing.be> * job management: the job management has been re-engineered to follow the paradigm "1 window == 1 queue". There's still the possibility to view jobs for all printers within a single window. This should enhance the usability of job management tools (I hope). -26/11/2001 Michael Goffioul <kdeprint@swing.be> +26/11/2001 Michael Goffioul <tdeprint@swing.be> * job management: job type (active/completed) is now handled on a printer basis instead of a global property of the manager. This allows different windows to show different job type, and also ease the @@ -214,21 +214,21 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> This new mechanism should also be applied to print management dynamic actions (more consistent). -28/11/2001 Michael Goffioul <kdeprint@swing.be> +28/11/2001 Michael Goffioul <tdeprint@swing.be> * special printers: added the possibility to have configurable options in pseudo-printers. Options are described in an additional XML file (like filters) and configured through an "Advanced" tab in the property dialog. TODO: graphical configuration widget + apply KXmlCommand to normal filters. -29/11/2001 Michael Goffioul <kdeprint@swing.be> +29/11/2001 Michael Goffioul <tdeprint@swing.be> * general: fixed sorting of options in driver view. They should be shown in order of appearance now. * general: make use of the new KXmlCommand class for filters too. * filters: removed the "Page Size" from the options of enscript filter, this is taken from the KPrinter object now. -04/12/2001 Michael Goffioul <kdeprint@swing.be> +04/12/2001 Michael Goffioul <tdeprint@swing.be> * general: finalized the new XML command mechanism: . graphical command builder . pseudo-printers and filters are completely based on new XML @@ -236,14 +236,14 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> previous mechanism are not used). . KPrintFilter and KMFilterManager are now obsolete and replaced by KXmlCommand and KXmlCommandManager respectively. - * kdeprintfax: made the log window a "real" log window. It is dynamically + * tdeprintfax: made the log window a "real" log window. It is dynamically refreshed on new debug output arrival (suggested by user). -10/12/2001 Michael Goffioul <kdeprint@swing.be> +10/12/2001 Michael Goffioul <tdeprint@swing.be> * general: make use of "Detail" mechanism of KDialogBase in XML command editor. -11/12/2001 Michael Goffioul <kdeprint@swing.be> +11/12/2001 Michael Goffioul <tdeprint@swing.be> * instances: for root, instances are saved in global file /etc/cups/lpoptions. This allows to easily create global instances (just be root and create the instance). @@ -251,17 +251,17 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> file, such that root is able to manage global pseudo printers. Locale pseudo printers still override global ones if they have the same name. -12/12/2001 Michael Goffioul <kdeprint@swing.be> +12/12/2001 Michael Goffioul <tdeprint@swing.be> * general: added error messages when the printer list cannot be retrieved in print manager and print dialog. With CUPS, if the server is not running, an error message is shown to the user. * CUPS: disabled all backends if no server is running. -13/12/2001 Michael Goffioul <kdeprint@swing.be> +13/12/2001 Michael Goffioul <tdeprint@swing.be> * general: preleminary support for external printer tool. Only escputil at this moment. -03/01/2002 Michael Goffioul <kdeprint@swing.be> +03/01/2002 Michael Goffioul <tdeprint@swing.be> * general: . added a "ID name" label to the first dialog for command editing . put "View Printer Infos" in front of orientation and view type @@ -273,12 +273,12 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . added a WhatsThis help to the "Instances" tab briefly explaining what's an instance. -09/01/2002 Michael Goffioul <kdeprint@swing.be> +09/01/2002 Michael Goffioul <tdeprint@swing.be> * general: when filtering, the file type is checked against supported formats. If the format is not supported, a warning is issued and the user has the possibility to auto-convert the file to a supported format. Consequence: you can now safely perform page selection on any - file type with any printer and any spooler, kdeprint will try to convert + file type with any printer and any spooler, tdeprint will try to convert the file to PS. * preview dialog: rewrote the code in a cleaner way, avoiding the use of a non toplevel main window. Preview dialog looks simpler now. New @@ -293,10 +293,10 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> Netscape. If files are given on the command line, this option is forced unset. . added a "--nodialog" option for quick print. - . added the persistent feature (with some code rewrite in kdeprint + . added the persistent feature (with some code rewrite in tdeprint library) -10/01/2002 Michael Goffioul <kdeprint@swing.be> +10/01/2002 Michael Goffioul <tdeprint@swing.be> * general: added (temporary) workaround for drawing problems in fixed toolbars, until a real fix gets implemented: static_cast<QWidget*>(tb)->layout()->setMargin(1); @@ -304,18 +304,18 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: added KPrinter::autoConfigure(), to automatically configure a KPrinter object without the need for a print dialog. -14/01/2002 Michael Goffioul <kdeprint@swing.be> +14/01/2002 Michael Goffioul <tdeprint@swing.be> * slave: made case-insensitive for backward compatibility (old URLs may come from history). Now print:/Classes should work OK. * CUPS: moved the IPP report to an separate dialog and added the possibility to print the result. -15/01/2002 Michael Goffioul <kdeprint@swing.be> +15/01/2002 Michael Goffioul <tdeprint@swing.be> * started the implementation of a new LPR/LPRng plugin: this implementation is designed to be modular to provide support for various systems like Foomatic, APSFilter, GNUlpr or Printtool(RH). -17/01/2002 Michael Goffioul <kdeprint@swing.be> +17/01/2002 Michael Goffioul <tdeprint@swing.be> * LPR: first implementation of a job manager. Make use of asynchronous lpc and lpq processes. Major problem: delay between new state and screen update due to the fact that data are started to be updated when @@ -326,22 +326,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> the default basename for output file. * test: updated to Qt3 and demonstrate the use of the DocFileName feature -21/01/2002 Michael Goffioul <kdeprint@swing.be> +21/01/2002 Michael Goffioul <tdeprint@swing.be> * LPR: added basic implementation of a KPrinterImpl object -> plugin is functional (though far from complete...) -22/01/2002 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: make use of new address book (libkabc) instead of the old +22/01/2002 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: make use of new address book (libkabc) instead of the old one (libkab). -29/01/2002 Michael Goffioul <kdeprint@swing.be> +29/01/2002 Michael Goffioul <tdeprint@swing.be> * LPR: enhancement of the APSFilter handler. Still missing: setup the options in the print command line * wizard: removed the garbage '&' in last page * general: added SMB util functions -> to be used whenever it's possible (CUPS plugin, Foomatic handler => TO BE DONE) -30/01/2002 Michael Goffioul <kdeprint@swing.be> +30/01/2002 Michael Goffioul <tdeprint@swing.be> * general: use QGuardedPtr to keep KPrinterImpl object in KPrinter, this should avoid some crashes. * LPR: @@ -350,7 +350,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . fix problem with rmote lpd queues: force lp=<empty string> in printcap entry -07/02/2002 Michael Goffioul <kdeprint@swing.be> +07/02/2002 Michael Goffioul <tdeprint@swing.be> * job viewer: fix crash when switching the print plugin elsewhere and there's some jobs shown + fix refresh problem when switching plugin * general: fix small bug when removing a filter in "Filters" page @@ -358,12 +358,12 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> problem with non-docked vertical toolbars. Use plain QPushButton instead, but this has some drawing problems in HighColor style. -11/02/2002 Michael Goffioul <kdeprint@swing.be> +11/02/2002 Michael Goffioul <tdeprint@swing.be> * LPR: added support for LPRngTool+IFHP (not complete yet though) * general: various fixes for crashes, inconsistencies, ... -12/02/2002 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: added %email to possible command tags. The e-mail address +12/02/2002 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: added %email to possible command tags. The e-mail address is retrieved from standard settings in KControl module. The tag can also be used in the "Name" field of the options dialog * LPR: completion of the LPRngTool handler + implementation of dynamic @@ -375,7 +375,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * CUPS: configuration tool now handles gracefully unrecognized options, a warning is issued, and they are restored as-is on file saving. -13/02/2002 Michael Goffioul <kdeprint@swing.be> +13/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: added support for job-billing and page-label, and put them along with the scredule option into a single "Advanced" tab. * CUPS: added job billing info to the job viewer @@ -383,23 +383,23 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> dialog * general: allow multi selection in the file list of print dialog -14/02/2002 Michael Goffioul <kdeprint@swing.be> +14/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: added the possibility to edit job attributes on-the-fly using a dialog similar to the printer properties dialog. Still the be fixed: page ranges (problem with option encoding in CUPS). -15/02/2002 Michael Goffioul <kdeprint@swing.be> +15/02/2002 Michael Goffioul <tdeprint@swing.be> * general: fixed infinite recursion bug in KIconSelectAction * CUPS: temporarily disabled edition of page-ranges as it seems CUPS is buggy. I should find a workaround. * general (CUPS): enable some actions for jobs on remote hosts. It seems to work OK between my local LM-8.1 and a remote LM-7.2. -16/02/2002 Michael Goffioul <kdeprint@swing.be> +16/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: added direct Foomatic driver support (no need the all PPD package from foomatic anymore, driver are loaded directly from Foomatic) -17/02/2002 Michael GOffioul <kdeprint@swing.be> +17/02/2002 Michael GOffioul <tdeprint@swing.be> * preview: . better algorithm to find a preview object . more comprehensive error report @@ -407,11 +407,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: added the backend stuff for printer filtering, needs GUI -> allows to only show a selected set of printers -18/02/2002 Michael Goffioul <kdeprint@swing.be> +18/02/2002 Michael Goffioul <tdeprint@swing.be> * general: simple printer filtering mechanism based on printer name and location regexp. Graphical configuration for printer name. -19/02/2002 Michael Goffioul <kdeprint@swing.be> +19/02/2002 Michael Goffioul <tdeprint@swing.be> * general: . completion of the printer filtering mechanism (added location string filter) @@ -420,16 +420,16 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . possibility to open the main option dialog from print dialog (for example to change the filter or default preview program) . added icon on push buttons when useful - . changed plugin names to kdeprint_* (stripped the leading "lib") + . changed plugin names to tdeprint_* (stripped the leading "lib") -20/02/2002 Michael Goffioul <kdeprint@swing.be> +20/02/2002 Michael Goffioul <tdeprint@swing.be> * slave: prevent konqueror to consider a trailing slash as a directory specification (simply add a config entry in protocol file) * general: large UI standardization by making use of KDialogBase along with KGuiItem * kicker menu: possibility to open main Options Dialog from the menu -21/02/2002 Michael Goffioul <kdeprint@swing.be> +21/02/2002 Michael Goffioul <tdeprint@swing.be> * general: splitted the printer state into enable/disable and start/stop and modified the GUI to reflect this * general: removed the KMManager::configure(), obsoleted by the complete @@ -437,22 +437,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * kicker extension: extension of the menu plugin to allow access to the server configuration tool as well as the "kprinter" utility. -25/02/2002 Michael Goffioul <kdeprint@swing.be> +25/02/2002 Michael Goffioul <tdeprint@swing.be> * LPR: added printer testing support -26/02/2002 Michael Goffioul <kdeprint@swing.be> +26/02/2002 Michael Goffioul <tdeprint@swing.be> * general: printer filtering specs are now ORed instead of ANDed * general: changed "Advanced" to "Driver Settings" * CUPS: fixed RIPCache problem, added support for possible suffixes -27/02/2002 Michael Goffioul <kdeprint@swing.be> +27/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: workaround to allow special characters in login/password without breaking security. Possible now to use safely chars like '@' and '/' in login. * general: added a check box in the config dialog to enable/disable font embedding into PS data (compatible with Qt settings). -28/02/2002 Michael Goffioul <kdeprint@swing.be> +28/02/2002 Michael Goffioul <tdeprint@swing.be> * general: job viewer updated correctly on plugin reload -> additional columns and "history" action state * general: internal *Settings objects are synchonized on config changes @@ -460,11 +460,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: improved feedback to user when creating driver DB * CUPS: speed optimization when creating driver DB (simple hack to avoid to parse the entire PPD file each time => much better) - * kdeprintfax: added "-n" and "-f %email" by default for the Hylafax + * tdeprintfax: added "-n" and "-f %email" by default for the Hylafax system * general: various small UI improvements (suggested by Thomas) -02/03/2002 Michael Goffioul <kdeprint@swing.be> +02/03/2002 Michael Goffioul <tdeprint@swing.be> * general: modified the driver structure to support dynamic options as in SuSE * LPR: more management support for SuSE handler -> drver settings can @@ -472,7 +472,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: needed stuff to provide translations for filters (Coolo will now extract the strings from XML files for translators) -10/03/2002 Michael Goffioul <kdeprint@swing.be> +10/03/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: allow any integer value for RIPCache + don't upload the cupsd.conf with wrong settings @@ -480,7 +480,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * KDE-3 RELEASE * ***************** -(CeBIT) Michael Goffioul <kdeprint@swing.be> +(CeBIT) Michael Goffioul <tdeprint@swing.be> * Fix various crashes: . when changing the CUPS server (notify registered object before reloading) @@ -491,7 +491,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: started generealization of a margin widget to configure the margins of the KPrinter object -25/03/2002 Michael Goffioul <kdeprint@swing.be> +25/03/2002 Michael Goffioul <tdeprint@swing.be> * general: do not use pointers in various views, to avoid dangling pointers (and crashes) when changing something (plugin, config file, ...). This makes the aboutToReload functions quite useless, but it has to @@ -502,13 +502,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: added help button to the wizard and the print dialog. They are connected to the main help (should probably add an anchor to go directly to the associated part). - * kdeprintfax: more support/sync with standard addressbook: - . possibility to start the ab editor from kdeprintfax + * tdeprintfax: more support/sync with standard addressbook: + . possibility to start the ab editor from tdeprintfax . make use of the "Organization" field as enterprise . fix problem with empty phone number (ex: no business fax). -26/03/2002 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: +26/03/2002 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: . added support for Mgetty-sendfax . added support for page size in filters . make use of the localized page size as default @@ -518,19 +518,19 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . bugfix in logview: behaves safely when closed using the title bar button -27/03/2002 Michael Goffioul <kdeprint@swing.be> +27/03/2002 Michael Goffioul <tdeprint@swing.be> * general: created a separate "Fonts" section in the KDEPrint settings dialog and removed the "Embed Fonts" option from the general section (moved to the new section). - * kdeprintfax: fixed disabled background for "Comment" widget, use QBrush + * tdeprintfax: fixed disabled background for "Comment" widget, use QBrush instead of QColor. OK with styles like Liquid. -28/03/2002 Michael Goffioul <kdeprint@swing.be> +28/03/2002 Michael Goffioul <tdeprint@swing.be> * general: added a user feedback mechanism in the form of a dialog showgin status messages, including initialization, number of the page currently generated, filtering and sending to the printer. -29/03/2002 Michael Goffioul <kdeprint@swing.be> +29/03/2002 Michael Goffioul <tdeprint@swing.be> * general: enhanced the status feedback mechanism . possibility to have multiple status boxes (one for each app) . added an icon (eye-candy) and the document name being printed @@ -545,7 +545,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> current plugin below the plugin combobox (ex: in CUPS, shows the current server:port). -02/04/2002 Michael Goffioul <kdeprint@swing.be> +02/04/2002 Michael Goffioul <tdeprint@swing.be> * general: . fixed various conflicting shortcuts . made KMVirtualManager inherit from KPReloadObject to force instance @@ -555,14 +555,14 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> tab in the print dialog. It contain a 2-columns table where custom tags can be added. Read-only in job editing mode (hope to change that soon). -03/04/2002 Michael Goffioul <kdeprint@swing.be> +03/04/2002 Michael Goffioul <tdeprint@swing.be> * manager: show instances as children of the real printer in the tree view. No instance management is possible from the tree view itself. The user still has to use the "Instances" tab. * ioslave: added support for print jobs browsing, per printer or for all printers together (-> print:/jobs) -04/04/2002 Michael Goffioul <kdeprint@swing.be> +04/04/2002 Michael Goffioul <tdeprint@swing.be> * ioslave: added support to view the driver of a printer in HTML form (print:/printers/lp1?driver) * CUPS: allows editing of page-ranges for pending jobs, work around @@ -573,11 +573,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> work with gpr (from GNUlpr) . added support for "bool" directives in Foomatic drivers -23/05/2002 Michael Goffioul <kdeprint@swing.be> +23/05/2002 Michael Goffioul <tdeprint@swing.be> * job manager: added the possibility to control the username for jobs filtering, and the possibility to limit the number of jobs shown. -16/08/2002 Michael Goffioul <kdeprint@swing.be> +16/08/2002 Michael Goffioul <tdeprint@swing.be> * filters/command: added the possibility to have comments about a specific command, including clickable URL's. Modified the command selector to use those comments. @@ -589,31 +589,31 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> even on first dialog showing (call slotPrinterSelected after setting the output file name). -20/08/2002 Michael Goffioul <kdeprint@swing.be> +20/08/2002 Michael Goffioul <tdeprint@swing.be> * print dialog: . added a method to disable a page in the main dialog . make the filename persistent in the SaveFile dialog . use a rename dialog if the output file already exists -26/08/2002 Michael Goffioul <kdeprint@swing.be> +26/08/2002 Michael Goffioul <tdeprint@swing.be> * general: added a generic PS driver to (missing for too long) -02/09/2002 Michael Goffioul <kdeprint@swing.be> +02/09/2002 Michael Goffioul <tdeprint@swing.be> * print dialog: added graphical interface to the poster XML command (still to be committed) * manager: added a condensed toolbar with actions grouped by topics in sub-menus. -03/09/2002 Michael Goffioul <kdeprint@swing.be> +03/09/2002 Michael Goffioul <tdeprint@swing.be> * print dialog: enabled preview even in standalone mode, either the internal PS viewer or any other registered app will be used, according to the user preferences. -04/09/2002 Michael Goffioul <kdeprint@swing.be> +04/09/2002 Michael Goffioul <tdeprint@swing.be> * commands: make unavailability of a command more visual by showing a red text, and disabling the OK button of the current dialog (only if needed). -05/09/2002 Michael Goffioul <kdeprint@swing.be> +05/09/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: shows all possible URI detected by CUPS when selecting the "Others" printer type in the wizard, like the web interface is doing. diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am index 8b63447e1..fecf25c64 100644 --- a/kdeprint/Makefile.am +++ b/kdeprint/Makefile.am @@ -6,14 +6,14 @@ endif SUBDIRS = . management lpdunix $(CUPSSUBDIR) lpr rlpr ext filters pics tools tests -INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes) +INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes) -kde_module_LTLIBRARIES = kded_kdeprintd.la +kde_module_LTLIBRARIES = kded_tdeprintd.la -kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp -kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la -kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version -#kded_kdeprintd_la_METASOURCES = AUTO +kded_tdeprintd_la_SOURCES = tdeprintd.skel tdeprintd.cpp kprintprocess.cpp +kded_tdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la +kded_tdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version +#kded_tdeprintd_la_METASOURCES = AUTO lib_LTLIBRARIES = libtdeprint.la @@ -23,7 +23,7 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \ kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp \ kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp \ - kmspecialmanager.cpp kdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \ + kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \ kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kmfactory.skel kxmlcommand.cpp \ util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp \ kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \ @@ -38,8 +38,8 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \ kmuimanager.h kmvirtualmanager.h driveritem.h droptionview.h \ driverview.h kprintpreview.h kprinterimpl.h kprintdialog.h \ kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.h \ - kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h kdeprintd.h \ - kpfilterpage.h kmspecialmanager.h kdeprintcheck.h plugincombobox.h \ + kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h tdeprintd.h \ + kpfilterpage.h kmspecialmanager.h tdeprintcheck.h plugincombobox.h \ kfilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \ util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \ marginvaluewidget.h kpmarginpage.h messagewindow.h \ @@ -47,9 +47,9 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \ include_HEADERS = kprinter.h kprintaction.h -kdeprint_HEADERS = kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h \ +tdeprint_HEADERS = kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h \ driver.h kmjobmanager.h kmjob.h -kdeprintdir = $(includedir)/kdeprint +tdeprintdir = $(includedir)/tdeprint EXTRA_DIST = fooparser.y fooscanner.l kprintpreviewui.rc @@ -61,22 +61,22 @@ uidatadir = $(kde_confdir)/ui # Test page printdata_DATA = testprint.ps specials.desktop -printdatadir = $(kde_datadir)/kdeprint +printdatadir = $(kde_datadir)/tdeprint # Services servicesdir = $(kde_servicesdir)/kded -services_DATA = kdeprintd.desktop +services_DATA = tdeprintd.desktop # Config file configdir = $(kde_confdir) -config_DATA = kdeprintrc +config_DATA = tdeprintrc # parser and scanner fooparser: rm -f fooparser.cpp.h - bison -v -d -p kdeprint_foomatic2 $(srcdir)/fooparser.y -o $(srcdir)/fooparser.cpp + bison -v -d -p tdeprint_foomatic2 $(srcdir)/fooparser.y -o $(srcdir)/fooparser.cpp if test -f "$(srcdir)/fooparser.hpp"; then mv $(srcdir)/fooparser.hpp $(srcdir)/fooparser.cpp.h; fi - flex -o$(srcdir)/fooscanner.cpp -Pkdeprint_foomatic2 $(srcdir)/fooscanner.l + flex -o$(srcdir)/fooscanner.cpp -Ptdeprint_foomatic2 $(srcdir)/fooscanner.l echo "#ifndef fooparser_cpp_h" > $(srcdir)/fooparser.cpp.hh echo "#define fooparser_cpp_h" >> $(srcdir)/fooparser.cpp.hh cat $(srcdir)/fooparser.cpp.h >> $(srcdir)/fooparser.cpp.hh @@ -85,30 +85,30 @@ fooparser: ppdparser: rm -f ppdparser.cpp.h - bison -v -d -p kdeprint_ppd $(srcdir)/ppdparser.y -o $(srcdir)/ppdparser.cpp + bison -v -d -p tdeprint_ppd $(srcdir)/ppdparser.y -o $(srcdir)/ppdparser.cpp if test -f "$(srcdir)/ppdparser.hpp"; then mv $(srcdir)/ppdparser.hpp $(srcdir)/ppdparser.cpp.h; fi - flex -o$(srcdir)/ppdscanner.cpp -Pkdeprint_ppd $(srcdir)/ppdscanner.l + flex -o$(srcdir)/ppdscanner.cpp -Ptdeprint_ppd $(srcdir)/ppdscanner.l echo "#ifndef ppdparser_cpp_h" > $(srcdir)/ppdparser.cpp.hh echo "#define ppdparser_cpp_h" >> $(srcdir)/ppdparser.cpp.hh cat $(srcdir)/ppdparser.cpp.h >> $(srcdir)/ppdparser.cpp.hh echo "#endif" >> $(srcdir)/ppdparser.cpp.hh mv $(srcdir)/ppdparser.cpp.hh $(srcdir)/ppdparser.cpp.h -noinst_DATA = kdeprint +noinst_DATA = tdeprint -kdeprint: - $(LN_S) $(srcdir)/management kdeprint +tdeprint: + $(LN_S) $(srcdir)/management tdeprint # convenience static library noinst_LIBRARIES = libdriverparse.a libdriverparse_a_SOURCES = driverparse.c -update_DATA = kdeprintrc.upd +update_DATA = tdeprintrc.upd updatedir = $(kde_datadir)/kconf_update messages: rc.cpp $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp - $(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/kdeprint.pot + $(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/tdeprint.pot include ../admin/Doxyfile.am diff --git a/kdeprint/TODO b/kdeprint/TODO index 8531c0380..7c67dccdb 100644 --- a/kdeprint/TODO +++ b/kdeprint/TODO @@ -16,14 +16,14 @@ WISHES - Possibility to specify a different input slot for first page??? -- add "Subject" or "Regarding" to kdeprintfax interface: look first +- add "Subject" or "Regarding" to tdeprintfax interface: look first if this is possible in efax and/or hylafax - add the possibility to view a printjob file (if possible) - restarting server: use of "ps" in a subshell to get the pid, possibility of authentification (put this into separate program that would restart - itself using kdesu). + itself using tdesu). - CUPS: a "Printer/Server Debugging Helper" would be nice: you could vary the LogLevel there, restart the server, provide a viewer diff --git a/kdeprint/cups/CMakeLists.txt b/kdeprint/cups/CMakeLists.txt index c9f336558..2166cc08f 100644 --- a/kdeprint/cups/CMakeLists.txt +++ b/kdeprint/cups/CMakeLists.txt @@ -20,17 +20,17 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/network - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/network + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile - ${CMAKE_SOURCE_DIR}/kdeprint - ${CMAKE_SOURCE_DIR}/kdeprint/management + ${CMAKE_SOURCE_DIR}/tdeprint + ${CMAKE_SOURCE_DIR}/tdeprint/management ) link_directories( @@ -40,13 +40,13 @@ link_directories( ##### other data ################################ -install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) -install( FILES preview.png preview-mini.png DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) +install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) +install( FILES preview.png preview-mini.png DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) -#### kdeprint_cups ############################## +#### tdeprint_cups ############################## -set( target kdeprint_cups ) +set( target tdeprint_cups ) set( ${target}_SRCS cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp @@ -62,7 +62,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared ${CUPS_LIBRARIES} + LINK tdeprint_management-shared ${CUPS_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -77,7 +77,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static kdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES} + LINK driverparse-static tdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) @@ -92,6 +92,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdefakes-shared ${CUPS_LIBRARIES} + LINK tdefakes-shared ${CUPS_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/cups/Makefile.am b/kdeprint/cups/Makefile.am index ed45a175e..6f3d7edec 100644 --- a/kdeprint/cups/Makefile.am +++ b/kdeprint/cups/Makefile.am @@ -2,11 +2,11 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE SUBDIRS = cupsdconf2 -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management -I$(top_srcdir)/kdecore/network $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes) -kde_module_LTLIBRARIES = kdeprint_cups.la +kde_module_LTLIBRARIES = tdeprint_cups.la -kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcupsjobmanager.cpp \ +tdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcupsjobmanager.cpp \ kmcupsmanager.cpp kmcupsuimanager.cpp kmpropbanners.cpp kmwbanners.cpp kmwipp.cpp \ kmwippselect.cpp kcupsprinterimpl.cpp kmcupsconfigwidget.cpp \ kmconfigcups.cpp kmconfigcupsdir.cpp kmwippprinter.cpp kmwfax.cpp kmwquota.cpp \ @@ -14,9 +14,9 @@ kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups imagepreview.cpp imageposition.cpp kpimagepage.cpp \ kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \ kptagspage.cpp -kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) -kdeprint_cups_la_METASOURCES = AUTO +tdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) +tdeprint_cups_la_METASOURCES = AUTO noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \ kmpropbanners.h kmwbanners.h kmwipp.h kmwippselect.h kcupsprinterimpl.h \ @@ -27,18 +27,18 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmc bin_PROGRAMS = make_driver_db_cups cupsdoprint make_driver_db_cups_SOURCES = make_driver_db_cups.c -make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libtdefakes.la $(LIBDL) $(LIBZ) +make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/tdecore/libtdefakes.la $(LIBDL) $(LIBZ) make_driver_db_cups_LDFLAGS = $(all_libraries) cupsdoprint_SOURCES = cupsdoprint.c -cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libtdefakes.la +cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/tdecore/libtdefakes.la cupsdoprint_LDFLAGS = $(all_libraries) entry_DATA = cups.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins misc_DATA = preview.png preview-mini.png -miscdir = $(kde_datadir)/kdeprint +miscdir = $(kde_datadir)/tdeprint EXTRA_DIST = postscript.ppd.gz diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp index f12653cbb..ca40a10a7 100644 --- a/kdeprint/cups/cupsaddsmb2.cpp +++ b/kdeprint/cups/cupsaddsmb2.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsaddsmb2.h b/kdeprint/cups/cupsaddsmb2.h index 266a50c6c..84166f53c 100644 --- a/kdeprint/cups/cupsaddsmb2.h +++ b/kdeprint/cups/cupsaddsmb2.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/CMakeLists.txt b/kdeprint/cups/cupsdconf2/CMakeLists.txt index 914b18446..ceee1bc47 100644 --- a/kdeprint/cups/cupsdconf2/CMakeLists.txt +++ b/kdeprint/cups/cupsdconf2/CMakeLists.txt @@ -14,9 +14,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile @@ -31,7 +31,7 @@ link_directories( install( FILES kde_logo.png cups_logo.png cupsd.conf.template - DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) #### cupsdconf ################################## @@ -48,7 +48,7 @@ set( ${target}_SRCS cups-util.c qdirmultilineedit.cpp sizewidget.cpp main.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared ${CUPS_LIBRARIES} ) diff --git a/kdeprint/cups/cupsdconf2/Makefile.am b/kdeprint/cups/cupsdconf2/Makefile.am index 83426a5b6..434af6a3c 100644 --- a/kdeprint/cups/cupsdconf2/Makefile.am +++ b/kdeprint/cups/cupsdconf2/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includ bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = cupsdconf.la +tdeinit_LTLIBRARIES = cupsdconf.la # library creation cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \ @@ -26,7 +26,7 @@ noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplas # Data cupsdconfdata_DATA = kde_logo.png cups_logo.png cupsd.conf.template -cupsdconfdatadir = $(kde_datadir)/kdeprint +cupsdconfdatadir = $(kde_datadir)/tdeprint # Translations messages: diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index 7e4f1bdd9..fab6a6fba 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/addressdialog.h b/kdeprint/cups/cupsdconf2/addressdialog.h index 7d241a080..7fdb6fb6f 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.h +++ b/kdeprint/cups/cupsdconf2/addressdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/browsedialog.cpp b/kdeprint/cups/cupsdconf2/browsedialog.cpp index 4cfc6099c..b337eb883 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/kdeprint/cups/cupsdconf2/browsedialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/browsedialog.h b/kdeprint/cups/cupsdconf2/browsedialog.h index e75357e1d..8db12bc34 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.h +++ b/kdeprint/cups/cupsdconf2/browsedialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cups-util.h b/kdeprint/cups/cupsdconf2/cups-util.h index 1daf4050e..9c23c0c5e 100644 --- a/kdeprint/cups/cupsdconf2/cups-util.h +++ b/kdeprint/cups/cupsdconf2/cups-util.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsd.conf.template b/kdeprint/cups/cupsdconf2/cupsd.conf.template index ae1a4c362..08d4b9425 100644 --- a/kdeprint/cups/cupsdconf2/cupsd.conf.template +++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template @@ -5,7 +5,7 @@ # in KDEPrint. The predecessors to KDEPrint in former KDE releases # were KUPS and QtCUPS; they are deprecated and no longer maintained. # -# Author: Michael Goffioul <kdeprint@swing.be> +# Author: Michael Goffioul <tdeprint@swing.be> # # Web site: http://printing.kde.org/ # diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 5ae671092..4b056cdb0 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,7 +36,7 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) { setPageLabel(i18n("Browsing")); setHeader(i18n("Browsing Settings")); - setPixmap("kdeprint_printer_remote"); + setPixmap("tdeprint_printer_remote"); browseinterval_ = new KIntNumInput(this); browseport_ = new KIntNumInput(this); diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h index 6658e39cd..bdbff1844 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp index 0e761378c..d17c8bd0c 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -114,7 +114,7 @@ bool CupsdComment::loadComments() { comments_.setAutoDelete(true); comments_.clear(); - TQFile f(locate("data", "kdeprint/cupsd.conf.template")); + TQFile f(locate("data", "tdeprint/cupsd.conf.template")); if (f.exists() && f.open(IO_ReadOnly)) { Comment *comm; diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.h b/kdeprint/cups/cupsdconf2/cupsdcomment.h index 3bfc67e15..35f9e0515 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.h +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index 78ec9ec78..0cd041d48 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line) bool CupsdConf::loadAvailableResources() { - KConfig conf("kdeprintrc"); + KConfig conf("tdeprintrc"); conf.setGroup("CUPS"); TQString host = conf.readEntry("Host",cupsServer()); int port = conf.readNumEntry("Port",ippPort()); @@ -876,9 +876,9 @@ TQString CupsResource::typeToIconName(int type) case RESOURCE_GLOBAL: return TQString("folder"); case RESOURCE_PRINTER: - return TQString("kdeprint_printer"); + return TQString("tdeprint_printer"); case RESOURCE_CLASS: - return TQString("kdeprint_printer_class"); + return TQString("tdeprint_printer_class"); } return TQString("folder"); } diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.h b/kdeprint/cups/cupsdconf2/cupsdconf.h index 33a2ecd79..70b4f591b 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.h +++ b/kdeprint/cups/cupsdconf2/cupsdconf.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index fb59986c5..e6338eb8c 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -113,7 +113,7 @@ const char* getPassword(const char*) CupsdDialog::CupsdDialog(TQWidget *parent, const char *name) : KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) { - KGlobal::iconLoader()->addAppDir("kdeprint"); + KGlobal::iconLoader()->addAppDir("tdeprint"); KGlobal::locale()->insertCatalogue("cupsdconf"); setShowIconsInTreeList(true); @@ -208,7 +208,7 @@ bool CupsdDialog::restartServer(TQString& msg) { bool success = false; KProcess proc; - proc << "kdesu" << "-c" << "/etc/init.d/cupsys restart"; + proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart"; success = proc.start( KProcess::Block ) && proc.normalExit(); if( !success ) msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.h b/kdeprint/cups/cupsdconf2/cupsddialog.h index ed8a33613..85eee172e 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.h +++ b/kdeprint/cups/cupsdconf2/cupsddialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsddirpage.cpp b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp index 05d8314e5..268465a76 100644 --- a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsddirpage.h b/kdeprint/cups/cupsdconf2/cupsddirpage.h index 6056f79c4..571c79f21 100644 --- a/kdeprint/cups/cupsdconf2/cupsddirpage.h +++ b/kdeprint/cups/cupsdconf2/cupsddirpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index a47fae05b..79c8a9401 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdfilterpage.h b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h index 1e32e92bd..18fc5d405 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp index 8cb20679f..f12f82f1e 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdjobspage.h b/kdeprint/cups/cupsdconf2/cupsdjobspage.h index 0b6f5dbf3..abbbd140d 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.h +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp index f7de36783..61a89f933 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdlogpage.h b/kdeprint/cups/cupsdconf2/cupsdlogpage.h index bad889632..618f612be 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index c56d5e145..9edca5868 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h index 62ed56626..be46c280f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdpage.cpp b/kdeprint/cups/cupsdconf2/cupsdpage.cpp index e4a47bf1f..68bdde7a6 100644 --- a/kdeprint/cups/cupsdconf2/cupsdpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdpage.h b/kdeprint/cups/cupsdconf2/cupsdpage.h index f6c8b932b..aadbd54b9 100644 --- a/kdeprint/cups/cupsdconf2/cupsdpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 5be680300..092e1a7e5 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h index 5f20b2dcf..5e97c1cf8 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp index bd99546ae..cfd731430 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdserverpage.h b/kdeprint/cups/cupsdconf2/cupsdserverpage.h index 50164f110..f1f9eed2f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp index a0a34db84..c26b65fd7 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -37,11 +37,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) main_->addLayout(sub_); TQLabel *cupslogo_ = new TQLabel(this); - TQString logopath = locate("data", TQString("kdeprint/cups_logo.png")); + TQString logopath = locate("data", TQString("tdeprint/cups_logo.png")); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); cupslogo_->tqsetAlignment(Qt::AlignCenter); TQLabel *kupslogo_ = new TQLabel(this); - logopath = locate("data", TQString("kdeprint/kde_logo.png")); + logopath = locate("data", TQString("tdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); kupslogo_->tqsetAlignment(Qt::AlignCenter); diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.h b/kdeprint/cups/cupsdconf2/cupsdsplash.h index 9acf27395..f484958d4 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.h +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp index 9acbb23a2..754c9659e 100644 --- a/kdeprint/cups/cupsdconf2/editlist.cpp +++ b/kdeprint/cups/cupsdconf2/editlist.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/editlist.h b/kdeprint/cups/cupsdconf2/editlist.h index 177cddceb..a0fc7ee0a 100644 --- a/kdeprint/cups/cupsdconf2/editlist.h +++ b/kdeprint/cups/cupsdconf2/editlist.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index 416efa249..7e1858cc7 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/locationdialog.h b/kdeprint/cups/cupsdconf2/locationdialog.h index 26a4c43f8..f0c182f42 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.h +++ b/kdeprint/cups/cupsdconf2/locationdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/main.cpp b/kdeprint/cups/cupsdconf2/main.cpp index cc0918f41..f3c317afd 100644 --- a/kdeprint/cups/cupsdconf2/main.cpp +++ b/kdeprint/cups/cupsdconf2/main.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp index 18f27db5b..18cade9fc 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.cpp +++ b/kdeprint/cups/cupsdconf2/portdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/portdialog.h b/kdeprint/cups/cupsdconf2/portdialog.h index 44b91d134..42dd7037b 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.h +++ b/kdeprint/cups/cupsdconf2/portdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/qdirlineedit.cpp b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp index 46e70a41f..7cf0ea74e 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/qdirlineedit.h b/kdeprint/cups/cupsdconf2/qdirlineedit.h index 85e9603f8..d852897c3 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index b473d2a61..e677da988 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/qdirmultilineedit.h b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h index f39293665..c3765362e 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp index d77fe5aaa..742702e48 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdconf2/sizewidget.h b/kdeprint/cups/cupsdconf2/sizewidget.h index 56818b9a1..000fb22bc 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.h +++ b/kdeprint/cups/cupsdconf2/sizewidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsdoprint.c b/kdeprint/cups/cupsdoprint.c index 743042b2a..a12a2adf8 100644 --- a/kdeprint/cups/cupsdoprint.c +++ b/kdeprint/cups/cupsdoprint.c @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -87,7 +87,7 @@ static const char* getPasswordCB(const char* prompt) char *_user = shell_quote( cupsUser() ), *_passwd = NULL; FILE *output; - snprintf( buf, sizeof( buf )-1, "dcop kded kdeprintd requestPassword %s %s %d %d", + snprintf( buf, sizeof( buf )-1, "dcop kded tdeprintd requestPassword %s %s %d %d", _user, cupsServer(), ippPort(), diff --git a/kdeprint/cups/cupsinfos.cpp b/kdeprint/cups/cupsinfos.cpp index 5c967d7b8..1fae8e0db 100644 --- a/kdeprint/cups/cupsinfos.cpp +++ b/kdeprint/cups/cupsinfos.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/cupsinfos.h b/kdeprint/cups/cupsinfos.h index 416e441cb..5f74d3636 100644 --- a/kdeprint/cups/cupsinfos.h +++ b/kdeprint/cups/cupsinfos.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/image.cpp b/kdeprint/cups/image.cpp index 9e32ce771..ce56bb4b9 100644 --- a/kdeprint/cups/image.cpp +++ b/kdeprint/cups/image.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp index 5f08fcd61..70a84ba7f 100644 --- a/kdeprint/cups/imageposition.cpp +++ b/kdeprint/cups/imageposition.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -46,7 +46,7 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name) position_ = Center; setMinimumSize(tqsizeHint()); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - pix_.load(locate("data", "kdeprint/preview-mini.png")); + pix_.load(locate("data", "tdeprint/preview-mini.png")); } ImagePosition::~ImagePosition() diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h index 406e96951..6d6645365 100644 --- a/kdeprint/cups/imageposition.h +++ b/kdeprint/cups/imageposition.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp index 16a6271cb..2290f6a96 100644 --- a/kdeprint/cups/imagepreview.cpp +++ b/kdeprint/cups/imagepreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h index ff9da9fb8..12a57ddb3 100644 --- a/kdeprint/cups/imagepreview.h +++ b/kdeprint/cups/imagepreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/ippreportdlg.cpp b/kdeprint/cups/ippreportdlg.cpp index b7ef270bd..5fa54e11e 100644 --- a/kdeprint/cups/ippreportdlg.cpp +++ b/kdeprint/cups/ippreportdlg.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/ippreportdlg.h b/kdeprint/cups/ippreportdlg.h index 8e3eea8c5..e61ccd7b7 100644 --- a/kdeprint/cups/ippreportdlg.h +++ b/kdeprint/cups/ippreportdlg.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/ipprequest.cpp b/kdeprint/cups/ipprequest.cpp index 354d46cf6..16cbe3308 100644 --- a/kdeprint/cups/ipprequest.cpp +++ b/kdeprint/cups/ipprequest.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -154,7 +154,7 @@ void IppRequest::init() request_ = 0; } request_ = ippNew(); - //kdDebug(500) << "kdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; + //kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; TQCString langstr = KGlobal::locale()->language().latin1(); cups_lang_t* lang = cupsLangGet(langstr.data()); // default charset to UTF-8 (ugly hack) diff --git a/kdeprint/cups/ipprequest.h b/kdeprint/cups/ipprequest.h index 1265ee966..ba8b2f081 100644 --- a/kdeprint/cups/ipprequest.h +++ b/kdeprint/cups/ipprequest.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp index 4bcf96e6e..e016e9954 100644 --- a/kdeprint/cups/kcupsprinterimpl.cpp +++ b/kdeprint/cups/kcupsprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kcupsprinterimpl.h b/kdeprint/cups/kcupsprinterimpl.h index f2eeab88f..b86db8aac 100644 --- a/kdeprint/cups/kcupsprinterimpl.h +++ b/kdeprint/cups/kcupsprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmconfigcups.cpp b/kdeprint/cups/kmconfigcups.cpp index c23f5d54c..7e03dae01 100644 --- a/kdeprint/cups/kmconfigcups.cpp +++ b/kdeprint/cups/kmconfigcups.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmconfigcups.h b/kdeprint/cups/kmconfigcups.h index 52dac657c..c0f1ab2ba 100644 --- a/kdeprint/cups/kmconfigcups.h +++ b/kdeprint/cups/kmconfigcups.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmconfigcupsdir.cpp b/kdeprint/cups/kmconfigcupsdir.cpp index fc1d7d399..fbec34f2a 100644 --- a/kdeprint/cups/kmconfigcupsdir.cpp +++ b/kdeprint/cups/kmconfigcupsdir.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmconfigcupsdir.h b/kdeprint/cups/kmconfigcupsdir.h index a6fe8d9ba..352388c99 100644 --- a/kdeprint/cups/kmconfigcupsdir.h +++ b/kdeprint/cups/kmconfigcupsdir.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp index 5242cd240..482680bd6 100644 --- a/kdeprint/cups/kmcupsconfigwidget.cpp +++ b/kdeprint/cups/kmcupsconfigwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmcupsconfigwidget.h b/kdeprint/cups/kmcupsconfigwidget.h index 804fc22f0..7eee42d80 100644 --- a/kdeprint/cups/kmcupsconfigwidget.h +++ b/kdeprint/cups/kmcupsconfigwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmcupsfactory.cpp b/kdeprint/cups/kmcupsfactory.cpp index 93e179f4c..47384eab6 100644 --- a/kdeprint/cups/kmcupsfactory.cpp +++ b/kdeprint/cups/kmcupsfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,5 +26,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_cups, KGenericFactory< Products >( "ppdtranslations" ) ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_cups, KGenericFactory< Products >( "ppdtranslations" ) ) diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp index 1daa22b42..58de0818a 100644 --- a/kdeprint/cups/kmcupsjobmanager.cpp +++ b/kdeprint/cups/kmcupsjobmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -285,7 +285,7 @@ TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *c TQValueList<KAction*> list; KAction *act(0); - list << (act = new PluginAction(0, i18n("&Job IPP Report"), "kdeprint_report", 0, coll, "plugin_ipp")); + list << (act = new PluginAction(0, i18n("&Job IPP Report"), "tdeprint_report", 0, coll, "plugin_ipp")); act->setGroup("plugin"); list << (act = new PluginAction(1, i18n("&Increase Priority"), "up", 0, coll, "plugin_prioup")); act->setGroup("plugin"); diff --git a/kdeprint/cups/kmcupsjobmanager.h b/kdeprint/cups/kmcupsjobmanager.h index cba3371dc..7e8a75a53 100644 --- a/kdeprint/cups/kmcupsjobmanager.h +++ b/kdeprint/cups/kmcupsjobmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index 3027f3ac7..8db6bdc6d 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -846,9 +846,9 @@ TQStringList KMCupsManager::detectLocalPrinters() void KMCupsManager::createPluginActions(KActionCollection *coll) { - KAction *act = new KAction(i18n("&Export Driver..."), "kdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); + KAction *act = new KAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new KAction(i18n("&Printer IPP Report"), "kdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new KAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } diff --git a/kdeprint/cups/kmcupsmanager.h b/kdeprint/cups/kmcupsmanager.h index 132decb34..d574bb686 100644 --- a/kdeprint/cups/kmcupsmanager.h +++ b/kdeprint/cups/kmcupsmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmcupsuimanager.cpp b/kdeprint/cups/kmcupsuimanager.cpp index 9cefccac3..c3dfcb1ac 100644 --- a/kdeprint/cups/kmcupsuimanager.cpp +++ b/kdeprint/cups/kmcupsuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmcupsuimanager.h b/kdeprint/cups/kmcupsuimanager.h index 88c2c962a..6ad0f574f 100644 --- a/kdeprint/cups/kmcupsuimanager.h +++ b/kdeprint/cups/kmcupsuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmpropbanners.cpp b/kdeprint/cups/kmpropbanners.cpp index 4380e6507..22098cdff 100644 --- a/kdeprint/cups/kmpropbanners.cpp +++ b/kdeprint/cups/kmpropbanners.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmpropbanners.h b/kdeprint/cups/kmpropbanners.h index 6756763e6..770419dc5 100644 --- a/kdeprint/cups/kmpropbanners.h +++ b/kdeprint/cups/kmpropbanners.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmpropquota.cpp b/kdeprint/cups/kmpropquota.cpp index 9f5ff8444..9df6cbcb2 100644 --- a/kdeprint/cups/kmpropquota.cpp +++ b/kdeprint/cups/kmpropquota.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmpropquota.h b/kdeprint/cups/kmpropquota.h index 4142c1179..8ebeb323b 100644 --- a/kdeprint/cups/kmpropquota.h +++ b/kdeprint/cups/kmpropquota.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmpropusers.cpp b/kdeprint/cups/kmpropusers.cpp index 173149047..65a9e4dbd 100644 --- a/kdeprint/cups/kmpropusers.cpp +++ b/kdeprint/cups/kmpropusers.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -37,7 +37,7 @@ KMPropUsers::KMPropUsers(TQWidget *parent, const char *name) m_title = i18n("Users"); m_header = i18n("Users Access Settings"); - m_pixmap = "kdeprint_printer_users"; + m_pixmap = "tdeprint_printer_users"; } KMPropUsers::~KMPropUsers() diff --git a/kdeprint/cups/kmpropusers.h b/kdeprint/cups/kmpropusers.h index 4ab1fab9d..35e935adb 100644 --- a/kdeprint/cups/kmpropusers.h +++ b/kdeprint/cups/kmpropusers.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp index 9e930ac0e..c221f69d7 100644 --- a/kdeprint/cups/kmwbanners.cpp +++ b/kdeprint/cups/kmwbanners.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwbanners.h b/kdeprint/cups/kmwbanners.h index 7340e5554..6f8650848 100644 --- a/kdeprint/cups/kmwbanners.h +++ b/kdeprint/cups/kmwbanners.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwfax.cpp b/kdeprint/cups/kmwfax.cpp index 127232d2e..352081f6c 100644 --- a/kdeprint/cups/kmwfax.cpp +++ b/kdeprint/cups/kmwfax.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwfax.h b/kdeprint/cups/kmwfax.h index 8fc846a7b..1a822165e 100644 --- a/kdeprint/cups/kmwfax.h +++ b/kdeprint/cups/kmwfax.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwipp.cpp b/kdeprint/cups/kmwipp.cpp index 4d32ae2a1..119da629a 100644 --- a/kdeprint/cups/kmwipp.cpp +++ b/kdeprint/cups/kmwipp.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwipp.h b/kdeprint/cups/kmwipp.h index 42e36814e..33d02629b 100644 --- a/kdeprint/cups/kmwipp.h +++ b/kdeprint/cups/kmwipp.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwippprinter.cpp b/kdeprint/cups/kmwippprinter.cpp index 90fad0e94..0a0c7b672 100644 --- a/kdeprint/cups/kmwippprinter.cpp +++ b/kdeprint/cups/kmwippprinter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -62,7 +62,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) m_info->setPaper(tqcolorGroup().background()); m_info->setMinimumHeight(100); m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>")); - m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "kdeprint_report"), this); + m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "tdeprint_report"), this); m_ippreport->setEnabled(false); m_scanner = new NetworkScanner( 631, this ); @@ -140,7 +140,7 @@ void KMWIppPrinter::slotScanFinished() else name = it.current()->Name; TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); - item->setPixmap(0,SmallIcon("kdeprint_printer")); + item->setPixmap(0,SmallIcon("tdeprint_printer")); } } diff --git a/kdeprint/cups/kmwippprinter.h b/kdeprint/cups/kmwippprinter.h index aff29fdfb..5d9d33f7a 100644 --- a/kdeprint/cups/kmwippprinter.h +++ b/kdeprint/cups/kmwippprinter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwippselect.cpp b/kdeprint/cups/kmwippselect.cpp index 0d89e9112..5c9cad356 100644 --- a/kdeprint/cups/kmwippselect.cpp +++ b/kdeprint/cups/kmwippselect.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -84,7 +84,7 @@ void KMWIppSelect::initPrinter(KMPrinter *p) while (attr) { if (attr->name && strcmp(attr->name,"printer-name") == 0) - m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("tdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text)); attr = attr->next; } m_list->sort(); diff --git a/kdeprint/cups/kmwippselect.h b/kdeprint/cups/kmwippselect.h index 26ce6e563..8d1711e8c 100644 --- a/kdeprint/cups/kmwippselect.h +++ b/kdeprint/cups/kmwippselect.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp index 68a6c4532..596f61990 100644 --- a/kdeprint/cups/kmwother.cpp +++ b/kdeprint/cups/kmwother.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -97,7 +97,7 @@ void KMWOther::initPrinter(KMPrinter *p) if ( cl == "network" ) parent->setPixmap( 0, SmallIcon( "network" ) ); else if ( cl == "direct" ) - parent->setPixmap( 0, SmallIcon( "kdeprint_computer" ) ); + parent->setPixmap( 0, SmallIcon( "tdeprint_computer" ) ); else if ( cl == "serial" ) parent->setPixmap( 0, SmallIcon( "usb" ) ); else diff --git a/kdeprint/cups/kmwother.h b/kdeprint/cups/kmwother.h index e4bc72d5f..eba5ac2b1 100644 --- a/kdeprint/cups/kmwother.h +++ b/kdeprint/cups/kmwother.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwquota.cpp b/kdeprint/cups/kmwquota.cpp index 703a9510f..67245fb20 100644 --- a/kdeprint/cups/kmwquota.cpp +++ b/kdeprint/cups/kmwquota.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwquota.h b/kdeprint/cups/kmwquota.h index 6f1ce0660..d8895c80d 100644 --- a/kdeprint/cups/kmwquota.h +++ b/kdeprint/cups/kmwquota.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwusers.cpp b/kdeprint/cups/kmwusers.cpp index f42250d68..714f6f4d4 100644 --- a/kdeprint/cups/kmwusers.cpp +++ b/kdeprint/cups/kmwusers.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kmwusers.h b/kdeprint/cups/kmwusers.h index 9b6faeb61..cae8844a6 100644 --- a/kdeprint/cups/kmwusers.h +++ b/kdeprint/cups/kmwusers.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kphpgl2page.cpp b/kdeprint/cups/kphpgl2page.cpp index 0d15a838d..080cdf453 100644 --- a/kdeprint/cups/kphpgl2page.cpp +++ b/kdeprint/cups/kphpgl2page.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kphpgl2page.h b/kdeprint/cups/kphpgl2page.h index ecbc85c88..397efb1a8 100644 --- a/kdeprint/cups/kphpgl2page.h +++ b/kdeprint/cups/kphpgl2page.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp index d669bc475..d3e438389 100644 --- a/kdeprint/cups/kpimagepage.cpp +++ b/kdeprint/cups/kpimagepage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -275,7 +275,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_hue->setEnabled(useColor); m_saturation->setEnabled(useColor); - TQImage img(locate("data", "kdeprint/preview.png")); + TQImage img(locate("data", "tdeprint/preview.png")); m_preview->setImage(img); KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); diff --git a/kdeprint/cups/kpimagepage.h b/kdeprint/cups/kpimagepage.h index d0cfe094f..1a6bc6e44 100644 --- a/kdeprint/cups/kpimagepage.h +++ b/kdeprint/cups/kpimagepage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kpschedulepage.cpp b/kdeprint/cups/kpschedulepage.cpp index a43fd04d3..4d8bab4d1 100644 --- a/kdeprint/cups/kpschedulepage.cpp +++ b/kdeprint/cups/kpschedulepage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kpschedulepage.h b/kdeprint/cups/kpschedulepage.h index eccfb570a..4be11fab9 100644 --- a/kdeprint/cups/kpschedulepage.h +++ b/kdeprint/cups/kpschedulepage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp index 0e2d93ea3..d91a8b427 100644 --- a/kdeprint/cups/kptagspage.cpp +++ b/kdeprint/cups/kptagspage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h index 599ecebbf..ac99072ec 100644 --- a/kdeprint/cups/kptagspage.h +++ b/kdeprint/cups/kptagspage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp index cec0f6c23..0bee387c6 100644 --- a/kdeprint/cups/kptextpage.cpp +++ b/kdeprint/cups/kptextpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -331,7 +331,7 @@ void KPTextPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) void KPTextPage::slotPrettyChanged(int ID) { - TQString iconstr = (ID == 0 ? "kdeprint_nup1" : "kdeprint_prettyprint"); + TQString iconstr = (ID == 0 ? "tdeprint_nup1" : "tdeprint_prettyprint"); m_prettypix->setPixmap(UserIcon(iconstr)); } diff --git a/kdeprint/cups/kptextpage.h b/kdeprint/cups/kptextpage.h index 3289bf007..504e2d5c2 100644 --- a/kdeprint/cups/kptextpage.h +++ b/kdeprint/cups/kptextpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/driver.cpp b/kdeprint/driver.cpp index 26423a858..072f125c6 100644 --- a/kdeprint/driver.cpp +++ b/kdeprint/driver.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/driver.h b/kdeprint/driver.h index a2ccab8a8..7064e5335 100644 --- a/kdeprint/driver.h +++ b/kdeprint/driver.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/driveritem.cpp b/kdeprint/driveritem.cpp index 8bbfff6a4..b6531fef2 100644 --- a/kdeprint/driveritem.cpp +++ b/kdeprint/driveritem.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/driveritem.h b/kdeprint/driveritem.h index b9469be23..506cbe34d 100644 --- a/kdeprint/driveritem.h +++ b/kdeprint/driveritem.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/driverparse.h b/kdeprint/driverparse.h index 73c41be6d..775c81187 100644 --- a/kdeprint/driverparse.h +++ b/kdeprint/driverparse.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/driverview.cpp b/kdeprint/driverview.cpp index 1ede93388..f7feabb06 100644 --- a/kdeprint/driverview.cpp +++ b/kdeprint/driverview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/driverview.h b/kdeprint/driverview.h index 421786c50..4ec06c5fa 100644 --- a/kdeprint/driverview.h +++ b/kdeprint/driverview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/droptionview.cpp b/kdeprint/droptionview.cpp index f6ed93fff..2ba4d1799 100644 --- a/kdeprint/droptionview.cpp +++ b/kdeprint/droptionview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/droptionview.h b/kdeprint/droptionview.h index a84724bd8..70f60a814 100644 --- a/kdeprint/droptionview.h +++ b/kdeprint/droptionview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/ext/CMakeLists.txt b/kdeprint/ext/CMakeLists.txt index 8c701056b..9f4b2d629 100644 --- a/kdeprint/ext/CMakeLists.txt +++ b/kdeprint/ext/CMakeLists.txt @@ -17,11 +17,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -31,12 +31,12 @@ link_directories( ##### other data ################################ -install( FILES ext.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) +install( FILES ext.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) -##### kdeprint_ext ############################## +##### tdeprint_ext ############################## -set( target kdeprint_ext ) +set( target tdeprint_ext ) set( ${target}_SRCS kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp @@ -45,6 +45,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/ext/Makefile.am b/kdeprint/ext/Makefile.am index 1cb50d9fb..66e547c9d 100644 --- a/kdeprint/ext/Makefile.am +++ b/kdeprint/ext/Makefile.am @@ -1,15 +1,15 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes) -kde_module_LTLIBRARIES = kdeprint_ext.la +kde_module_LTLIBRARIES = tdeprint_ext.la -kdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp -kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE) -kdeprint_ext_la_METASOURCES = AUTO +tdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp +tdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE) +tdeprint_ext_la_METASOURCES = AUTO noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h entry_DATA = ext.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/ext/kextprinterimpl.cpp b/kdeprint/ext/kextprinterimpl.cpp index c92657497..c976f54e0 100644 --- a/kdeprint/ext/kextprinterimpl.cpp +++ b/kdeprint/ext/kextprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/ext/kextprinterimpl.h b/kdeprint/ext/kextprinterimpl.h index 653593592..169e06bf4 100644 --- a/kdeprint/ext/kextprinterimpl.h +++ b/kdeprint/ext/kextprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/ext/kmextfactory.cpp b/kdeprint/ext/kmextfactory.cpp index 3360774fa..de8c58dfe 100644 --- a/kdeprint/ext/kmextfactory.cpp +++ b/kdeprint/ext/kmextfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,5 +24,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_3( KMExtManager, KMExtUiManager, KExtPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_ext, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_ext, KGenericFactory< Products > ) diff --git a/kdeprint/ext/kmextmanager.cpp b/kdeprint/ext/kmextmanager.cpp index 017142a14..598dd6648 100644 --- a/kdeprint/ext/kmextmanager.cpp +++ b/kdeprint/ext/kmextmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/ext/kmextmanager.h b/kdeprint/ext/kmextmanager.h index 8811f952d..c7faab6cf 100644 --- a/kdeprint/ext/kmextmanager.h +++ b/kdeprint/ext/kmextmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/ext/kmextuimanager.cpp b/kdeprint/ext/kmextuimanager.cpp index ea698b8cd..2fa200848 100644 --- a/kdeprint/ext/kmextuimanager.cpp +++ b/kdeprint/ext/kmextuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/ext/kmextuimanager.h b/kdeprint/ext/kmextuimanager.h index 671d8e76b..bca161c60 100644 --- a/kdeprint/ext/kmextuimanager.h +++ b/kdeprint/ext/kmextuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/filters/CMakeLists.txt b/kdeprint/filters/CMakeLists.txt index a19bb1f93..2d36e16bb 100644 --- a/kdeprint/filters/CMakeLists.txt +++ b/kdeprint/filters/CMakeLists.txt @@ -18,6 +18,6 @@ install( FILES psbook2.xml psbook.desktop psbook.xml psselect.desktop psselect.xml ps2pdf.desktop ps2pdf.xml pdf2ps.desktop pdf2ps.xml poster.desktop poster.xml - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/filters ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/filters ) install( PROGRAMS imagetops DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/filters/Makefile.am b/kdeprint/filters/Makefile.am index 43adaa5d2..f9c9f9120 100644 --- a/kdeprint/filters/Makefile.am +++ b/kdeprint/filters/Makefile.am @@ -1,4 +1,4 @@ -filtersdir = $(kde_datadir)/kdeprint/filters +filtersdir = $(kde_datadir)/tdeprint/filters filters_DATA = enscript.desktop enscript.xml\ psnup.desktop psnup.xml \ imagetops.desktop imagetops.xml \ diff --git a/kdeprint/foomatic/Makefile.am b/kdeprint/foomatic/Makefile.am index a35882fbc..7a57fd40e 100644 --- a/kdeprint/foomatic/Makefile.am +++ b/kdeprint/foomatic/Makefile.am @@ -1,13 +1,13 @@ -INCLUDES = -I$(top_srcdir)/kdeprint $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeprint $(all_includes) -kde_module_LTLIBRARIES = kdeprint_foomatic.la +kde_module_LTLIBRARIES = tdeprint_foomatic.la -kdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \ +tdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \ kmfoomaticmanager.cpp \ kfoomaticprinterimpl.cpp -kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la -kdeprint_foomatic_la_METASOURCES = AUTO +tdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_foomatic_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la +tdeprint_foomatic_la_METASOURCES = AUTO noinst_HEADERS = kmfoomaticmanager.h \ kfoomaticprinterimpl.h @@ -17,4 +17,4 @@ bin_PROGRAMS = make_driver_db_foomatic make_driver_db_foomatic_SOURCES = make_driver_db_foomatic.c entry_DATA = foomatic.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.cpp b/kdeprint/foomatic/kfoomaticprinterimpl.cpp index 7e47a505f..d47a5e134 100644 --- a/kdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/kdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/foomatic/kfoomaticprinterimpl.h b/kdeprint/foomatic/kfoomaticprinterimpl.h index 74dfdc8f4..9d4a27155 100644 --- a/kdeprint/foomatic/kfoomaticprinterimpl.h +++ b/kdeprint/foomatic/kfoomaticprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/foomatic/kmfoomaticfactory.cpp b/kdeprint/foomatic/kmfoomaticfactory.cpp index 0355b1dd6..660e5faff 100644 --- a/kdeprint/foomatic/kmfoomaticfactory.cpp +++ b/kdeprint/foomatic/kmfoomaticfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,5 +23,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_2( KMFoomaticManager, KFoomaticPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_foomatic, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_foomatic, KGenericFactory< Products > ) diff --git a/kdeprint/foomatic/kmfoomaticmanager.cpp b/kdeprint/foomatic/kmfoomaticmanager.cpp index 749bf160b..53049852b 100644 --- a/kdeprint/foomatic/kmfoomaticmanager.cpp +++ b/kdeprint/foomatic/kmfoomaticmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/foomatic/kmfoomaticmanager.h b/kdeprint/foomatic/kmfoomaticmanager.h index 4bf74371e..f3796904a 100644 --- a/kdeprint/foomatic/kmfoomaticmanager.h +++ b/kdeprint/foomatic/kmfoomaticmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/foomatic/make_driver_db_foomatic.c b/kdeprint/foomatic/make_driver_db_foomatic.c index 0419473f6..986a24447 100644 --- a/kdeprint/foomatic/make_driver_db_foomatic.c +++ b/kdeprint/foomatic/make_driver_db_foomatic.c @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/foomatic2loader.cpp b/kdeprint/foomatic2loader.cpp index d2fb5b17d..6add13378 100644 --- a/kdeprint/foomatic2loader.cpp +++ b/kdeprint/foomatic2loader.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,8 +26,8 @@ #include <kdebug.h> #include <klocale.h> -void kdeprint_foomatic2scanner_init( TQIODevice* ); -void kdeprint_foomatic2scanner_terminate(); +void tdeprint_foomatic2scanner_init( TQIODevice* ); +void tdeprint_foomatic2scanner_terminate(); Foomatic2Loader::Foomatic2Loader() { @@ -41,10 +41,10 @@ bool Foomatic2Loader::read( TQIODevice *d ) { bool result = true; m_foodata.clear(); - kdeprint_foomatic2scanner_init( d ); - if ( kdeprint_foomatic2parse( this ) != 0 ) + tdeprint_foomatic2scanner_init( d ); + if ( tdeprint_foomatic2parse( this ) != 0 ) result = false; - kdeprint_foomatic2scanner_terminate(); + tdeprint_foomatic2scanner_terminate(); return result; } diff --git a/kdeprint/foomatic2loader.h b/kdeprint/foomatic2loader.h index fe32ee8fa..19cfc9d9d 100644 --- a/kdeprint/foomatic2loader.h +++ b/kdeprint/foomatic2loader.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -46,7 +46,7 @@ public: private: TQMap<TQString,TQVariant> m_foodata; - friend int kdeprint_foomatic2parse( void* ); + friend int tdeprint_foomatic2parse( void* ); DrBase* createValue( const TQString&, const TQMap<TQString,TQVariant>& ) const; DrBase* createOption( const TQMap<TQString,TQVariant>& ) const; }; diff --git a/kdeprint/fooparser.cpp b/kdeprint/fooparser.cpp index 09ba34bf2..e919616ab 100644 --- a/kdeprint/fooparser.cpp +++ b/kdeprint/fooparser.cpp @@ -4,13 +4,13 @@ #define YYBISON 1 /* Identify Bison output. */ -#define yyparse kdeprint_foomatic2parse -#define yylex kdeprint_foomatic2lex -#define yyerror kdeprint_foomatic2error -#define yylval kdeprint_foomatic2lval -#define yychar kdeprint_foomatic2char -#define yydebug kdeprint_foomatic2debug -#define yynerrs kdeprint_foomatic2nerrs +#define yyparse tdeprint_foomatic2parse +#define yylex tdeprint_foomatic2lex +#define yyerror tdeprint_foomatic2error +#define yylval tdeprint_foomatic2lval +#define yychar tdeprint_foomatic2char +#define yydebug tdeprint_foomatic2debug +#define yynerrs tdeprint_foomatic2nerrs #define VAR 257 #define STRING 258 #define NUMBER 259 @@ -22,7 +22,7 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/fooparser.cpp.h b/kdeprint/fooparser.cpp.h index 9c8ec0180..dd694b5de 100644 --- a/kdeprint/fooparser.cpp.h +++ b/kdeprint/fooparser.cpp.h @@ -11,5 +11,5 @@ #define QUOTED 262 -extern YYSTYPE kdeprint_foomatic2lval; +extern YYSTYPE tdeprint_foomatic2lval; #endif diff --git a/kdeprint/fooparser.y b/kdeprint/fooparser.y index 1aaa4cf75..20626ce59 100644 --- a/kdeprint/fooparser.y +++ b/kdeprint/fooparser.y @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/fooscanner.cpp b/kdeprint/fooscanner.cpp index cab7426ab..3cdd4feb6 100644 --- a/kdeprint/fooscanner.cpp +++ b/kdeprint/fooscanner.cpp @@ -1,19 +1,19 @@ -#define yy_create_buffer kdeprint_foomatic2_create_buffer -#define yy_delete_buffer kdeprint_foomatic2_delete_buffer -#define yy_scan_buffer kdeprint_foomatic2_scan_buffer -#define yy_scan_string kdeprint_foomatic2_scan_string -#define yy_scan_bytes kdeprint_foomatic2_scan_bytes -#define yy_flex_debug kdeprint_foomatic2_flex_debug -#define yy_init_buffer kdeprint_foomatic2_init_buffer -#define yy_flush_buffer kdeprint_foomatic2_flush_buffer -#define yy_load_buffer_state kdeprint_foomatic2_load_buffer_state -#define yy_switch_to_buffer kdeprint_foomatic2_switch_to_buffer -#define yyin kdeprint_foomatic2in -#define yyleng kdeprint_foomatic2leng -#define yylex kdeprint_foomatic2lex -#define yyout kdeprint_foomatic2out -#define yyrestart kdeprint_foomatic2restart -#define yytext kdeprint_foomatic2text +#define yy_create_buffer tdeprint_foomatic2_create_buffer +#define yy_delete_buffer tdeprint_foomatic2_delete_buffer +#define yy_scan_buffer tdeprint_foomatic2_scan_buffer +#define yy_scan_string tdeprint_foomatic2_scan_string +#define yy_scan_bytes tdeprint_foomatic2_scan_bytes +#define yy_flex_debug tdeprint_foomatic2_flex_debug +#define yy_init_buffer tdeprint_foomatic2_init_buffer +#define yy_flush_buffer tdeprint_foomatic2_flush_buffer +#define yy_load_buffer_state tdeprint_foomatic2_load_buffer_state +#define yy_switch_to_buffer tdeprint_foomatic2_switch_to_buffer +#define yyin tdeprint_foomatic2in +#define yyleng tdeprint_foomatic2leng +#define yylex tdeprint_foomatic2lex +#define yyout tdeprint_foomatic2out +#define yyrestart tdeprint_foomatic2restart +#define yytext tdeprint_foomatic2text #line 19 "./fooscanner.cpp" /* A lexical scanner generated by flex */ @@ -427,7 +427,7 @@ char *yytext; #line 2 "./fooscanner.l" /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -449,13 +449,13 @@ char *yytext; #define YYSTYPE QVariant #include "fooparser.cpp.h" -#define yylval kdeprint_foomatic2lval +#define yylval tdeprint_foomatic2lval #define YY_INPUT( buf, result, max_size ) \ { \ - if ( kdeprint_foomatic2scanner_device ) \ + if ( tdeprint_foomatic2scanner_device ) \ { \ - result = kdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ + result = tdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ if ( result < 0 ) \ result = 0; \ } \ @@ -463,7 +463,7 @@ char *yytext; result = 0; \ } -TQIODevice* kdeprint_foomatic2scanner_device = NULL; +TQIODevice* tdeprint_foomatic2scanner_device = NULL; #line 468 "./fooscanner.cpp" /* Macros after this point can all be overridden by user definitions in @@ -1696,12 +1696,12 @@ int main() #line 73 "./fooscanner.l" -void kdeprint_foomatic2scanner_init( TQIODevice *d ) +void tdeprint_foomatic2scanner_init( TQIODevice *d ) { - kdeprint_foomatic2scanner_device = d; + tdeprint_foomatic2scanner_device = d; } -void kdeprint_foomatic2scanner_terminate() +void tdeprint_foomatic2scanner_terminate() { - kdeprint_foomatic2scanner_device = NULL; + tdeprint_foomatic2scanner_device = NULL; } diff --git a/kdeprint/fooscanner.l b/kdeprint/fooscanner.l index b93ab3bb0..ddd5bb974 100644 --- a/kdeprint/fooscanner.l +++ b/kdeprint/fooscanner.l @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,13 +23,13 @@ #define YYSTYPE QVariant #include "fooparser.cpp.h" -#define yylval kdeprint_foomatic2lval +#define yylval tdeprint_foomatic2lval #define YY_INPUT( buf, result, max_size ) \ { \ - if ( kdeprint_foomatic2scanner_device ) \ + if ( tdeprint_foomatic2scanner_device ) \ { \ - result = kdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ + result = tdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ if ( result < 0 ) \ result = 0; \ } \ @@ -37,7 +37,7 @@ result = 0; \ } -QIODevice* kdeprint_foomatic2scanner_device = NULL; +QIODevice* tdeprint_foomatic2scanner_device = NULL; %} %option noyywrap @@ -72,12 +72,12 @@ D [[:digit:]] %% -void kdeprint_foomatic2scanner_init( QIODevice *d ) +void tdeprint_foomatic2scanner_init( QIODevice *d ) { - kdeprint_foomatic2scanner_device = d; + tdeprint_foomatic2scanner_device = d; } -void kdeprint_foomatic2scanner_terminate() +void tdeprint_foomatic2scanner_terminate() { - kdeprint_foomatic2scanner_device = NULL; + tdeprint_foomatic2scanner_device = NULL; } diff --git a/kdeprint/kdeprintcheck.cpp b/kdeprint/kdeprintcheck.cpp index 2cccde6de..1ace082a4 100644 --- a/kdeprint/kdeprintcheck.cpp +++ b/kdeprint/kdeprintcheck.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,7 +36,7 @@ * - run:/<execname> -> check for a running executable */ -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kdeprint/kdeprintcheck.h b/kdeprint/kdeprintcheck.h index f538dc2a4..ae1264a97 100644 --- a/kdeprint/kdeprintcheck.h +++ b/kdeprint/kdeprintcheck.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kdeprintd.cpp b/kdeprint/kdeprintd.cpp index e607629cb..d6237b2b2 100644 --- a/kdeprint/kdeprintd.cpp +++ b/kdeprint/kdeprintd.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. **/ -#include "kdeprintd.h" +#include "tdeprintd.h" #include "kprintprocess.h" #include <tqfile.h> @@ -42,7 +42,7 @@ extern "C" { - KDE_EXPORT KDEDModule *create_kdeprintd(const TQCString& name) + KDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name) { return new KDEPrintd(name); } @@ -123,7 +123,7 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla KURL url( re.cap( 1 ) ); if ( !url.isLocalFile() ) { - TQString tmpFilename = locateLocal( "tmp", "kdeprint_" + kapp->randomString( 8 ) ); + TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) ); command.replace( re, KProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); @@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) i18n("Provide root's Password"), "provideRootsPassword") == KMessageBox::Continue) { - cmd = ("kdesu -c " + KProcess::quote(cmd)); + cmd = ("tdesu -c " + KProcess::quote(cmd)); break; } else @@ -312,4 +312,4 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl; } -#include "kdeprintd.moc" +#include "tdeprintd.moc" diff --git a/kdeprint/kdeprintd.desktop b/kdeprint/kdeprintd.desktop index b30434c49..45cf8ece4 100644 --- a/kdeprint/kdeprintd.desktop +++ b/kdeprint/kdeprintd.desktop @@ -3,8 +3,8 @@ Type=Service ServiceTypes=KDEDModule X-KDE-ModuleType=Library -X-KDE-Library=kdeprintd -X-KDE-FactoryName=kdeprintd +X-KDE-Library=tdeprintd +X-KDE-FactoryName=tdeprintd X-KDE-Kded-autoload=false X-KDE-Kded-load-on-demand=true diff --git a/kdeprint/kdeprintd.h b/kdeprint/kdeprintd.h index 48fcdd021..597ffbc5b 100644 --- a/kdeprint/kdeprintd.h +++ b/kdeprint/kdeprintd.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kdeprintrc.upd b/kdeprint/kdeprintrc.upd index 6ac48a7ce..faf6abab8 100644 --- a/kdeprint/kdeprintrc.upd +++ b/kdeprint/kdeprintrc.upd @@ -1,5 +1,5 @@ Id=kde-3.1-toolbar -File=kdeprintrc +File=tdeprintrc Group=General Options=copy Key=ViewToolBar,ViewMenuBar diff --git a/kdeprint/kfilelist.cpp b/kdeprint/kfilelist.cpp index 85117a922..1f67851c6 100644 --- a/kdeprint/kfilelist.cpp +++ b/kdeprint/kfilelist.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kfilelist.h b/kdeprint/kfilelist.h index 8a7ecd50a..03b7977d8 100644 --- a/kdeprint/kfilelist.h +++ b/kdeprint/kfilelist.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmdbentry.cpp b/kdeprint/kmdbentry.cpp index 9402dd02c..34a0b60b4 100644 --- a/kdeprint/kmdbentry.cpp +++ b/kdeprint/kmdbentry.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmdbentry.h b/kdeprint/kmdbentry.h index 6de72c5ba..cccec92b6 100644 --- a/kdeprint/kmdbentry.h +++ b/kdeprint/kmdbentry.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmfactory.cpp b/kdeprint/kmfactory.cpp index 5c31cf5a9..3206d3cee 100644 --- a/kdeprint/kmfactory.cpp +++ b/kdeprint/kmfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ #include "kprinterimpl.h" #include "kprinter.h" #include "kpreloadobject.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "kxmlcommand.h" #include <tqdir.h> @@ -113,8 +113,8 @@ KMFactory::KMFactory() if ( !ok ) settings.writeEntry( "/qt/embedFonts", true ); - KGlobal::iconLoader()->addAppDir("kdeprint"); - KGlobal::locale()->insertCatalogue("kdeprint"); + KGlobal::iconLoader()->addAppDir("tdeprint"); + KGlobal::locale()->insertCatalogue("tdeprint"); // create DCOP signal connection connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); @@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst) if (sys.isEmpty()) // load default configured print plugin sys = printSystem(); - TQString libname = TQString::tqfromLatin1("kdeprint_%1").arg(sys); + TQString libname = TQString::tqfromLatin1("tdeprint_%1").arg(sys); m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname)); if (!m_factory) { @@ -228,7 +228,7 @@ KConfig* KMFactory::printConfig(const TQString& group) { if (!m_printconfig) { - m_printconfig = new KConfig("kdeprintrc"); + m_printconfig = new KConfig("tdeprintrc"); Q_CHECK_PTR(m_printconfig); } if (!group.isEmpty()) @@ -295,7 +295,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst) TQValueList<KMFactory::PluginInfo> KMFactory::pluginList() { - TQDir d(locate("data", "kdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files); + TQDir d(locate("data", "tdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files); TQValueList<PluginInfo> list; for (uint i=0; i<d.count(); i++) { @@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) { TQString path(name); if (path[0] != '/') - path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name)); + path = locate("data", TQString::tqfromLatin1("tdeprint/plugins/%1.print").arg(name)); KSimpleConfig conf(path); PluginInfo info; @@ -339,7 +339,7 @@ void KMFactory::registerObject(KPReloadObject *obj, bool priority) m_objects.prepend(obj); else m_objects.append(obj); - kdDebug(500) << "kdeprint: registering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; + kdDebug(500) << "tdeprint: registering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; } } @@ -347,7 +347,7 @@ void KMFactory::unregisterObject(KPReloadObject *obj) { // remove object from list (not deleted as autoDelete is false) m_objects.removeRef(obj); - kdDebug(500) << "kdeprint: unregistering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; + kdDebug(500) << "tdeprint: unregistering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; } TQString KMFactory::autoDetect() @@ -414,14 +414,14 @@ void KMFactory::saveConfig() TQPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQString& user, const TQString& host, int port ) { - DCOPRef kdeprintd( "kded", "kdeprintd" ); + DCOPRef tdeprintd( "kded", "tdeprintd" ); /** * We do not use an internal event loop for 2 potential problems: * - the MessageWindow modality (appearing afterwards, it pops up on top * of the password dialog) * - KMTimer should be stopped, but it's unavailable from this object */ - DCOPReply reply = kdeprintd.call( "requestPassword", user, host, port, seqNbr ); + DCOPReply reply = tdeprintd.call( "requestPassword", user, host, port, seqNbr ); if ( reply.isValid() ) { TQString replyString = reply; @@ -440,14 +440,14 @@ TQPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQStrin void KMFactory::initPassword( const TQString& user, const TQString& password, const TQString& host, int port ) { - DCOPRef kdeprintd( "kded", "kdeprintd" ); + DCOPRef tdeprintd( "kded", "tdeprintd" ); /** * We do not use an internal event loop for 2 potential problems: * - the MessageWindow modality (appearing afterwards, it pops up on top * of the password dialog) * - KMTimer should be stopped, but it's unavailable from this object */ - kdeprintd.call( "initPassword", user, password, host, port ); + tdeprintd.call( "initPassword", user, password, host, port ); } #include "kmfactory.moc" diff --git a/kdeprint/kmfactory.h b/kdeprint/kmfactory.h index 326e5ea8b..168385f6e 100644 --- a/kdeprint/kmfactory.h +++ b/kdeprint/kmfactory.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kmjob.cpp b/kdeprint/kmjob.cpp index 5c904538b..ce7e95993 100644 --- a/kdeprint/kmjob.cpp +++ b/kdeprint/kmjob.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -78,7 +78,7 @@ TQString KMJob::pixmap() return TQString::tqfromLatin1("exec"); // normal case - QString str("kdeprint_job"); + QString str("tdeprint_job"); switch (m_state) { case KMJob::Printing: diff --git a/kdeprint/kmjob.h b/kdeprint/kmjob.h index 379f7cfd8..d8fed5e8d 100644 --- a/kdeprint/kmjob.h +++ b/kdeprint/kmjob.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <kdeprint/kmobject.h> +#include <tdeprint/kmobject.h> #include <kdelibs_export.h> /** diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp index 3449e1bb2..918c14ff2 100644 --- a/kdeprint/kmjobmanager.cpp +++ b/kdeprint/kmjobmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmjobmanager.h b/kdeprint/kmjobmanager.h index 8b95bf7ac..89cabaa7c 100644 --- a/kdeprint/kmjobmanager.h +++ b/kdeprint/kmjobmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp index 4fdc70f7e..01ca0dc77 100644 --- a/kdeprint/kmmanager.cpp +++ b/kdeprint/kmmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname) if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213) { f.close(); - destname = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); + destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); f.setName(destname); if (f.open(IO_WriteOnly)) @@ -422,7 +422,7 @@ TQString KMManager::testPage() conf->setGroup("General"); QString tpage = conf->readPathEntry("TestPage"); if (tpage.isEmpty()) - tpage = locate("data","kdeprint/testprint.ps"); + tpage = locate("data","tdeprint/testprint.ps"); return tpage; } diff --git a/kdeprint/kmmanager.h b/kdeprint/kmmanager.h index ecdacba06..df78adcd3 100644 --- a/kdeprint/kmmanager.h +++ b/kdeprint/kmmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ #warning internal header, do not use except if you are a KDEPrint developer #endif -#include <kdeprint/kmprinter.h> +#include <tdeprint/kmprinter.h> #include <tqobject.h> #include <tqstring.h> diff --git a/kdeprint/kmobject.h b/kdeprint/kmobject.h index 57824cd09..5b9358c49 100644 --- a/kdeprint/kmobject.h +++ b/kdeprint/kmobject.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kmprinter.cpp b/kdeprint/kmprinter.cpp index 5749a47c5..b18116ef8 100644 --- a/kdeprint/kmprinter.cpp +++ b/kdeprint/kmprinter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -90,7 +90,7 @@ TQString KMPrinter::pixmap() { if (!m_pixmap.isEmpty()) return m_pixmap; - QString str("kdeprint_printer"); + QString str("tdeprint_printer"); if (!isValid()) str.append("_defect"); else { diff --git a/kdeprint/kmprinter.h b/kdeprint/kmprinter.h index 7f527fb23..c6c2995e9 100644 --- a/kdeprint/kmprinter.h +++ b/kdeprint/kmprinter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,7 +29,7 @@ #include <tqptrlist.h> #include <kurl.h> #include <tqmap.h> -#include <kdeprint/kmobject.h> +#include <tdeprint/kmobject.h> class KMDBEntry; class DrMain; diff --git a/kdeprint/kmspecialmanager.cpp b/kdeprint/kmspecialmanager.cpp index ba742fc78..6da7f4ed7 100644 --- a/kdeprint/kmspecialmanager.cpp +++ b/kdeprint/kmspecialmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kmspecialmanager.h" #include "kmmanager.h" #include "kmprinter.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "kxmlcommand.h" #include "driver.h" @@ -46,11 +46,11 @@ bool KMSpecialManager::savePrinters() QString confname; if (getuid() == 0) { - confname = locate("data", "kdeprint/specials.desktop"); + confname = locate("data", "tdeprint/specials.desktop"); if (confname.startsWith(KGlobal::dirs()->localkdedir())) { // seems there's a problem here - m_mgr->setErrorMsg(i18n("A file share/kdeprint/specials.desktop was found in your " + m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " "local KDE directory. This file probably comes from a previous KDE " "release and should be removed in order to manage global pseudo " "printers.")); @@ -58,7 +58,7 @@ bool KMSpecialManager::savePrinters() } } else - confname = locateLocal("data","kdeprint/specials.desktop"); + confname = locateLocal("data","tdeprint/specials.desktop"); KSimpleConfig conf(confname); @@ -108,7 +108,7 @@ bool KMSpecialManager::loadPrinters() bool result(true); TQString localDir = KGlobal::dirs()->localkdedir(); - TQStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/specials.desktop"); + TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); // local files should processed last, so we need to reorder the list // and put local files at the end TQStringList orderedFiles; diff --git a/kdeprint/kmspecialmanager.h b/kdeprint/kmspecialmanager.h index 47adec6b2..b42aea1df 100644 --- a/kdeprint/kmspecialmanager.h +++ b/kdeprint/kmspecialmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmthreadjob.cpp b/kdeprint/kmthreadjob.cpp index 0fe277ee1..fcee4877f 100644 --- a/kdeprint/kmthreadjob.cpp +++ b/kdeprint/kmthreadjob.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob() TQString KMThreadJob::jobFile() { - QString f = locateLocal("data","kdeprint/printjobs"); + QString f = locateLocal("data","tdeprint/printjobs"); return f; } diff --git a/kdeprint/kmthreadjob.h b/kdeprint/kmthreadjob.h index b4eedfbfd..5bded6274 100644 --- a/kdeprint/kmthreadjob.h +++ b/kdeprint/kmthreadjob.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmuimanager.cpp b/kdeprint/kmuimanager.cpp index 78f5c209f..962653dd2 100644 --- a/kdeprint/kmuimanager.cpp +++ b/kdeprint/kmuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmuimanager.h b/kdeprint/kmuimanager.h index 478dbc0df..248ad4ed7 100644 --- a/kdeprint/kmuimanager.h +++ b/kdeprint/kmuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmvirtualmanager.cpp b/kdeprint/kmvirtualmanager.cpp index 22ad5ec39..78757decd 100644 --- a/kdeprint/kmvirtualmanager.cpp +++ b/kdeprint/kmvirtualmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kmvirtualmanager.h b/kdeprint/kmvirtualmanager.h index 5725854e2..1b7ab4867 100644 --- a/kdeprint/kmvirtualmanager.h +++ b/kdeprint/kmvirtualmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp index 6d7a29c8c..bc0e03e0d 100644 --- a/kdeprint/kpcopiespage.cpp +++ b/kdeprint/kpcopiespage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -270,7 +270,7 @@ void KPCopiesPage::slotRangeEntered() void KPCopiesPage::slotCollateClicked() { - TQString s("kdeprint_"); + TQString s("tdeprint_"); s.append((m_collate->isChecked() ? "collate" : "uncollate")); if (m_order->isChecked()) s.append("_reverse"); m_collatepix->setPixmap(UserIcon(s)); diff --git a/kdeprint/kpcopiespage.h b/kdeprint/kpcopiespage.h index 9aff7ef8d..1e1532ce9 100644 --- a/kdeprint/kpcopiespage.h +++ b/kdeprint/kpcopiespage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +21,7 @@ #define KPCOPIESPAGE_H #include "kprintdialogpage.h" -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> class TQRadioButton; class TQLineEdit; diff --git a/kdeprint/kpdriverpage.cpp b/kdeprint/kpdriverpage.cpp index a7dd2b61d..18cfeb207 100644 --- a/kdeprint/kpdriverpage.cpp +++ b/kdeprint/kpdriverpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpdriverpage.h b/kdeprint/kpdriverpage.h index 90f3ebb2d..5c3936e49 100644 --- a/kdeprint/kpdriverpage.h +++ b/kdeprint/kpdriverpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpfileselectpage.cpp b/kdeprint/kpfileselectpage.cpp index 54ccfdd6b..f3131717a 100644 --- a/kdeprint/kpfileselectpage.cpp +++ b/kdeprint/kpfileselectpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpfileselectpage.h b/kdeprint/kpfileselectpage.h index 518f5a106..11ed378ff 100644 --- a/kdeprint/kpfileselectpage.h +++ b/kdeprint/kpfileselectpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpfilterpage.cpp b/kdeprint/kpfilterpage.cpp index fcea863a2..b321b3141 100644 --- a/kdeprint/kpfilterpage.cpp +++ b/kdeprint/kpfilterpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpfilterpage.h b/kdeprint/kpfilterpage.h index 83368e1d4..72065b3f1 100644 --- a/kdeprint/kpfilterpage.h +++ b/kdeprint/kpfilterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp index ac7dfdae0..98ab5d4a6 100644 --- a/kdeprint/kpgeneralpage.cpp +++ b/kdeprint/kpgeneralpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -696,11 +696,11 @@ void KPGeneralPage::slotOrientationChanged(int ID) TQString iconstr; switch (ID) { - case ORIENT_PORTRAIT_ID: iconstr = "kdeprint_portrait"; break; - case ORIENT_LANDSCAPE_ID: iconstr = "kdeprint_landscape"; break; - case ORIENT_REVPORTRAIT_ID: iconstr = "kdeprint_revportrait"; break; - case ORIENT_REVLANDSCAPE_ID: iconstr = "kdeprint_revlandscape"; break; - default: iconstr = "kdeprint_portrait"; break; + case ORIENT_PORTRAIT_ID: iconstr = "tdeprint_portrait"; break; + case ORIENT_LANDSCAPE_ID: iconstr = "tdeprint_landscape"; break; + case ORIENT_REVPORTRAIT_ID: iconstr = "tdeprint_revportrait"; break; + case ORIENT_REVLANDSCAPE_ID: iconstr = "tdeprint_revlandscape"; break; + default: iconstr = "tdeprint_portrait"; break; } m_orientpix->setPixmap(UserIcon(iconstr)); } @@ -710,10 +710,10 @@ void KPGeneralPage::slotNupChanged(int ID) TQString iconstr; switch (ID) { - case NUP_1_ID: iconstr = "kdeprint_nup1"; break; - case NUP_2_ID: iconstr = "kdeprint_nup2"; break; - case NUP_4_ID: iconstr = "kdeprint_nup4"; break; - default: iconstr = "kdeprint_nup1"; break; + case NUP_1_ID: iconstr = "tdeprint_nup1"; break; + case NUP_2_ID: iconstr = "tdeprint_nup2"; break; + case NUP_4_ID: iconstr = "tdeprint_nup4"; break; + default: iconstr = "tdeprint_nup1"; break; } m_nuppix->setPixmap(UserIcon(iconstr)); } @@ -725,10 +725,10 @@ void KPGeneralPage::slotDuplexChanged(int ID) TQString iconstr; switch (ID) { - case DUPLEX_NONE_ID: iconstr = "kdeprint_duplex_none"; break; - case DUPLEX_LONG_ID: iconstr = "kdeprint_duplex_long"; break; - case DUPLEX_SHORT_ID: iconstr = "kdeprint_duplex_short"; break; - default: iconstr = "kdeprint_duplex_none"; break; + case DUPLEX_NONE_ID: iconstr = "tdeprint_duplex_none"; break; + case DUPLEX_LONG_ID: iconstr = "tdeprint_duplex_long"; break; + case DUPLEX_SHORT_ID: iconstr = "tdeprint_duplex_short"; break; + default: iconstr = "tdeprint_duplex_none"; break; } m_duplexpix->setPixmap(UserIcon(iconstr)); } diff --git a/kdeprint/kpgeneralpage.h b/kdeprint/kpgeneralpage.h index 643b19b59..2a211ab04 100644 --- a/kdeprint/kpgeneralpage.h +++ b/kdeprint/kpgeneralpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kpipeprocess.cpp b/kdeprint/kpipeprocess.cpp index a3ef560c8..daf3c2900 100644 --- a/kdeprint/kpipeprocess.cpp +++ b/kdeprint/kpipeprocess.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpipeprocess.h b/kdeprint/kpipeprocess.h index 8cf3dbf30..0ead3da78 100644 --- a/kdeprint/kpipeprocess.h +++ b/kdeprint/kpipeprocess.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpmarginpage.cpp b/kdeprint/kpmarginpage.cpp index 309a3dfd2..554679ee7 100644 --- a/kdeprint/kpmarginpage.cpp +++ b/kdeprint/kpmarginpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kpmarginpage.h b/kdeprint/kpmarginpage.h index fd6da6920..4d52686fd 100644 --- a/kdeprint/kpmarginpage.h +++ b/kdeprint/kpmarginpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpposterpage.cpp b/kdeprint/kpposterpage.cpp index 1fa7a23b5..d82e5b572 100644 --- a/kdeprint/kpposterpage.cpp +++ b/kdeprint/kpposterpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpposterpage.h b/kdeprint/kpposterpage.h index ec10a920d..ce4858aa3 100644 --- a/kdeprint/kpposterpage.h +++ b/kdeprint/kpposterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp index 4bf107389..e2c28ebb1 100644 --- a/kdeprint/kpqtpage.cpp +++ b/kdeprint/kpqtpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -225,12 +225,12 @@ void KPQtPage::init() void KPQtPage::slotOrientationChanged(int ID) { - m_orientpix->setPixmap(UserIcon((ID == ORIENT_PORTRAIT_ID ? "kdeprint_portrait" : "kdeprint_landscape"))); + m_orientpix->setPixmap(UserIcon((ID == ORIENT_PORTRAIT_ID ? "tdeprint_portrait" : "tdeprint_landscape"))); } void KPQtPage::slotColorModeChanged(int ID) { - m_colorpix->setPixmap(UserIcon((ID == COLORMODE_COLOR_ID ? "kdeprint_color" : "kdeprint_grayscale"))); + m_colorpix->setPixmap(UserIcon((ID == COLORMODE_COLOR_ID ? "tdeprint_color" : "tdeprint_grayscale"))); } void KPQtPage::slotNupChanged(int ID) @@ -238,10 +238,10 @@ void KPQtPage::slotNupChanged(int ID) QString pixstr; switch (ID) { - case NUP_1: pixstr = "kdeprint_nup1"; break; - case NUP_2: pixstr = "kdeprint_nup2"; break; - case NUP_4: pixstr = "kdeprint_nup4"; break; - case NUP_OTHER: pixstr = "kdeprint_nupother"; break; + case NUP_1: pixstr = "tdeprint_nup1"; break; + case NUP_2: pixstr = "tdeprint_nup2"; break; + case NUP_4: pixstr = "tdeprint_nup4"; break; + case NUP_OTHER: pixstr = "tdeprint_nupother"; break; } m_nuppix->setPixmap(UserIcon(pixstr)); } diff --git a/kdeprint/kpqtpage.h b/kdeprint/kpqtpage.h index 723f35e04..0ab4361f4 100644 --- a/kdeprint/kpqtpage.h +++ b/kdeprint/kpqtpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpreloadobject.cpp b/kdeprint/kpreloadobject.cpp index 10acda92f..af9e299cd 100644 --- a/kdeprint/kpreloadobject.cpp +++ b/kdeprint/kpreloadobject.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kpreloadobject.h b/kdeprint/kpreloadobject.h index 3c8e87b30..09bbe97d6 100644 --- a/kdeprint/kpreloadobject.h +++ b/kdeprint/kpreloadobject.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp index 4e62e791b..e275ed559 100644 --- a/kdeprint/kprintaction.cpp +++ b/kdeprint/kprintaction.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kprintaction.h" #include <kprinter.h> -#include <kdeprint/kmmanager.h> +#include <tdeprint/kmmanager.h> #include <kiconloader.h> #include <kpopupmenu.h> #include <klocale.h> diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h index eb23d6e31..f6ba35d34 100644 --- a/kdeprint/kprintaction.h +++ b/kdeprint/kprintaction.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp index ebdc6ae42..5cb56819e 100644 --- a/kdeprint/kprintdialog.cpp +++ b/kdeprint/kprintdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -288,9 +288,9 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) m_printerlabel->setBuddy(d->m_printers); d->m_properties = new KPushButton(KGuiItem(i18n("P&roperties"), "edit"), m_pbox); TQWhatsThis::add( d->m_properties, whatsThisPrintJobProperties); - d->m_options = new KPushButton(KGuiItem(i18n("System Op&tions"), "kdeprint_configmgr"), this); + d->m_options = new KPushButton(KGuiItem(i18n("System Op&tions"), "tdeprint_configmgr"), this); TQWhatsThis::add(d->m_options,whatsThisSystemOptions); - d->m_default = new KPushButton(KGuiItem(i18n("Set as &Default"), "kdeprint_defaultsoft"), m_pbox); + d->m_default = new KPushButton(KGuiItem(i18n("Set as &Default"), "tdeprint_defaultsoft"), m_pbox); TQWhatsThis::add(d->m_default,whatsThisSetDefaultPrinter); d->m_filter = new TQPushButton(m_pbox); d->m_filter->setPixmap(SmallIcon("filter")); @@ -914,7 +914,7 @@ void KPrintDialog::slotToggleFilter(bool on) void KPrintDialog::slotHelp() { - kapp->invokeHelp(TQString::null, "kdeprint"); + kapp->invokeHelp(TQString::null, "tdeprint"); } void KPrintDialog::slotOutputFileSelected(const TQString& txt) diff --git a/kdeprint/kprintdialog.h b/kdeprint/kprintdialog.h index 0e4adfd64..77484ca58 100644 --- a/kdeprint/kprintdialog.h +++ b/kdeprint/kprintdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,7 +26,7 @@ #include <kdialog.h> #include <tqptrlist.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> class KPrinter; class KPrintDialogPage; diff --git a/kdeprint/kprintdialogpage.cpp b/kdeprint/kprintdialogpage.cpp index 0bd860623..58861019a 100644 --- a/kdeprint/kprintdialogpage.cpp +++ b/kdeprint/kprintdialogpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprintdialogpage.h b/kdeprint/kprintdialogpage.h index 1802eb6ec..d9b44b6ea 100644 --- a/kdeprint/kprintdialogpage.h +++ b/kdeprint/kprintdialogpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -39,7 +39,7 @@ class DrMain; * "kde-appname-optionname" for internal reasons. * * \code - * #include <kdeprint/kprintdialogpage.h> + * #include <tdeprint/kprintdialogpage.h> * * class MyDialogPage : public KPrintDialogPage * { diff --git a/kdeprint/kprinter.cpp b/kdeprint/kprinter.cpp index edd924456..67d276990 100644 --- a/kdeprint/kprinter.cpp +++ b/kdeprint/kprinter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -409,7 +409,7 @@ bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer) args << "-d"; args << printerName(); args << "--noshow"; - kapp->kdeinitExec("kjobviewer", args); + kapp->tdeinitExec("kjobviewer", args); } } } diff --git a/kdeprint/kprinter.h b/kdeprint/kprinter.h index 7a6f21569..4910c23ef 100644 --- a/kdeprint/kprinter.h +++ b/kdeprint/kprinter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ #include <kdemacros.h> #include <kdelibs_export.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> class KPrinterImpl; class KPrintDialogPage; @@ -78,7 +78,7 @@ class DrPageSize; * of the print dialog to integrate application specific print options. This is done by subclassing * KPrintDialogPage and adding the page using addDialogPage(). * - * When compiling an application that uses KPrinter, you must link to -lkdeprint, which when + * When compiling an application that uses KPrinter, you must link to -ltdeprint, which when * using the standard KDE build framework can be done by adding $(LIB_KDEPRINT) to _LDADD. * * @short The central interface class to access the KDE print system. @@ -106,7 +106,7 @@ public: * page selection will be enabled in the print dialog, otherwise it will be * disabled. However some applications (word processor) can do page selection * themselves, then it will be enabled in the print dialog, whatever the - * print system used. But such an application has to tell kdeprint about its + * print system used. But such an application has to tell tdeprint about its * feature: * @li @p ApplicationSide: the application will do page selection * @li @p SystemSide: page selection will be left to the print system, if available (default) diff --git a/kdeprint/kprinterimpl.cpp b/kdeprint/kprinterimpl.cpp index 7d0d9477a..166ae7207 100644 --- a/kdeprint/kprinterimpl.cpp +++ b/kdeprint/kprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -194,7 +194,7 @@ void KPrinterImpl::broadcastOption(const TQString& key, const TQString& value) int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool removeflag) { - kdDebug(500) << "kdeprint: print command: " << cmd << endl; + kdDebug(500) << "tdeprint: print command: " << cmd << endl; int result = 0; DCOPClient *dclient = kapp->dcopClient(); @@ -209,7 +209,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool arg << cmd; arg << files; arg << removeflag; - if (dclient->call( "kded", "kdeprintd", "print(TQString,TQStringList,bool)", data, replyType, replyData )) + if (dclient->call( "kded", "tdeprintd", "print(TQString,TQStringList,bool)", data, replyType, replyData )) { if (replyType == "int") { @@ -222,7 +222,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) { - kdDebug(500) << "kdeprint: status message: " << msg << endl; + kdDebug(500) << "tdeprint: status message: " << msg << endl; KConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); if (!conf->readBoolEntry("ShowStatusMsg", true)) @@ -243,7 +243,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) arg << message; arg << (int)getpid(); arg << kapp->caption(); - dclient->send( "kded", "kdeprintd", "statusMessage(TQString,int,TQString)", data ); + dclient->send( "kded", "tdeprintd", "statusMessage(TQString,int,TQString)", data ); } bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const TQStringList& files, bool flag) @@ -278,7 +278,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T { TQString msg = i18n("Unable to start child print process. "); if (pid == 0) - msg += i18n("The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this server is running."); + msg += i18n("The KDE print server (<b>tdeprintd</b>) could not be contacted. Check that this server is running."); else msg += i18n("1 is the command that <files> is given to", "Check the command syntax:\n%1 <files>").arg(cmd); printer->setErrorMessage(msg); @@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile() { TQString f; // be sure the file doesn't exist - do f = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); + do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); return f; } @@ -372,7 +372,7 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ return -1; } } - kdDebug(500) << "kdeprint: filter command: " << filtercmd << endl; + kdDebug(500) << "tdeprint: filter command: " << filtercmd << endl; TQString rin("%in"), rout("%out"), rpsl("%psl"), rpsu("%psu"); TQString ps = pageSizeToPageName( printer->option( "kde-printsize" ).isEmpty() ? printer->pageSize() : ( KPrinter::PageSize )printer->option( "kde-printsize" ).toInt() ); @@ -508,7 +508,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool TQString::null, i18n("Convert"), i18n("Keep"), - TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) + TQString::tqfromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes) { // find the filter chain TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType); diff --git a/kdeprint/kprinterimpl.h b/kdeprint/kprinterimpl.h index b06d77706..618d9a429 100644 --- a/kdeprint/kprinterimpl.h +++ b/kdeprint/kprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprinterpropertydialog.cpp b/kdeprint/kprinterpropertydialog.cpp index d2036bcf1..1128a7d3a 100644 --- a/kdeprint/kprinterpropertydialog.cpp +++ b/kdeprint/kprinterpropertydialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kprinterpropertydialog.h b/kdeprint/kprinterpropertydialog.h index 9264ea0d1..98a37d8bd 100644 --- a/kdeprint/kprinterpropertydialog.h +++ b/kdeprint/kprinterpropertydialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprintpreview.cpp b/kdeprint/kprintpreview.cpp index 6d385c17c..235472d1f 100644 --- a/kdeprint/kprintpreview.cpp +++ b/kdeprint/kprintpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -106,7 +106,7 @@ public: static KLibFactory* componentFactory() { - kdDebug(500) << "kdeprint: querying trader for 'application/postscript' service" << endl; + kdDebug(500) << "tdeprint: querying trader for 'application/postscript' service" << endl; KLibFactory *factory(0); factory = KLibLoader::self()->factory("libkghostviewpart"); if( factory ) @@ -147,7 +147,7 @@ static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOn KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) : KDialogBase(parent, "PreviewDlg", true, i18n("Print Preview"), 0) { - kdDebug(500) << "kdeprint: creating preview dialog" << endl; + kdDebug(500) << "tdeprint: creating preview dialog" << endl; d = new KPrintPreviewPrivate(this); d->previewonly_ = previewOnly; diff --git a/kdeprint/kprintpreview.h b/kdeprint/kprintpreview.h index 9193bad3e..5fd581fe7 100644 --- a/kdeprint/kprintpreview.h +++ b/kdeprint/kprintpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprintprocess.cpp b/kdeprint/kprintprocess.cpp index f18addde8..fb1df2840 100644 --- a/kdeprint/kprintprocess.cpp +++ b/kdeprint/kprintprocess.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kprintprocess.h b/kdeprint/kprintprocess.h index 13943d05d..976b35afe 100644 --- a/kdeprint/kprintprocess.h +++ b/kdeprint/kprintprocess.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp index 24c0e88df..81dc5d3d5 100644 --- a/kdeprint/kxmlcommand.cpp +++ b/kdeprint/kxmlcommand.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kxmlcommand.h" #include "driver.h" #include "kmfactory.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "driverview.h" #include <tqfile.h> @@ -199,7 +199,7 @@ void KXmlCommand::setComment( const TQString& s ) bool KXmlCommand::isValid() { - return (!locate("data", "kdeprint/filters/"+name()+".desktop").isEmpty()); + return (!locate("data", "tdeprint/filters/"+name()+".desktop").isEmpty()); } void KXmlCommand::check(bool use_xml) @@ -218,7 +218,7 @@ void KXmlCommand::check(bool use_xml) void KXmlCommand::loadDesktop() { - KSimpleConfig conf(locate("data", "kdeprint/filters/"+name()+".desktop")); + KSimpleConfig conf(locate("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("KDE Print Filter Entry"); d->m_description = conf.readEntry("Comment"); d->m_outputMime = conf.readEntry("MimeTypeOut"); @@ -229,7 +229,7 @@ void KXmlCommand::loadDesktop() void KXmlCommand::saveDesktop() { - KSimpleConfig conf(locateLocal("data", "kdeprint/filters/"+name()+".desktop")); + KSimpleConfig conf(locateLocal("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("KDE Print Filter Entry"); conf.writeEntry("Comment", d->m_description); conf.writeEntry("MimeTypeIn", d->m_inputMime); @@ -240,7 +240,7 @@ void KXmlCommand::saveDesktop() void KXmlCommand::loadXml() { - TQFile f(locate("data", "kdeprint/filters/"+name()+".xml")); + TQFile f(locate("data", "tdeprint/filters/"+name()+".xml")); TQDomDocument doc; if (f.open(IO_ReadOnly) && doc.setContent(&f) && doc.documentElement().tagName() == "kprintfilter") { @@ -425,7 +425,7 @@ void KXmlCommand::getOptions(TQMap<TQString,TQString>& opts, bool incldef) void KXmlCommand::saveXml() { - TQFile f(locateLocal("data", "kdeprint/filters/"+name()+".xml")); + TQFile f(locateLocal("data", "tdeprint/filters/"+name()+".xml")); if (!f.open(IO_WriteOnly)) return; @@ -576,7 +576,7 @@ KXmlCommand* KXmlCommandManager::loadCommand(const TQString& xmlId, bool check) { if (check) { - TQString desktopFile = locate("data", "kdeprint/filters/"+xmlId+".desktop"); + TQString desktopFile = locate("data", "tdeprint/filters/"+xmlId+".desktop"); if (desktopFile.isEmpty()) return 0; } @@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList() { if (d->m_cmdlist.isEmpty()) { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kdeprint/filters/"); + TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/"); for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) { diff --git a/kdeprint/kxmlcommand.h b/kdeprint/kxmlcommand.h index e24266f49..a0ba90c56 100644 --- a/kdeprint/kxmlcommand.h +++ b/kdeprint/kxmlcommand.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/Makefile.am b/kdeprint/lpd/Makefile.am index 7230fba1b..5c6559a27 100644 --- a/kdeprint/lpd/Makefile.am +++ b/kdeprint/lpd/Makefile.am @@ -1,18 +1,18 @@ -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes) -kde_module_LTLIBRARIES = kdeprint_lpd.la +kde_module_LTLIBRARIES = tdeprint_lpd.la -kdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \ +tdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \ lpdtools.cpp gschecker.cpp -kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la -kdeprint_lpd_la_METASOURCES = AUTO +tdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_lpd_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la +tdeprint_lpd_la_METASOURCES = AUTO noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h bin_PROGRAMS = make_driver_db_lpd make_driver_db_lpd_SOURCES = make_driver_db_lpd.c -make_driver_db_lpd_LDADD = $(top_builddir)/kdecore/libtdefakes.la +make_driver_db_lpd_LDADD = $(top_builddir)/tdecore/libtdefakes.la entry_DATA = lpd.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp index 23f6be0a6..9fe6e290b 100644 --- a/kdeprint/lpd/gschecker.cpp +++ b/kdeprint/lpd/gschecker.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/gschecker.h b/kdeprint/lpd/gschecker.h index 1814ca1d7..c3c23a5be 100644 --- a/kdeprint/lpd/gschecker.h +++ b/kdeprint/lpd/gschecker.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/klpdprinterimpl.cpp b/kdeprint/lpd/klpdprinterimpl.cpp index 8b365cbd1..59f04e74c 100644 --- a/kdeprint/lpd/klpdprinterimpl.cpp +++ b/kdeprint/lpd/klpdprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/klpdprinterimpl.h b/kdeprint/lpd/klpdprinterimpl.h index 654c2606e..a757d0c8c 100644 --- a/kdeprint/lpd/klpdprinterimpl.h +++ b/kdeprint/lpd/klpdprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/kmlpdfactory.cpp b/kdeprint/lpd/kmlpdfactory.cpp index a1882c3ca..05ee61bd5 100644 --- a/kdeprint/lpd/kmlpdfactory.cpp +++ b/kdeprint/lpd/kmlpdfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ extern "C" { - void* init_kdeprint_lpd() + void* init_tdeprint_lpd() { return new KLpdFactory; } diff --git a/kdeprint/lpd/kmlpdfactory.h b/kdeprint/lpd/kmlpdfactory.h index 924c48b81..ffc05af71 100644 --- a/kdeprint/lpd/kmlpdfactory.h +++ b/kdeprint/lpd/kmlpdfactory.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp index 54f6c312a..a5612ad58 100644 --- a/kdeprint/lpd/kmlpdmanager.cpp +++ b/kdeprint/lpd/kmlpdmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/kmlpdmanager.h b/kdeprint/lpd/kmlpdmanager.h index 0af2d1e15..3c2291017 100644 --- a/kdeprint/lpd/kmlpdmanager.h +++ b/kdeprint/lpd/kmlpdmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/kmlpduimanager.cpp b/kdeprint/lpd/kmlpduimanager.cpp index be243c688..fad3fcd58 100644 --- a/kdeprint/lpd/kmlpduimanager.cpp +++ b/kdeprint/lpd/kmlpduimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/kmlpduimanager.h b/kdeprint/lpd/kmlpduimanager.h index 0483df181..7aca6ed1d 100644 --- a/kdeprint/lpd/kmlpduimanager.h +++ b/kdeprint/lpd/kmlpduimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp index ba96f31a0..610e8ead5 100644 --- a/kdeprint/lpd/lpdtools.cpp +++ b/kdeprint/lpd/lpdtools.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/lpdtools.h b/kdeprint/lpd/lpdtools.h index 3592437e6..692dd0fa2 100644 --- a/kdeprint/lpd/lpdtools.h +++ b/kdeprint/lpd/lpdtools.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpd/make_driver_db_lpd.c b/kdeprint/lpd/make_driver_db_lpd.c index e907dbf2c..02aced962 100644 --- a/kdeprint/lpd/make_driver_db_lpd.c +++ b/kdeprint/lpd/make_driver_db_lpd.c @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpdunix/CMakeLists.txt b/kdeprint/lpdunix/CMakeLists.txt index 5816af6ab..5b30cf46c 100644 --- a/kdeprint/lpdunix/CMakeLists.txt +++ b/kdeprint/lpdunix/CMakeLists.txt @@ -18,12 +18,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -33,12 +33,12 @@ link_directories( ##### other data ################################ -install( FILES lpdunix.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) +install( FILES lpdunix.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) -#### kdeprint_lpdunix ########################### +#### tdeprint_lpdunix ########################### -set( target kdeprint_lpdunix ) +set( target tdeprint_lpdunix ) set( ${target}_SRCS kmlpdunixfactory.cpp kmlpdunixmanager.cpp @@ -47,6 +47,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/lpdunix/Makefile.am b/kdeprint/lpdunix/Makefile.am index 89b08d839..019ead755 100644 --- a/kdeprint/lpdunix/Makefile.am +++ b/kdeprint/lpdunix/Makefile.am @@ -1,15 +1,15 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes) -kde_module_LTLIBRARIES = kdeprint_lpdunix.la +kde_module_LTLIBRARIES = tdeprint_lpdunix.la -kdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp -kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) -kdeprint_lpdunix_la_METASOURCES = AUTO +tdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp +tdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) +tdeprint_lpdunix_la_METASOURCES = AUTO noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h entry_DATA = lpdunix.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/lpdunix/klpdunixprinterimpl.cpp b/kdeprint/lpdunix/klpdunixprinterimpl.cpp index 8a680ae6e..9ba97efae 100644 --- a/kdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/kdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpdunix/klpdunixprinterimpl.h b/kdeprint/lpdunix/klpdunixprinterimpl.h index cc16f10f2..bbbda4104 100644 --- a/kdeprint/lpdunix/klpdunixprinterimpl.h +++ b/kdeprint/lpdunix/klpdunixprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpdunix/kmlpdunixfactory.cpp b/kdeprint/lpdunix/kmlpdunixfactory.cpp index 8ebb19f22..70925a65c 100644 --- a/kdeprint/lpdunix/kmlpdunixfactory.cpp +++ b/kdeprint/lpdunix/kmlpdunixfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,6 +24,6 @@ #include <kgenericfactory.h> typedef K_TYPELIST_3( KMLpdUnixManager, KLpdUnixPrinterImpl, KMLpdUnixUiManager ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_lpdunix, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_lpdunix, KGenericFactory< Products > ) diff --git a/kdeprint/lpdunix/kmlpdunixmanager.cpp b/kdeprint/lpdunix/kmlpdunixmanager.cpp index 8e757a706..afcd83b2a 100644 --- a/kdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/kdeprint/lpdunix/kmlpdunixmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpdunix/kmlpdunixmanager.h b/kdeprint/lpdunix/kmlpdunixmanager.h index 7abc91752..8716f8351 100644 --- a/kdeprint/lpdunix/kmlpdunixmanager.h +++ b/kdeprint/lpdunix/kmlpdunixmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpdunix/kmlpdunixuimanager.cpp b/kdeprint/lpdunix/kmlpdunixuimanager.cpp index 5dc281c85..686dfecbb 100644 --- a/kdeprint/lpdunix/kmlpdunixuimanager.cpp +++ b/kdeprint/lpdunix/kmlpdunixuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpdunix/kmlpdunixuimanager.h b/kdeprint/lpdunix/kmlpdunixuimanager.h index 23616e511..6e9e0d2ef 100644 --- a/kdeprint/lpdunix/kmlpdunixuimanager.h +++ b/kdeprint/lpdunix/kmlpdunixuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/CMakeLists.txt b/kdeprint/lpr/CMakeLists.txt index 56de888b9..c893411b1 100644 --- a/kdeprint/lpr/CMakeLists.txt +++ b/kdeprint/lpr/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint - ${CMAKE_SOURCE_DIR}/kdeprint/management + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint + ${CMAKE_SOURCE_DIR}/tdeprint/management ) link_directories( @@ -36,18 +36,18 @@ link_directories( install( FILES printcapentry.h lprhandler.h lprsettings.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint/lpr ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint/lpr ) ##### other data ################################ -install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) -install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) +install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) +install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) -#### kdeprint_lpr ############################### +#### tdeprint_lpr ############################### -set( target kdeprint_lpr ) +set( target tdeprint_lpr ) set( ${target}_SRCS printcapreader.cpp lprhandler.cpp matichandler.cpp @@ -60,7 +60,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -75,6 +75,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static kdefakes-shared ${DL_LIBRARIES} + LINK driverparse-static tdefakes-shared ${DL_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/lpr/Makefile.am b/kdeprint/lpr/Makefile.am index cb40661f9..a9039888f 100644 --- a/kdeprint/lpr/Makefile.am +++ b/kdeprint/lpr/Makefile.am @@ -1,10 +1,10 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes) -kde_module_LTLIBRARIES = kdeprint_lpr.la +kde_module_LTLIBRARIES = tdeprint_lpr.la -kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \ +tdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \ matichandler.cpp klprfactory.cpp kmlprmanager.cpp \ kmlpruimanager.cpp lpchelper.cpp lpqhelper.cpp \ kmlprjobmanager.cpp matichelper.cpp \ @@ -12,10 +12,10 @@ kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \ lprsettings.cpp kmconfiglpr.cpp apshandler.cpp \ lprngtoolhandler.cpp \ editentrydialog.cpp -kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la \ +tdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_lpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la \ $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) -kdeprint_lpr_la_METASOURCES = AUTO +tdeprint_lpr_la_METASOURCES = AUTO noinst_HEADERS = printcapreader.h \ matichandler.h kmlprmanager.h \ @@ -25,16 +25,16 @@ noinst_HEADERS = printcapreader.h \ lprngtoolhandler.h \ editentrydialog.h -kdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h -kdeprintlprdir = $(includedir)/kdeprint/lpr +tdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h +tdeprintlprdir = $(includedir)/tdeprint/lpr bin_PROGRAMS = make_driver_db_lpr make_driver_db_lpr_SOURCES = make_driver_db_lpr.c make_driver_db_lpr_LDFLAGS = $(all_libraries) -make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libtdefakes.la ../libdriverparse.a $(LIBDL) +make_driver_db_lpr_LDADD = $(top_builddir)/tdecore/libtdefakes.la ../libdriverparse.a $(LIBDL) entry_DATA = lpr.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins miscdata_DATA = apsdriver1 apsdriver2 lprngtooldriver1 -miscdatadir = $(kde_datadir)/kdeprint +miscdatadir = $(kde_datadir)/tdeprint diff --git a/kdeprint/lpr/apshandler.cpp b/kdeprint/lpr/apshandler.cpp index 641ff5e07..d4107d7c7 100644 --- a/kdeprint/lpr/apshandler.cpp +++ b/kdeprint/lpr/apshandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -196,7 +196,7 @@ DrMain* ApsHandler::loadDbDriver(const TQString& s) DrMain* ApsHandler::loadApsDriver(bool config) { - DrMain *driver = loadToolDriver(locate("data", (config ? "kdeprint/apsdriver1" : "kdeprint/apsdriver2"))); + DrMain *driver = loadToolDriver(locate("data", (config ? "tdeprint/apsdriver1" : "tdeprint/apsdriver2"))); if (driver) driver->set("text", "APS Common Driver"); return driver; diff --git a/kdeprint/lpr/apshandler.h b/kdeprint/lpr/apshandler.h index 02ee79c92..db213d194 100644 --- a/kdeprint/lpr/apshandler.h +++ b/kdeprint/lpr/apshandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/editentrydialog.cpp b/kdeprint/lpr/editentrydialog.cpp index 9029a6736..6c4ecc30c 100644 --- a/kdeprint/lpr/editentrydialog.cpp +++ b/kdeprint/lpr/editentrydialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/editentrydialog.h b/kdeprint/lpr/editentrydialog.h index c51152627..f4359dd89 100644 --- a/kdeprint/lpr/editentrydialog.h +++ b/kdeprint/lpr/editentrydialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/klprfactory.cpp b/kdeprint/lpr/klprfactory.cpp index 86666981e..4764dfc6a 100644 --- a/kdeprint/lpr/klprfactory.cpp +++ b/kdeprint/lpr/klprfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,5 +25,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_4( KMLprManager, KMLprUiManager, KMLprJobManager, KLprPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_lpr, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_lpr, KGenericFactory< Products > ) diff --git a/kdeprint/lpr/klprprinterimpl.cpp b/kdeprint/lpr/klprprinterimpl.cpp index 9f0956ff3..70356f23c 100644 --- a/kdeprint/lpr/klprprinterimpl.cpp +++ b/kdeprint/lpr/klprprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/klprprinterimpl.h b/kdeprint/lpr/klprprinterimpl.h index ca346ab8a..508173f1d 100644 --- a/kdeprint/lpr/klprprinterimpl.h +++ b/kdeprint/lpr/klprprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/kmconfiglpr.cpp b/kdeprint/lpr/kmconfiglpr.cpp index f9f51b46d..f43a8da2d 100644 --- a/kdeprint/lpr/kmconfiglpr.cpp +++ b/kdeprint/lpr/kmconfiglpr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/kmconfiglpr.h b/kdeprint/lpr/kmconfiglpr.h index 1f88d9fb7..7f3d50857 100644 --- a/kdeprint/lpr/kmconfiglpr.h +++ b/kdeprint/lpr/kmconfiglpr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/kmlprjobmanager.cpp b/kdeprint/lpr/kmlprjobmanager.cpp index 67e7a4001..851663664 100644 --- a/kdeprint/lpr/kmlprjobmanager.cpp +++ b/kdeprint/lpr/kmlprjobmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/kmlprjobmanager.h b/kdeprint/lpr/kmlprjobmanager.h index 83d65a296..d9a8eae3f 100644 --- a/kdeprint/lpr/kmlprjobmanager.h +++ b/kdeprint/lpr/kmlprjobmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/kmlprmanager.cpp b/kdeprint/lpr/kmlprmanager.cpp index 64e593590..cf4dbbb94 100644 --- a/kdeprint/lpr/kmlprmanager.cpp +++ b/kdeprint/lpr/kmlprmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -137,7 +137,7 @@ void KMLprManager::initHandlers() insertHandler(new LPRngToolHandler(this)); // now load external handlers - TQStringList l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.la"); + TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); @@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt) void KMLprManager::createPluginActions(KActionCollection *coll) { - KAction *act = new KAction(i18n("&Edit printcap Entry..."), "kdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); + KAction *act = new KAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); act->setGroup("plugin"); } diff --git a/kdeprint/lpr/kmlprmanager.h b/kdeprint/lpr/kmlprmanager.h index d95fb7db5..34d38340f 100644 --- a/kdeprint/lpr/kmlprmanager.h +++ b/kdeprint/lpr/kmlprmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/kmlpruimanager.cpp b/kdeprint/lpr/kmlpruimanager.cpp index ea48c9bf9..655309e0c 100644 --- a/kdeprint/lpr/kmlpruimanager.cpp +++ b/kdeprint/lpr/kmlpruimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/kmlpruimanager.h b/kdeprint/lpr/kmlpruimanager.h index e7e015e2a..561f93500 100644 --- a/kdeprint/lpr/kmlpruimanager.h +++ b/kdeprint/lpr/kmlpruimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lpchelper.cpp b/kdeprint/lpr/lpchelper.cpp index 7cf0bfebf..c921a803c 100644 --- a/kdeprint/lpr/lpchelper.cpp +++ b/kdeprint/lpr/lpchelper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lpchelper.h b/kdeprint/lpr/lpchelper.h index 8f2590065..b1e20f089 100644 --- a/kdeprint/lpr/lpchelper.h +++ b/kdeprint/lpr/lpchelper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lpqhelper.cpp b/kdeprint/lpr/lpqhelper.cpp index 3bd1c514b..30348f591 100644 --- a/kdeprint/lpr/lpqhelper.cpp +++ b/kdeprint/lpr/lpqhelper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lpqhelper.h b/kdeprint/lpr/lpqhelper.h index 59965fb62..2c38566c5 100644 --- a/kdeprint/lpr/lpqhelper.h +++ b/kdeprint/lpr/lpqhelper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lprhandler.cpp b/kdeprint/lpr/lprhandler.cpp index d3fc4ee94..fcb838bb9 100644 --- a/kdeprint/lpr/lprhandler.cpp +++ b/kdeprint/lpr/lprhandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lprhandler.h b/kdeprint/lpr/lprhandler.h index eaab2557f..e0e66e146 100644 --- a/kdeprint/lpr/lprhandler.h +++ b/kdeprint/lpr/lprhandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lprngtoolhandler.cpp b/kdeprint/lpr/lprngtoolhandler.cpp index 2d94e9b18..1d76cf2f5 100644 --- a/kdeprint/lpr/lprngtoolhandler.cpp +++ b/kdeprint/lpr/lprngtoolhandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -163,7 +163,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool return NULL; } - DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); + DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1")); if (driver) { TQString model = prt->option("driverID"); @@ -183,7 +183,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool DrMain* LPRngToolHandler::loadDbDriver(const TQString& s) { int p = s.find('/'); - DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); + DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1")); if (driver) driver->set("driverID", s.mid(p+1)); return driver; @@ -231,7 +231,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr) return opts; if (m_dict.count() == 0) - m_dict = loadChoiceDict(locate("data", "kdeprint/lprngtooldriver1")); + m_dict = loadChoiceDict(locate("data", "tdeprint/lprngtooldriver1")); TQString unknown; for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) diff --git a/kdeprint/lpr/lprngtoolhandler.h b/kdeprint/lpr/lprngtoolhandler.h index e8843dc64..49641ca3a 100644 --- a/kdeprint/lpr/lprngtoolhandler.h +++ b/kdeprint/lpr/lprngtoolhandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lprsettings.cpp b/kdeprint/lpr/lprsettings.cpp index a1a632a0f..0c1cec2a9 100644 --- a/kdeprint/lpr/lprsettings.cpp +++ b/kdeprint/lpr/lprsettings.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/lprsettings.h b/kdeprint/lpr/lprsettings.h index 419ec46d1..01abbeeb3 100644 --- a/kdeprint/lpr/lprsettings.h +++ b/kdeprint/lpr/lprsettings.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,7 +25,7 @@ #endif #include <tqobject.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> /** * @internal diff --git a/kdeprint/lpr/matichandler.cpp b/kdeprint/lpr/matichandler.cpp index bd3307ad5..ef2f1584b 100644 --- a/kdeprint/lpr/matichandler.cpp +++ b/kdeprint/lpr/matichandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/matichandler.h b/kdeprint/lpr/matichandler.h index db376f264..e30eee39e 100644 --- a/kdeprint/lpr/matichandler.h +++ b/kdeprint/lpr/matichandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/matichelper.cpp b/kdeprint/lpr/matichelper.cpp index 1da5f6313..ec0041b7c 100644 --- a/kdeprint/lpr/matichelper.cpp +++ b/kdeprint/lpr/matichelper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/matichelper.h b/kdeprint/lpr/matichelper.h index 622dd06aa..5a2b64fe3 100644 --- a/kdeprint/lpr/matichelper.h +++ b/kdeprint/lpr/matichelper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/printcapentry.cpp b/kdeprint/lpr/printcapentry.cpp index 3f3af643b..9c83537e4 100644 --- a/kdeprint/lpr/printcapentry.cpp +++ b/kdeprint/lpr/printcapentry.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/printcapentry.h b/kdeprint/lpr/printcapentry.h index a7f2cabcf..f8ba99197 100644 --- a/kdeprint/lpr/printcapentry.h +++ b/kdeprint/lpr/printcapentry.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/printcapreader.cpp b/kdeprint/lpr/printcapreader.cpp index 72a6e2903..00016c14f 100644 --- a/kdeprint/lpr/printcapreader.cpp +++ b/kdeprint/lpr/printcapreader.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/lpr/printcapreader.h b/kdeprint/lpr/printcapreader.h index 51aac90d1..2236e5068 100644 --- a/kdeprint/lpr/printcapreader.h +++ b/kdeprint/lpr/printcapreader.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/CMakeLists.txt b/kdeprint/management/CMakeLists.txt index c9fe6a5a9..0e12299e6 100644 --- a/kdeprint/management/CMakeLists.txt +++ b/kdeprint/management/CMakeLists.txt @@ -18,16 +18,16 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -40,19 +40,19 @@ link_directories( install( FILES kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint ) ##### other data ################################ install( FILES tileup.png tiledown.png side.png - DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) -#### kdeprint_management ######################## +#### tdeprint_management ######################## -set( target kdeprint_management ) +set( target tdeprint_management ) set( ${target}_SRCS kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp @@ -77,7 +77,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -87,12 +87,12 @@ tde_add_library( ${target} SHARED AUTOMOC set( target libtdeprint_management_module ) set( ${target}_SRCS - kdeprint_management_module.cpp + tdeprint_management_module.cpp ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -105,7 +105,7 @@ set( ${target}_SRCS kaddprinterwizard.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint-shared + LINK tdeprint-shared ) diff --git a/kdeprint/management/Makefile.am b/kdeprint/management/Makefile.am index 0cc693b68..34f8de935 100644 --- a/kdeprint/management/Makefile.am +++ b/kdeprint/management/Makefile.am @@ -1,10 +1,10 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) +INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = libtdeprint_management.la kde_module_LTLIBRARIES = libtdeprint_management_module.la -kdeinit_LTLIBRARIES = kaddprinterwizard.la +tdeinit_LTLIBRARIES = kaddprinterwizard.la bin_PROGRAMS = kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp @@ -29,12 +29,12 @@ libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-und libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) libtdeprint_management_la_METASOURCES = AUTO -libtdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp +libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) -kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h -kdeprintdir = $(includedir)/kdeprint +tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h +tdeprintdir = $(includedir)/tdeprint noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \ kminfopage.h kmmainview.h kmpages.h \ @@ -48,5 +48,5 @@ noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \ kmconfigfilter.h kmconfigfonts.h kmconfigjobs.h networkscanner.h dataicon_DATA = tileup.png tiledown.png side.png -dataicondir = $(kde_datadir)/kdeprint +dataicondir = $(kde_datadir)/tdeprint diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp index 4163a87fe..af04ee170 100644 --- a/kdeprint/management/cjanuswidget.cpp +++ b/kdeprint/management/cjanuswidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h index 6deec3149..d33be1499 100644 --- a/kdeprint/management/cjanuswidget.h +++ b/kdeprint/management/cjanuswidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/jobitem.cpp b/kdeprint/management/jobitem.cpp index 171a91657..a9ce2fe85 100644 --- a/kdeprint/management/jobitem.cpp +++ b/kdeprint/management/jobitem.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/jobitem.h b/kdeprint/management/jobitem.h index 31c7923d8..580a1b84f 100644 --- a/kdeprint/management/jobitem.h +++ b/kdeprint/management/jobitem.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kdeprint_management_module.cpp b/kdeprint/management/kdeprint_management_module.cpp index 70c7b4cfd..8d4027f75 100644 --- a/kdeprint/management/kdeprint_management_module.cpp +++ b/kdeprint/management/kdeprint_management_module.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * Copyright (C) 2004 Dominique Devriese <devriese@kde.org> * * This library is free software; you can redistribute it and/or @@ -34,7 +34,7 @@ extern "C" { KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent) { - return kdeprint_management_add_printer_wizard( parent ); + return tdeprint_management_add_printer_wizard( parent ); } KDEPRINT_EXPORT bool config_dialog(TQWidget *parent) diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp index c042213f7..8bf4d5a10 100644 --- a/kdeprint/management/kiconselectaction.cpp +++ b/kdeprint/management/kiconselectaction.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kiconselectaction.h b/kdeprint/management/kiconselectaction.h index dfd6ea17b..84bef60d2 100644 --- a/kdeprint/management/kiconselectaction.h +++ b/kdeprint/management/kiconselectaction.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp index 65d4d34f4..32fb7db11 100644 --- a/kdeprint/management/kmconfigcommand.cpp +++ b/kdeprint/management/kmconfigcommand.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigcommand.h b/kdeprint/management/kmconfigcommand.h index 2ec662d95..203e6fd3a 100644 --- a/kdeprint/management/kmconfigcommand.h +++ b/kdeprint/management/kmconfigcommand.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigdialog.cpp b/kdeprint/management/kmconfigdialog.cpp index f2ddf7b57..3bd89a751 100644 --- a/kdeprint/management/kmconfigdialog.cpp +++ b/kdeprint/management/kmconfigdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigdialog.h b/kdeprint/management/kmconfigdialog.h index ed60378c5..de04bc154 100644 --- a/kdeprint/management/kmconfigdialog.h +++ b/kdeprint/management/kmconfigdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp index 967a67908..29d5107e0 100644 --- a/kdeprint/management/kmconfigfilter.cpp +++ b/kdeprint/management/kmconfigfilter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigfilter.h b/kdeprint/management/kmconfigfilter.h index b69f10c08..9571f0d54 100644 --- a/kdeprint/management/kmconfigfilter.h +++ b/kdeprint/management/kmconfigfilter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp index e5f47de3b..183d0b621 100644 --- a/kdeprint/management/kmconfigfonts.cpp +++ b/kdeprint/management/kmconfigfonts.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigfonts.h b/kdeprint/management/kmconfigfonts.h index 1d1483ed7..a93a26d75 100644 --- a/kdeprint/management/kmconfigfonts.h +++ b/kdeprint/management/kmconfigfonts.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp index 96e8668de..40d187c3c 100644 --- a/kdeprint/management/kmconfiggeneral.cpp +++ b/kdeprint/management/kmconfiggeneral.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfiggeneral.h b/kdeprint/management/kmconfiggeneral.h index 23739a152..8fc6fa5ab 100644 --- a/kdeprint/management/kmconfiggeneral.h +++ b/kdeprint/management/kmconfiggeneral.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp index f70b1a33f..1088e1b3a 100644 --- a/kdeprint/management/kmconfigjobs.cpp +++ b/kdeprint/management/kmconfigjobs.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigjobs.h b/kdeprint/management/kmconfigjobs.h index 73d6274ba..34be5b1ef 100644 --- a/kdeprint/management/kmconfigjobs.h +++ b/kdeprint/management/kmconfigjobs.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigpage.cpp b/kdeprint/management/kmconfigpage.cpp index b31575d33..fb967e05d 100644 --- a/kdeprint/management/kmconfigpage.cpp +++ b/kdeprint/management/kmconfigpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigpage.h b/kdeprint/management/kmconfigpage.h index 596b8c5ec..d56fbde8b 100644 --- a/kdeprint/management/kmconfigpage.h +++ b/kdeprint/management/kmconfigpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp index aa030019b..cd777ec7a 100644 --- a/kdeprint/management/kmconfigpreview.cpp +++ b/kdeprint/management/kmconfigpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmconfigpreview.h b/kdeprint/management/kmconfigpreview.h index 359fcb227..a9c826c98 100644 --- a/kdeprint/management/kmconfigpreview.h +++ b/kdeprint/management/kmconfigpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp index 7bdefbe0e..1a89d0a8e 100644 --- a/kdeprint/management/kmdbcreator.cpp +++ b/kdeprint/management/kmdbcreator.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h index 8b076e517..319d270c0 100644 --- a/kdeprint/management/kmdbcreator.h +++ b/kdeprint/management/kmdbcreator.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp index 973be686e..6fbab45ec 100644 --- a/kdeprint/management/kmdriverdb.cpp +++ b/kdeprint/management/kmdriverdb.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB() TQString KMDriverDB::dbFile() { // this calls insure missing directories creation - TQString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); + TQString filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); return filename; } diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h index 3913d74ef..c5af6d53e 100644 --- a/kdeprint/management/kmdriverdb.h +++ b/kdeprint/management/kmdriverdb.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp index e8a00c44d..e9c490206 100644 --- a/kdeprint/management/kmdriverdbwidget.cpp +++ b/kdeprint/management/kmdriverdbwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmdriverdbwidget.h b/kdeprint/management/kmdriverdbwidget.h index 27d8dcb6a..05b50536d 100644 --- a/kdeprint/management/kmdriverdbwidget.h +++ b/kdeprint/management/kmdriverdbwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmdriverdialog.cpp b/kdeprint/management/kmdriverdialog.cpp index 2e79a8c6f..ef37e333c 100644 --- a/kdeprint/management/kmdriverdialog.cpp +++ b/kdeprint/management/kmdriverdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmdriverdialog.h b/kdeprint/management/kmdriverdialog.h index 8720213d7..8b7b01c45 100644 --- a/kdeprint/management/kmdriverdialog.h +++ b/kdeprint/management/kmdriverdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp index 7afaf1537..1fa5a6da9 100644 --- a/kdeprint/management/kmiconview.cpp +++ b/kdeprint/management/kmiconview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h index 1c3aeb542..1fd6fbbda 100644 --- a/kdeprint/management/kmiconview.h +++ b/kdeprint/management/kmiconview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp index c8c80117c..ad43f1ccb 100644 --- a/kdeprint/management/kminfopage.cpp +++ b/kdeprint/management/kminfopage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kminfopage.h b/kdeprint/management/kminfopage.h index b0dd3a935..591fdbfe8 100644 --- a/kdeprint/management/kminfopage.h +++ b/kdeprint/management/kminfopage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp index a2d024546..25c037516 100644 --- a/kdeprint/management/kminstancepage.cpp +++ b/kdeprint/management/kminstancepage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kminstancepage.h b/kdeprint/management/kminstancepage.h index 3b8931100..7a3075d73 100644 --- a/kdeprint/management/kminstancepage.h +++ b/kdeprint/management/kminstancepage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp index 508595998..7f168faed 100644 --- a/kdeprint/management/kmjobviewer.cpp +++ b/kdeprint/management/kmjobviewer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -128,7 +128,7 @@ void KMJobViewer::setPrinter(const TQString& prname) { // We need to trigger a refresh even if the printer // has not changed, some jobs may have been canceled - // outside kdeprint. We can't return simply if + // outside tdeprint. We can't return simply if // prname == m_prname. if (m_prname != prname) { @@ -298,7 +298,7 @@ void KMJobViewer::initActions() } // Filter actions - KActionMenu *fact = new KActionMenu(i18n("&Select Printer"), "kdeprint_printer", actionCollection(), "filter_modify"); + KActionMenu *fact = new KActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify"); fact->setDelayed(false); connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); diff --git a/kdeprint/management/kmjobviewer.h b/kdeprint/management/kmjobviewer.h index a8ac7d0af..650fe4b15 100644 --- a/kdeprint/management/kmjobviewer.h +++ b/kdeprint/management/kmjobviewer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp index b9e4b738b..72d6872cb 100644 --- a/kdeprint/management/kmlistview.cpp +++ b/kdeprint/management/kmlistview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -123,7 +123,7 @@ KMListView::KMListView(TQWidget *parent, const char *name) connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport())); m_root = new KMListViewItem(this,i18n("Print System")); - m_root->setPixmap(0,SmallIcon("kdeprint_printer")); + m_root->setPixmap(0,SmallIcon("tdeprint_printer")); m_root->setOpen(true); m_classes = new KMListViewItem(m_root,i18n("Classes")); m_classes->setPixmap(0,SmallIcon("package")); diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h index 9f5b24b46..20ddc5731 100644 --- a/kdeprint/management/kmlistview.h +++ b/kdeprint/management/kmlistview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp index a1a63d61f..f5f905af3 100644 --- a/kdeprint/management/kmmainview.cpp +++ b/kdeprint/management/kmmainview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -60,7 +60,7 @@ #undef m_manager #define m_manager KMFactory::self()->manager() -int kdeprint_management_add_printer_wizard( TQWidget* parent ) +int tdeprint_management_add_printer_wizard( TQWidget* parent ) { KMWizard dlg(parent); int flag(0); @@ -181,24 +181,24 @@ void KMMainView::initActions() vact->setCurrentItem(0); connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); - KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "kdeprint_printstate", m_actions, "printer_state_change"); + KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new KAction(i18n("&Start Printer"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new KAction(i18n("Sto&p Printer"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new KAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new KAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); - stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "kdeprint_queuestate", m_actions, "printer_spool_change"); + stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); new KAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); new KAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); - new KAction(i18n("Add &Printer/Class..."),"kdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); - new KAction(i18n("Add &Special (pseudo) Printer..."),"kdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new KAction(i18n("Set as &Local Default"),"kdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new KAction(i18n("Set as &User Default"),"kdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new KAction(i18n("&Test Printer..."),"kdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); - new KAction(i18n("Configure &Manager..."),"kdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new KAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); + new KAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new KAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new KAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new KAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); + new KAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); new KAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); KIconSelectAction *dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); @@ -208,9 +208,9 @@ void KMMainView::initActions() dact->setCurrentItem(0); connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); - new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); - new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); - new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure"); + new KAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); + new KAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new KAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure"); KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); @@ -218,8 +218,8 @@ void KMMainView::initActions() tact = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); tact->setCheckedState(i18n("Hide Me&nu Toolbar")); connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); - tact = new KToggleAction(i18n("Show Pr&inter Details"),"kdeprint_printer_infos", 0,m_actions,"view_printerinfos"); - tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"kdeprint_printer_infos")); + tact = new KToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos"); + tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos")); tact->setChecked(true); connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); @@ -233,7 +233,7 @@ void KMMainView::initActions() KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); mact->setDelayed(false); connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); - TQStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/tools/*.desktop"); + TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { KSimpleConfig conf(*it); @@ -301,7 +301,7 @@ void KMMainView::initActions() m_actions->action("manager_configure")->plug( menu ); m_actions->action("view_refresh")->plug( menu ); //m_menubar->insertItem( i18n( "Manager" ), menu ); - m_menubar->insertButton( "kdeprint_configmgr", 3, true, i18n( "Print Manager" ) ); + m_menubar->insertButton( "tdeprint_configmgr", 3, true, i18n( "Print Manager" ) ); m_menubar->getButton( 3 )->setPopup( menu, true ); menu = new TQPopupMenu( this ); m_actions->action("view_printerinfos")->plug( menu ); @@ -586,7 +586,7 @@ void KMMainView::slotAdd() KMTimer::self()->hold(); int result(0); - if ((result=kdeprint_management_add_printer_wizard(this)) == -1) + if ((result=tdeprint_management_add_printer_wizard(this)) == -1) showErrorMsg(i18n("Unable to create printer.")); KMTimer::self()->release((result == 1)); @@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID) KMTimer::self()->hold(); TQString libname = m_toollist[ID]; - libname.prepend("kdeprint_tool_"); + libname.prepend("tdeprint_tool_"); if (m_current && !m_current->device().isEmpty() && !libname.isEmpty()) { KLibFactory *factory = KLibLoader::self()->factory(libname.local8Bit()); @@ -906,12 +906,12 @@ void KMMainView::slotHelp() { TQString s = TQT_TQOBJECT_CONST(sender())->name(); if ( s == "invoke_help" ) - kapp->invokeHelp( TQString::null, "kdeprint" ); + kapp->invokeHelp( TQString::null, "tdeprint" ); else if ( s == "invoke_web" ) { TQStringList args; args << "exec" << "http://printing.kde.org"; - kapp->kdeinitExec( "kfmclient", args ); + kapp->tdeinitExec( "kfmclient", args ); } else kdDebug( 500 ) << "Unknown help invokator: " << s << endl; diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h index c924b3e90..0d05692d9 100644 --- a/kdeprint/management/kmmainview.h +++ b/kdeprint/management/kmmainview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,7 +25,7 @@ #endif #include <tqwidget.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> #include <kmainwindow.h> class KMManager; @@ -128,6 +128,6 @@ private: KToolBar *m_menubar; }; -KDEPRINT_EXPORT int kdeprint_management_add_printer_wizard( TQWidget* parent ); +KDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent ); #endif diff --git a/kdeprint/management/kmpages.cpp b/kdeprint/management/kmpages.cpp index be7f2f87a..4f0f1f4f7 100644 --- a/kdeprint/management/kmpages.cpp +++ b/kdeprint/management/kmpages.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpages.h b/kdeprint/management/kmpages.h index 75ad4641a..761c8d22d 100644 --- a/kdeprint/management/kmpages.h +++ b/kdeprint/management/kmpages.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmprinterpage.h b/kdeprint/management/kmprinterpage.h index cfce97ec7..25e5b1c12 100644 --- a/kdeprint/management/kmprinterpage.h +++ b/kdeprint/management/kmprinterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp index 5eff6d946..19264a946 100644 --- a/kdeprint/management/kmprinterview.cpp +++ b/kdeprint/management/kmprinterview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h index 0b3a17789..ba1bd38b1 100644 --- a/kdeprint/management/kmprinterview.h +++ b/kdeprint/management/kmprinterview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropbackend.cpp b/kdeprint/management/kmpropbackend.cpp index 7dfdc500d..98004d2ed 100644 --- a/kdeprint/management/kmpropbackend.cpp +++ b/kdeprint/management/kmpropbackend.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropbackend.h b/kdeprint/management/kmpropbackend.h index adcabbdd2..01249d348 100644 --- a/kdeprint/management/kmpropbackend.h +++ b/kdeprint/management/kmpropbackend.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropcontainer.cpp b/kdeprint/management/kmpropcontainer.cpp index 20ab492e7..9c7808199 100644 --- a/kdeprint/management/kmpropcontainer.cpp +++ b/kdeprint/management/kmpropcontainer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropcontainer.h b/kdeprint/management/kmpropcontainer.h index 411bb7134..d191dfeb6 100644 --- a/kdeprint/management/kmpropcontainer.h +++ b/kdeprint/management/kmpropcontainer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropdriver.cpp b/kdeprint/management/kmpropdriver.cpp index 086ccacca..55daf0ed5 100644 --- a/kdeprint/management/kmpropdriver.cpp +++ b/kdeprint/management/kmpropdriver.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropdriver.h b/kdeprint/management/kmpropdriver.h index 6eb8873bf..247431762 100644 --- a/kdeprint/management/kmpropdriver.h +++ b/kdeprint/management/kmpropdriver.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropertypage.cpp b/kdeprint/management/kmpropertypage.cpp index 74341ad9b..e0526ad5a 100644 --- a/kdeprint/management/kmpropertypage.cpp +++ b/kdeprint/management/kmpropertypage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropertypage.h b/kdeprint/management/kmpropertypage.h index 5698beff8..d13338750 100644 --- a/kdeprint/management/kmpropertypage.h +++ b/kdeprint/management/kmpropertypage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,7 +22,7 @@ #include "cjanuswidget.h" #include "kmprinterpage.h" -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> #include <kdelibs_export.h> #include <tqptrlist.h> diff --git a/kdeprint/management/kmpropgeneral.cpp b/kdeprint/management/kmpropgeneral.cpp index f32817fb6..c55603da9 100644 --- a/kdeprint/management/kmpropgeneral.cpp +++ b/kdeprint/management/kmpropgeneral.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropgeneral.h b/kdeprint/management/kmpropgeneral.h index dd2c1cd43..c4e403b86 100644 --- a/kdeprint/management/kmpropgeneral.h +++ b/kdeprint/management/kmpropgeneral.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp index adc3ebbbe..4efbcf547 100644 --- a/kdeprint/management/kmpropmembers.cpp +++ b/kdeprint/management/kmpropmembers.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -35,7 +35,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); main_->addWidget(m_members); - m_pixmap = "kdeprint_printer_class"; + m_pixmap = "tdeprint_printer_class"; m_title = i18n("Members"); m_header = i18n("Class Members"); } diff --git a/kdeprint/management/kmpropmembers.h b/kdeprint/management/kmpropmembers.h index a8e90e6cd..90330681e 100644 --- a/kdeprint/management/kmpropmembers.h +++ b/kdeprint/management/kmpropmembers.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropwidget.cpp b/kdeprint/management/kmpropwidget.cpp index b112c390b..ae8b03cbf 100644 --- a/kdeprint/management/kmpropwidget.cpp +++ b/kdeprint/management/kmpropwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmpropwidget.h b/kdeprint/management/kmpropwidget.h index a9c2b918f..83148bc72 100644 --- a/kdeprint/management/kmpropwidget.h +++ b/kdeprint/management/kmpropwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp index 346e858f4..6569f3f83 100644 --- a/kdeprint/management/kmspecialprinterdlg.cpp +++ b/kdeprint/management/kmspecialprinterdlg.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,7 +19,7 @@ #include "kmspecialprinterdlg.h" #include "kmprinter.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "kmfactory.h" #include "kmspecialmanager.h" #include "kxmlcommandselector.h" diff --git a/kdeprint/management/kmspecialprinterdlg.h b/kdeprint/management/kmspecialprinterdlg.h index 1ff688cf6..bc7497a05 100644 --- a/kdeprint/management/kmspecialprinterdlg.h +++ b/kdeprint/management/kmspecialprinterdlg.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmtimer.cpp b/kdeprint/management/kmtimer.cpp index 099d358f6..1525dd875 100644 --- a/kdeprint/management/kmtimer.cpp +++ b/kdeprint/management/kmtimer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmtimer.h b/kdeprint/management/kmtimer.h index 6dcf962a0..eb40e7957 100644 --- a/kdeprint/management/kmtimer.h +++ b/kdeprint/management/kmtimer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp index d05564115..e39b52f8d 100644 --- a/kdeprint/management/kmwbackend.cpp +++ b/kdeprint/management/kmwbackend.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwbackend.h b/kdeprint/management/kmwbackend.h index 98cf8e7ef..223123b4f 100644 --- a/kdeprint/management/kmwbackend.h +++ b/kdeprint/management/kmwbackend.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp index 2e27db0c9..a87388a6f 100644 --- a/kdeprint/management/kmwclass.cpp +++ b/kdeprint/management/kmwclass.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwclass.h b/kdeprint/management/kmwclass.h index 1fadf45f4..c9b63befb 100644 --- a/kdeprint/management/kmwclass.h +++ b/kdeprint/management/kmwclass.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp index d0a38e17d..58793c192 100644 --- a/kdeprint/management/kmwdriver.cpp +++ b/kdeprint/management/kmwdriver.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwdriver.h b/kdeprint/management/kmwdriver.h index cb49246b6..9eef02069 100644 --- a/kdeprint/management/kmwdriver.h +++ b/kdeprint/management/kmwdriver.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwdriverselect.cpp b/kdeprint/management/kmwdriverselect.cpp index 353fc0861..e3d253660 100644 --- a/kdeprint/management/kmwdriverselect.cpp +++ b/kdeprint/management/kmwdriverselect.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwdriverselect.h b/kdeprint/management/kmwdriverselect.h index 281989074..464a78239 100644 --- a/kdeprint/management/kmwdriverselect.h +++ b/kdeprint/management/kmwdriverselect.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwdrivertest.cpp b/kdeprint/management/kmwdrivertest.cpp index f1b9bc48b..545d3b94d 100644 --- a/kdeprint/management/kmwdrivertest.cpp +++ b/kdeprint/management/kmwdrivertest.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -52,7 +52,7 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) TQLabel *l2 = new TQLabel(i18n("<b>Model:</b>"), this); TQLabel *l3 = new TQLabel(i18n("<b>Description:</b>"), this); - m_test = new KPushButton(KGuiItem(i18n("&Test"), "kdeprint_testprinter"), this); + m_test = new KPushButton(KGuiItem(i18n("&Test"), "tdeprint_testprinter"), this); m_settings = new KPushButton(KGuiItem(i18n("&Settings"), "configure"), this); TQLabel *l0 = new TQLabel(this); diff --git a/kdeprint/management/kmwdrivertest.h b/kdeprint/management/kmwdrivertest.h index 2689e7c22..5c1aefaee 100644 --- a/kdeprint/management/kmwdrivertest.h +++ b/kdeprint/management/kmwdrivertest.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp index 9da4096c6..54294fb13 100644 --- a/kdeprint/management/kmwend.cpp +++ b/kdeprint/management/kmwend.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwend.h b/kdeprint/management/kmwend.h index fa74a6553..626eedf96 100644 --- a/kdeprint/management/kmwend.h +++ b/kdeprint/management/kmwend.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp index 190868d03..32da27c03 100644 --- a/kdeprint/management/kmwfile.cpp +++ b/kdeprint/management/kmwfile.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwfile.h b/kdeprint/management/kmwfile.h index 2e6997372..40e2e2171 100644 --- a/kdeprint/management/kmwfile.h +++ b/kdeprint/management/kmwfile.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwinfobase.cpp b/kdeprint/management/kmwinfobase.cpp index 835042c59..993576334 100644 --- a/kdeprint/management/kmwinfobase.cpp +++ b/kdeprint/management/kmwinfobase.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwinfobase.h b/kdeprint/management/kmwinfobase.h index c33058fe0..9a2b6464e 100644 --- a/kdeprint/management/kmwinfobase.h +++ b/kdeprint/management/kmwinfobase.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwinfopage.cpp b/kdeprint/management/kmwinfopage.cpp index abfa2993c..1e9652e93 100644 --- a/kdeprint/management/kmwinfopage.cpp +++ b/kdeprint/management/kmwinfopage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwinfopage.h b/kdeprint/management/kmwinfopage.h index aefa675fe..346d29401 100644 --- a/kdeprint/management/kmwinfopage.h +++ b/kdeprint/management/kmwinfopage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp index fead7c4e3..5dc915572 100644 --- a/kdeprint/management/kmwizard.cpp +++ b/kdeprint/management/kmwizard.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -244,7 +244,7 @@ void KMWizard::slotNext() void KMWizard::slotHelp() { - kapp->invokeHelp(TQString::null, "kdeprint"); + kapp->invokeHelp(TQString::null, "tdeprint"); } void KMWizard::enableWizard() diff --git a/kdeprint/management/kmwizard.h b/kdeprint/management/kmwizard.h index b23c7b1f3..5a2dcb6ea 100644 --- a/kdeprint/management/kmwizard.h +++ b/kdeprint/management/kmwizard.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwizardpage.cpp b/kdeprint/management/kmwizardpage.cpp index 936a30c87..10149d0f9 100644 --- a/kdeprint/management/kmwizardpage.cpp +++ b/kdeprint/management/kmwizardpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwizardpage.h b/kdeprint/management/kmwizardpage.h index 68f655b2a..61fe938b7 100644 --- a/kdeprint/management/kmwizardpage.h +++ b/kdeprint/management/kmwizardpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp index 3bbaf0eaa..7b56b2deb 100644 --- a/kdeprint/management/kmwlocal.cpp +++ b/kdeprint/management/kmwlocal.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -48,7 +48,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name) m_ports->addColumn(""); m_ports->setSorting(-1); TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); - root->setPixmap(0, SmallIcon("kdeprint_computer")); + root->setPixmap(0, SmallIcon("tdeprint_computer")); root->setOpen(true); connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); TQLabel *l1 = new TQLabel(i18n("URI:"), this); @@ -197,7 +197,7 @@ void KMWLocal::initialize() { TQListViewItem *pItem = new TQListViewItem(last[index], printer); last[index]->setOpen(true); - pItem->setPixmap(0, SmallIcon("kdeprint_printer")); + pItem->setPixmap(0, SmallIcon("tdeprint_printer")); } } m_initialized = true; diff --git a/kdeprint/management/kmwlocal.h b/kdeprint/management/kmwlocal.h index 154984493..681d94e51 100644 --- a/kdeprint/management/kmwlocal.h +++ b/kdeprint/management/kmwlocal.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp index b83c9cb82..cce4c7b5a 100644 --- a/kdeprint/management/kmwlpd.cpp +++ b/kdeprint/management/kmwlpd.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwlpd.h b/kdeprint/management/kmwlpd.h index 16cd70592..674cdff44 100644 --- a/kdeprint/management/kmwlpd.h +++ b/kdeprint/management/kmwlpd.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp index d46b104a7..fe567f7bb 100644 --- a/kdeprint/management/kmwname.cpp +++ b/kdeprint/management/kmwname.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwname.h b/kdeprint/management/kmwname.h index e3b74f224..f933d59ed 100644 --- a/kdeprint/management/kmwname.h +++ b/kdeprint/management/kmwname.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp index c8fb39c65..40dc105d5 100644 --- a/kdeprint/management/kmwpassword.cpp +++ b/kdeprint/management/kmwpassword.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwpassword.h b/kdeprint/management/kmwpassword.h index 493b36dd0..a7dfb062a 100644 --- a/kdeprint/management/kmwpassword.h +++ b/kdeprint/management/kmwpassword.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwsmb.cpp b/kdeprint/management/kmwsmb.cpp index 4c649d8a9..e76240cf8 100644 --- a/kdeprint/management/kmwsmb.cpp +++ b/kdeprint/management/kmwsmb.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwsmb.h b/kdeprint/management/kmwsmb.h index da89b5d1f..695379a79 100644 --- a/kdeprint/management/kmwsmb.h +++ b/kdeprint/management/kmwsmb.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp index 5f2bf9742..98aad76a5 100644 --- a/kdeprint/management/kmwsocket.cpp +++ b/kdeprint/management/kmwsocket.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -137,7 +137,7 @@ void KMWSocket::slotScanFinished() else name = it.current()->Name; TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); - item->setPixmap(0,SmallIcon("kdeprint_printer")); + item->setPixmap(0,SmallIcon("tdeprint_printer")); } } diff --git a/kdeprint/management/kmwsocket.h b/kdeprint/management/kmwsocket.h index 07344e529..687b52fd4 100644 --- a/kdeprint/management/kmwsocket.h +++ b/kdeprint/management/kmwsocket.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp index a8a89e3ad..e6d06bae2 100644 --- a/kdeprint/management/kmwsocketutil.cpp +++ b/kdeprint/management/kmwsocketutil.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/management/kmwsocketutil.h b/kdeprint/management/kmwsocketutil.h index a7b9faee2..dfb9f490e 100644 --- a/kdeprint/management/kmwsocketutil.h +++ b/kdeprint/management/kmwsocketutil.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index 135ebbe4c..3b42b71d7 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kxmlcommanddlg.h b/kdeprint/management/kxmlcommanddlg.h index 7ccbc9e0e..88e590325 100644 --- a/kdeprint/management/kxmlcommanddlg.h +++ b/kdeprint/management/kxmlcommanddlg.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp index f46222fba..dfefe0a8b 100644 --- a/kdeprint/management/kxmlcommandselector.cpp +++ b/kdeprint/management/kxmlcommandselector.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kxmlcommandselector.h" #include "kxmlcommand.h" #include "kxmlcommanddlg.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include <tqcombobox.h> #include <kpushbutton.h> diff --git a/kdeprint/management/kxmlcommandselector.h b/kdeprint/management/kxmlcommandselector.h index 7466b9ea5..0efc299f9 100644 --- a/kdeprint/management/kxmlcommandselector.h +++ b/kdeprint/management/kxmlcommandselector.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp index 73466cdbb..a52e66018 100644 --- a/kdeprint/management/networkscanner.cpp +++ b/kdeprint/management/networkscanner.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h index 97c69a2cc..3d56bb03e 100644 --- a/kdeprint/management/networkscanner.h +++ b/kdeprint/management/networkscanner.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/pluginaction.cpp b/kdeprint/management/pluginaction.cpp index d876601e7..0aa3c10a3 100644 --- a/kdeprint/management/pluginaction.cpp +++ b/kdeprint/management/pluginaction.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/pluginaction.h b/kdeprint/management/pluginaction.h index c39f5f700..fb355b597 100644 --- a/kdeprint/management/pluginaction.h +++ b/kdeprint/management/pluginaction.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp index 696d7b025..8824dd5fc 100644 --- a/kdeprint/management/sidepixmap.cpp +++ b/kdeprint/management/sidepixmap.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -28,9 +28,9 @@ SidePixmap::SidePixmap(TQWidget *parent, const char *name) setLineWidth(1); setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); - m_side.load(locate("data", "kdeprint/side.png")); - m_tileup.load(locate("data", "kdeprint/tileup.png")); - m_tiledown.load(locate("data", "kdeprint/tiledown.png")); + m_side.load(locate("data", "tdeprint/side.png")); + m_tileup.load(locate("data", "tdeprint/tileup.png")); + m_tiledown.load(locate("data", "tdeprint/tiledown.png")); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); } diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h index 330b63e2d..a9730883e 100644 --- a/kdeprint/management/sidepixmap.h +++ b/kdeprint/management/sidepixmap.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp index 8692b00bd..fde3a3451 100644 --- a/kdeprint/management/smbview.cpp +++ b/kdeprint/management/smbview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -240,7 +240,7 @@ void SmbView::processServers() continue; TQListViewItem *item = new TQListViewItem(m_current,words[0]); item->setExpandable(true); - item->setPixmap(0,SmallIcon("kdeprint_computer")); + item->setPixmap(0,SmallIcon("tdeprint_computer")); } } @@ -273,7 +273,7 @@ void SmbView::processShares() // comm += (words[i]+" "); //TQListViewItem *item = new TQListViewItem(m_current,words[0],comm); TQListViewItem *item = new TQListViewItem(m_current,sharen,comm); - item->setPixmap(0,SmallIcon("kdeprint_printer")); + item->setPixmap(0,SmallIcon("tdeprint_printer")); } } } diff --git a/kdeprint/management/smbview.h b/kdeprint/management/smbview.h index 57dc297f7..aea1d920d 100644 --- a/kdeprint/management/smbview.h +++ b/kdeprint/management/smbview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/marginpreview.cpp b/kdeprint/marginpreview.cpp index 191d1850c..2a5e21e59 100644 --- a/kdeprint/marginpreview.cpp +++ b/kdeprint/marginpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/marginpreview.h b/kdeprint/marginpreview.h index a9d1165b7..e0ed3e775 100644 --- a/kdeprint/marginpreview.h +++ b/kdeprint/marginpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/marginvaluewidget.cpp b/kdeprint/marginvaluewidget.cpp index 1ef2233e1..e4f1365c6 100644 --- a/kdeprint/marginvaluewidget.cpp +++ b/kdeprint/marginvaluewidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/marginvaluewidget.h b/kdeprint/marginvaluewidget.h index 40f471bb2..97f1409c1 100644 --- a/kdeprint/marginvaluewidget.h +++ b/kdeprint/marginvaluewidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/marginwidget.cpp b/kdeprint/marginwidget.cpp index bb745b072..53790a112 100644 --- a/kdeprint/marginwidget.cpp +++ b/kdeprint/marginwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/marginwidget.h b/kdeprint/marginwidget.h index 2a493dedf..bca3a2c00 100644 --- a/kdeprint/marginwidget.h +++ b/kdeprint/marginwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp index 4f64f8edb..32ce8db9b 100644 --- a/kdeprint/messagewindow.cpp +++ b/kdeprint/messagewindow.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -39,7 +39,7 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, box->setSpacing( 10 ); box->setMargin( 5 ); TQLabel *pix = new TQLabel( box ); - pix->setPixmap( DesktopIcon( "kdeprint_printer" ) ); + pix->setPixmap( DesktopIcon( "tdeprint_printer" ) ); m_text = new TQLabel( txt, box ); TQHBoxLayout *l0 = new TQHBoxLayout( this, 0, 0 ); diff --git a/kdeprint/messagewindow.h b/kdeprint/messagewindow.h index 52e73ea2e..44e211808 100644 --- a/kdeprint/messagewindow.h +++ b/kdeprint/messagewindow.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/pics/CMakeLists.txt b/kdeprint/pics/CMakeLists.txt index ed6478325..5363b16ef 100644 --- a/kdeprint/pics/CMakeLists.txt +++ b/kdeprint/pics/CMakeLists.txt @@ -12,30 +12,30 @@ ##### other data ################################ install( FILES - kdeprint_collate.png kdeprint_collate_reverse.png - kdeprint_color.png kdeprint_duplex_none.png - kdeprint_duplex_long.png kdeprint_duplex_short.png - kdeprint_grayscale.png kdeprint_landscape.png - kdeprint_nup1.png kdeprint_nup2.png kdeprint_nup4.png - kdeprint_portrait.png kdeprint_revlandscape.png - kdeprint_revportrait.png kdeprint_uncollate.png - kdeprint_uncollate_reverse.png kdeprint_nupother.png - kdeprint_prettyprint.png - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/pics ) + tdeprint_collate.png tdeprint_collate_reverse.png + tdeprint_color.png tdeprint_duplex_none.png + tdeprint_duplex_long.png tdeprint_duplex_short.png + tdeprint_grayscale.png tdeprint_landscape.png + tdeprint_nup1.png tdeprint_nup2.png tdeprint_nup4.png + tdeprint_portrait.png tdeprint_revlandscape.png + tdeprint_revportrait.png tdeprint_uncollate.png + tdeprint_uncollate_reverse.png tdeprint_nupother.png + tdeprint_prettyprint.png + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/pics ) tde_install_icons( - kdeprint_job kdeprint_job_error kdeprint_job_process - kdeprint_job_stopped kdeprint_printer kdeprint_printer_class - kdeprint_printer_class_stopped kdeprint_printer_defect - kdeprint_printer_remote kdeprint_printer_remote_stopped - kdeprint_printer_stopped kdeprint_printer_remote_process - kdeprint_printer_process kdeprint_printer_class_process - kdeprint_computer kdeprint_printer_infos history - kdeprint_printer_users filterstop kdeprint_job_completed - kdeprint_job_cancelled package_utilities kdeprint_enableprinter - kdeprint_stopprinter kdeprint_addprinter kdeprint_addpseudo - kdeprint_configmgr kdeprint_configsrv kdeprint_defaulthard - kdeprint_defaultsoft kdeprint_report kdeprint_testprinter - kdeprint_uploadsmb kdeprint_restartsrv kdeprint_inklevel - kdeprint_printstate kdeprint_queuestate - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/icons ) + tdeprint_job tdeprint_job_error tdeprint_job_process + tdeprint_job_stopped tdeprint_printer tdeprint_printer_class + tdeprint_printer_class_stopped tdeprint_printer_defect + tdeprint_printer_remote tdeprint_printer_remote_stopped + tdeprint_printer_stopped tdeprint_printer_remote_process + tdeprint_printer_process tdeprint_printer_class_process + tdeprint_computer tdeprint_printer_infos history + tdeprint_printer_users filterstop tdeprint_job_completed + tdeprint_job_cancelled package_utilities tdeprint_enableprinter + tdeprint_stopprinter tdeprint_addprinter tdeprint_addpseudo + tdeprint_configmgr tdeprint_configsrv tdeprint_defaulthard + tdeprint_defaultsoft tdeprint_report tdeprint_testprinter + tdeprint_uploadsmb tdeprint_restartsrv tdeprint_inklevel + tdeprint_printstate tdeprint_queuestate + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/icons ) diff --git a/kdeprint/pics/Makefile.am b/kdeprint/pics/Makefile.am index e19e32936..a46f6530d 100644 --- a/kdeprint/pics/Makefile.am +++ b/kdeprint/pics/Makefile.am @@ -1,22 +1,22 @@ -icondata_DATA = kdeprint_collate.png \ - kdeprint_collate_reverse.png \ - kdeprint_color.png \ - kdeprint_duplex_none.png \ - kdeprint_duplex_long.png \ - kdeprint_duplex_short.png \ - kdeprint_grayscale.png \ - kdeprint_landscape.png \ - kdeprint_nup1.png \ - kdeprint_nup2.png \ - kdeprint_nup4.png \ - kdeprint_portrait.png \ - kdeprint_revlandscape.png \ - kdeprint_revportrait.png \ - kdeprint_uncollate.png \ - kdeprint_uncollate_reverse.png \ - kdeprint_nupother.png \ - kdeprint_prettyprint.png -icondatadir = $(kde_datadir)/kdeprint/pics +icondata_DATA = tdeprint_collate.png \ + tdeprint_collate_reverse.png \ + tdeprint_color.png \ + tdeprint_duplex_none.png \ + tdeprint_duplex_long.png \ + tdeprint_duplex_short.png \ + tdeprint_grayscale.png \ + tdeprint_landscape.png \ + tdeprint_nup1.png \ + tdeprint_nup2.png \ + tdeprint_nup4.png \ + tdeprint_portrait.png \ + tdeprint_revlandscape.png \ + tdeprint_revportrait.png \ + tdeprint_uncollate.png \ + tdeprint_uncollate_reverse.png \ + tdeprint_nupother.png \ + tdeprint_prettyprint.png +icondatadir = $(kde_datadir)/tdeprint/pics -stdicon_ICON = kdeprint_job kdeprint_job_error kdeprint_job_process kdeprint_job_stopped kdeprint_printer kdeprint_printer_class kdeprint_printer_class_stopped kdeprint_printer_defect kdeprint_printer_remote kdeprint_printer_remote_stopped kdeprint_printer_stopped kdeprint_printer_remote_process kdeprint_printer_process kdeprint_printer_class_process kdeprint_computer kdeprint_printer_infos history kdeprint_printer_users filterstop kdeprint_job_completed kdeprint_job_cancelled package_utilities kdeprint_enableprinter kdeprint_stopprinter kdeprint_addprinter kdeprint_addpseudo kdeprint_configmgr kdeprint_configsrv kdeprint_defaulthard kdeprint_defaultsoft kdeprint_report kdeprint_testprinter kdeprint_uploadsmb kdeprint_restartsrv kdeprint_inklevel kdeprint_printstate kdeprint_queuestate -stdicondir = $(kde_datadir)/kdeprint/icons +stdicon_ICON = tdeprint_job tdeprint_job_error tdeprint_job_process tdeprint_job_stopped tdeprint_printer tdeprint_printer_class tdeprint_printer_class_stopped tdeprint_printer_defect tdeprint_printer_remote tdeprint_printer_remote_stopped tdeprint_printer_stopped tdeprint_printer_remote_process tdeprint_printer_process tdeprint_printer_class_process tdeprint_computer tdeprint_printer_infos history tdeprint_printer_users filterstop tdeprint_job_completed tdeprint_job_cancelled package_utilities tdeprint_enableprinter tdeprint_stopprinter tdeprint_addprinter tdeprint_addpseudo tdeprint_configmgr tdeprint_configsrv tdeprint_defaulthard tdeprint_defaultsoft tdeprint_report tdeprint_testprinter tdeprint_uploadsmb tdeprint_restartsrv tdeprint_inklevel tdeprint_printstate tdeprint_queuestate +stdicondir = $(kde_datadir)/tdeprint/icons diff --git a/kdeprint/plugincombobox.cpp b/kdeprint/plugincombobox.cpp index 414f38601..e9a41ddeb 100644 --- a/kdeprint/plugincombobox.cpp +++ b/kdeprint/plugincombobox.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/plugincombobox.h b/kdeprint/plugincombobox.h index ddfc8a89c..668407e14 100644 --- a/kdeprint/plugincombobox.h +++ b/kdeprint/plugincombobox.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/posterpreview.cpp b/kdeprint/posterpreview.cpp index 8afa0e295..7e8542c22 100644 --- a/kdeprint/posterpreview.cpp +++ b/kdeprint/posterpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/posterpreview.h b/kdeprint/posterpreview.h index bd9b6cc77..d0c362a04 100644 --- a/kdeprint/posterpreview.h +++ b/kdeprint/posterpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/ppdloader.cpp b/kdeprint/ppdloader.cpp index 9fbecc774..2e2250dd2 100644 --- a/kdeprint/ppdloader.cpp +++ b/kdeprint/ppdloader.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,9 +27,9 @@ #include <tqfile.h> #include <math.h> -void kdeprint_ppdscanner_init( TQIODevice* ); -void kdeprint_ppdscanner_terminate( bool deleteIt = true ); -int kdeprint_ppdscanner_numberoflines(); +void tdeprint_ppdscanner_init( TQIODevice* ); +void tdeprint_ppdscanner_terminate( bool deleteIt = true ); +int tdeprint_ppdscanner_numberoflines(); static TQString processLocaleString( const TQString& s ) { @@ -131,10 +131,10 @@ DrMain* PPDLoader::readFromFile( const TQString& filename ) bool result = true; m_groups.push( driver ); - kdeprint_ppdscanner_init( d ); - if ( kdeprint_ppdparse( this ) != 0 ) + tdeprint_ppdscanner_init( d ); + if ( tdeprint_ppdparse( this ) != 0 ) result = false; - kdeprint_ppdscanner_terminate( true ); + tdeprint_ppdscanner_terminate( true ); if ( result ) { @@ -170,7 +170,7 @@ DrMain* PPDLoader::loadDriver( const TQString& filename, TQString* msg ) PPDLoader loader; DrMain *driver = loader.readFromFile( filename ); if ( !driver && msg ) - *msg = filename + i18n( "(line %1): " ).arg( kdeprint_ppdscanner_numberoflines() ) + loader.errorMsg(); + *msg = filename + i18n( "(line %1): " ).arg( tdeprint_ppdscanner_numberoflines() ) + loader.errorMsg(); return driver; } diff --git a/kdeprint/ppdloader.h b/kdeprint/ppdloader.h index 703303fe8..c4eb9fbb5 100644 --- a/kdeprint/ppdloader.h +++ b/kdeprint/ppdloader.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -66,7 +66,7 @@ private: TQStringList m_fonts; TQString m_errormsg; - friend int kdeprint_ppdparse(void*); + friend int tdeprint_ppdparse(void*); DrGroup* findOrCreateGroupForOption( const TQString& ); void processPageSizes( DrMain* ); }; diff --git a/kdeprint/ppdparser.cpp b/kdeprint/ppdparser.cpp index ace79dbab..21f3fb77e 100644 --- a/kdeprint/ppdparser.cpp +++ b/kdeprint/ppdparser.cpp @@ -47,13 +47,13 @@ /* If NAME_PREFIX is specified substitute the variables and functions names. */ -#define yyparse kdeprint_ppdparse -#define yylex kdeprint_ppdlex -#define yyerror kdeprint_ppderror -#define yylval kdeprint_ppdlval -#define yychar kdeprint_ppdchar -#define yydebug kdeprint_ppddebug -#define yynerrs kdeprint_ppdnerrs +#define yyparse tdeprint_ppdparse +#define yylex tdeprint_ppdlex +#define yyerror tdeprint_ppderror +#define yylval tdeprint_ppdlval +#define yychar tdeprint_ppdchar +#define yydebug tdeprint_ppddebug +#define yynerrs tdeprint_ppdnerrs /* Tokens. */ @@ -103,7 +103,7 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -131,8 +131,8 @@ #define builder static_cast<PPDLoader*>( ppdloader ) -int kdeprint_ppdlex(); -#define kdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) +int tdeprint_ppdlex(); +#define tdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) /* Enabling traces. */ diff --git a/kdeprint/ppdparser.cpp.h b/kdeprint/ppdparser.cpp.h index 202f5ddda..182bebd34 100644 --- a/kdeprint/ppdparser.cpp.h +++ b/kdeprint/ppdparser.cpp.h @@ -74,7 +74,7 @@ typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 #endif -extern YYSTYPE kdeprint_ppdlval; +extern YYSTYPE tdeprint_ppdlval; diff --git a/kdeprint/ppdparser.y b/kdeprint/ppdparser.y index 37b130b88..f750d9316 100644 --- a/kdeprint/ppdparser.y +++ b/kdeprint/ppdparser.y @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,8 +29,8 @@ #define builder static_cast<PPDLoader*>( ppdloader ) -int kdeprint_ppdlex(); -#define kdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) +int tdeprint_ppdlex(); +#define tdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) %} %token TRANSLATION diff --git a/kdeprint/ppdscanner.cpp b/kdeprint/ppdscanner.cpp index 7eb0f22e7..50611aaa1 100644 --- a/kdeprint/ppdscanner.cpp +++ b/kdeprint/ppdscanner.cpp @@ -1,19 +1,19 @@ -#define yy_create_buffer kdeprint_ppd_create_buffer -#define yy_delete_buffer kdeprint_ppd_delete_buffer -#define yy_scan_buffer kdeprint_ppd_scan_buffer -#define yy_scan_string kdeprint_ppd_scan_string -#define yy_scan_bytes kdeprint_ppd_scan_bytes -#define yy_flex_debug kdeprint_ppd_flex_debug -#define yy_init_buffer kdeprint_ppd_init_buffer -#define yy_flush_buffer kdeprint_ppd_flush_buffer -#define yy_load_buffer_state kdeprint_ppd_load_buffer_state -#define yy_switch_to_buffer kdeprint_ppd_switch_to_buffer -#define yyin kdeprint_ppdin -#define yyleng kdeprint_ppdleng -#define yylex kdeprint_ppdlex -#define yyout kdeprint_ppdout -#define yyrestart kdeprint_ppdrestart -#define yytext kdeprint_ppdtext +#define yy_create_buffer tdeprint_ppd_create_buffer +#define yy_delete_buffer tdeprint_ppd_delete_buffer +#define yy_scan_buffer tdeprint_ppd_scan_buffer +#define yy_scan_string tdeprint_ppd_scan_string +#define yy_scan_bytes tdeprint_ppd_scan_bytes +#define yy_flex_debug tdeprint_ppd_flex_debug +#define yy_init_buffer tdeprint_ppd_init_buffer +#define yy_flush_buffer tdeprint_ppd_flush_buffer +#define yy_load_buffer_state tdeprint_ppd_load_buffer_state +#define yy_switch_to_buffer tdeprint_ppd_switch_to_buffer +#define yyin tdeprint_ppdin +#define yyleng tdeprint_ppdleng +#define yylex tdeprint_ppdlex +#define yyout tdeprint_ppdout +#define yyrestart tdeprint_ppdrestart +#define yytext tdeprint_ppdtext #line 19 "./ppdscanner.cpp" /* A lexical scanner generated by flex */ @@ -521,7 +521,7 @@ char *yytext; #line 2 "./ppdscanner.l" /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -543,21 +543,21 @@ char *yytext; #define YYSTYPE TQStringList #include "ppdparser.cpp.h" -#define yylval kdeprint_ppdlval +#define yylval tdeprint_ppdlval -TQIODevice *kdeprint_ppdscanner_device = NULL; +TQIODevice *tdeprint_ppdscanner_device = NULL; #define YY_INPUT(buf,result,max_size) \ { \ - if (kdeprint_ppdscanner_device) \ + if (tdeprint_ppdscanner_device) \ { \ - result = kdeprint_ppdscanner_device->readBlock(buf,max_size); \ + result = tdeprint_ppdscanner_device->readBlock(buf,max_size); \ if (result < 0) \ result = 0; \ } \ else \ result = 0; \ } -int kdeprint_ppdscanner_lno = 0; +int tdeprint_ppdscanner_lno = 0; #if 0 #define QDEBUG0(s) qDebug(s) @@ -902,7 +902,7 @@ YY_RULE_SETUP case 19: YY_RULE_SETUP #line 87 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK case 20: YY_RULE_SETUP @@ -925,7 +925,7 @@ YY_RULE_SETUP case 23: YY_RULE_SETUP #line 95 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK /** * Value state @@ -933,7 +933,7 @@ YY_RULE_SETUP case 24: YY_RULE_SETUP #line 100 "./ppdscanner.l" -{ yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } +{ yylval = yytext; tdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } YY_BREAK case 25: YY_RULE_SETUP @@ -948,7 +948,7 @@ YY_RULE_SETUP case 27: YY_RULE_SETUP #line 103 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK case 28: YY_RULE_SETUP @@ -966,7 +966,7 @@ YY_RULE_SETUP case 30: YY_RULE_SETUP #line 110 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK /** * Constraint state @@ -989,12 +989,12 @@ YY_RULE_SETUP case 34: YY_RULE_SETUP #line 118 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK case 35: YY_RULE_SETUP #line 120 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; /* eat up */ } +{ tdeprint_ppdscanner_lno++; /* eat up */ } YY_BREAK case 36: YY_RULE_SETUP @@ -1895,20 +1895,20 @@ int main() #line 123 "./ppdscanner.l" -void kdeprint_ppdscanner_init(TQIODevice *d) +void tdeprint_ppdscanner_init(TQIODevice *d) { - kdeprint_ppdscanner_device = d; - kdeprint_ppdscanner_lno = 1; + tdeprint_ppdscanner_device = d; + tdeprint_ppdscanner_lno = 1; } -void kdeprint_ppdscanner_terminate( bool deleteIt ) +void tdeprint_ppdscanner_terminate( bool deleteIt ) { if (deleteIt) - delete kdeprint_ppdscanner_device; - kdeprint_ppdscanner_device = NULL; + delete tdeprint_ppdscanner_device; + tdeprint_ppdscanner_device = NULL; } -int kdeprint_ppdscanner_numberoflines() +int tdeprint_ppdscanner_numberoflines() { - return kdeprint_ppdscanner_lno; + return tdeprint_ppdscanner_lno; } diff --git a/kdeprint/ppdscanner.l b/kdeprint/ppdscanner.l index 60a63f035..ba60ee2f6 100644 --- a/kdeprint/ppdscanner.l +++ b/kdeprint/ppdscanner.l @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,21 +23,21 @@ #define YYSTYPE TQStringList #include "ppdparser.cpp.h" -#define yylval kdeprint_ppdlval +#define yylval tdeprint_ppdlval -QIODevice *kdeprint_ppdscanner_device = NULL; +QIODevice *tdeprint_ppdscanner_device = NULL; #define YY_INPUT(buf,result,max_size) \ { \ - if (kdeprint_ppdscanner_device) \ + if (tdeprint_ppdscanner_device) \ { \ - result = kdeprint_ppdscanner_device->readBlock(buf,max_size); \ + result = tdeprint_ppdscanner_device->readBlock(buf,max_size); \ if (result < 0) \ result = 0; \ } \ else \ result = 0; \ } -int kdeprint_ppdscanner_lno = 0; +int tdeprint_ppdscanner_lno = 0; #if 0 #define QDEBUG0(s) qDebug(s) @@ -84,7 +84,7 @@ L [[:alnum:]] */ <option>{WORD3} { yylval = yytext; QDEBUG1("Option: %s",yytext); return OPTION; } <option>":" { BEGIN(value); return ':'; } -<option>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<option>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } <option>"/" { BEGIN(translation_1); return '/'; } /** @@ -92,22 +92,22 @@ L [[:alnum:]] */ <translation_1>[^\n:]* { yylval = yytext; QDEBUG1("Translation: %s",yytext); return TRANSLATION; } <translation_1>":" { BEGIN(value); return ':'; } -<translation_1>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<translation_1>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } /** * Value state */ -<value>\"[^\"]*\" { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } +<value>\"[^\"]*\" { yylval = yytext; tdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } <value>{WORD} { yylval = yytext; QDEBUG1("String part: %s",yytext); return STRINGPART; } <value>"/" { BEGIN(translation_2); return '/'; } -<value>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<value>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } <value>":" { /* stay in the same state */ return ':'; } /** * Translation state (2: with colon) */ <translation_2>[^\n]* { yylval = yytext; QDEBUG1("Translation: %s",yytext); return TRANSLATION; } -<translation_2>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<translation_2>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } /** * Constraint state @@ -115,27 +115,27 @@ L [[:alnum:]] <constr>":" { return ':'; } <constr>\*{WORD2} { yylval = yytext+1; QDEBUG1("Constraint keyword: %s",yytext); return KEYWORD; } <constr>{WORD2} { yylval = yytext; QDEBUG1("Constraint option: %s",yytext); return OPTION; } -<constr>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<constr>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } -"\n" { kdeprint_ppdscanner_lno++; /* eat up */ } +"\n" { tdeprint_ppdscanner_lno++; /* eat up */ } <*>. { /* eat up */ } %% -void kdeprint_ppdscanner_init(QIODevice *d) +void tdeprint_ppdscanner_init(QIODevice *d) { - kdeprint_ppdscanner_device = d; - kdeprint_ppdscanner_lno = 1; + tdeprint_ppdscanner_device = d; + tdeprint_ppdscanner_lno = 1; } -void kdeprint_ppdscanner_terminate( bool deleteIt ) +void tdeprint_ppdscanner_terminate( bool deleteIt ) { if (deleteIt) - delete kdeprint_ppdscanner_device; - kdeprint_ppdscanner_device = NULL; + delete tdeprint_ppdscanner_device; + tdeprint_ppdscanner_device = NULL; } -int kdeprint_ppdscanner_numberoflines() +int tdeprint_ppdscanner_numberoflines() { - return kdeprint_ppdscanner_lno; + return tdeprint_ppdscanner_lno; } diff --git a/kdeprint/printerfilter.cpp b/kdeprint/printerfilter.cpp index a6f02f077..e0161a50a 100644 --- a/kdeprint/printerfilter.cpp +++ b/kdeprint/printerfilter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/printerfilter.h b/kdeprint/printerfilter.h index df92d6a9f..603565ebb 100644 --- a/kdeprint/printerfilter.h +++ b/kdeprint/printerfilter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/CMakeLists.txt b/kdeprint/rlpr/CMakeLists.txt index cc9369e07..f8468a0dc 100644 --- a/kdeprint/rlpr/CMakeLists.txt +++ b/kdeprint/rlpr/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint - ${CMAKE_SOURCE_DIR}/kdeprint/management + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint + ${CMAKE_SOURCE_DIR}/tdeprint/management ) link_directories( @@ -34,12 +34,12 @@ link_directories( ##### other data ################################ -install( FILES rlpr.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) +install( FILES rlpr.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) -##### kdeprint_rlpr ############################# +##### tdeprint_rlpr ############################# -set( target kdeprint_rlpr ) +set( target tdeprint_rlpr ) set( ${target}_SRCS kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp @@ -49,6 +49,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/rlpr/Makefile.am b/kdeprint/rlpr/Makefile.am index 2a42d106f..1946fed94 100644 --- a/kdeprint/rlpr/Makefile.am +++ b/kdeprint/rlpr/Makefile.am @@ -1,17 +1,17 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes) -kde_module_LTLIBRARIES = kdeprint_rlpr.la +kde_module_LTLIBRARIES = tdeprint_rlpr.la -kdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \ +tdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \ kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp -kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) -kdeprint_rlpr_la_METASOURCES = AUTO +tdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) +tdeprint_rlpr_la_METASOURCES = AUTO noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \ kmproxywidget.h kmconfigproxy.h entry_DATA = rlpr.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/rlpr/kmconfigproxy.cpp b/kdeprint/rlpr/kmconfigproxy.cpp index 6be500e8f..0f8ca3743 100644 --- a/kdeprint/rlpr/kmconfigproxy.cpp +++ b/kdeprint/rlpr/kmconfigproxy.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmconfigproxy.h b/kdeprint/rlpr/kmconfigproxy.h index 0fcfdaf55..6f3b7ef42 100644 --- a/kdeprint/rlpr/kmconfigproxy.h +++ b/kdeprint/rlpr/kmconfigproxy.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmproprlpr.cpp b/kdeprint/rlpr/kmproprlpr.cpp index c40a3985e..62fe97827 100644 --- a/kdeprint/rlpr/kmproprlpr.cpp +++ b/kdeprint/rlpr/kmproprlpr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmproprlpr.h b/kdeprint/rlpr/kmproprlpr.h index 630bdf671..cdf9aef7b 100644 --- a/kdeprint/rlpr/kmproprlpr.h +++ b/kdeprint/rlpr/kmproprlpr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp index 1aeb1c03f..94ad60340 100644 --- a/kdeprint/rlpr/kmproxywidget.cpp +++ b/kdeprint/rlpr/kmproxywidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmproxywidget.h b/kdeprint/rlpr/kmproxywidget.h index 85dcbf111..0c1a5079b 100644 --- a/kdeprint/rlpr/kmproxywidget.h +++ b/kdeprint/rlpr/kmproxywidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmrlprfactory.cpp b/kdeprint/rlpr/kmrlprfactory.cpp index 1e414bc59..f5cabe6bd 100644 --- a/kdeprint/rlpr/kmrlprfactory.cpp +++ b/kdeprint/rlpr/kmrlprfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,5 +24,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_3( KMRlprManager, KMRlprUiManager, KRlprPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_rlpr, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_rlpr, KGenericFactory< Products > ) diff --git a/kdeprint/rlpr/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp index 467f6c58e..64f6acde1 100644 --- a/kdeprint/rlpr/kmrlprmanager.cpp +++ b/kdeprint/rlpr/kmrlprmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -154,5 +154,5 @@ void KMRlprManager::savePrintersConf(const TQString& filename) TQString KMRlprManager::printerFile() { - return locateLocal("data","kdeprint/printers.conf"); + return locateLocal("data","tdeprint/printers.conf"); } diff --git a/kdeprint/rlpr/kmrlprmanager.h b/kdeprint/rlpr/kmrlprmanager.h index dbc0f1096..57af7f99f 100644 --- a/kdeprint/rlpr/kmrlprmanager.h +++ b/kdeprint/rlpr/kmrlprmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmrlpruimanager.cpp b/kdeprint/rlpr/kmrlpruimanager.cpp index 5ca7a2230..9bae2cdc4 100644 --- a/kdeprint/rlpr/kmrlpruimanager.cpp +++ b/kdeprint/rlpr/kmrlpruimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmrlpruimanager.h b/kdeprint/rlpr/kmrlpruimanager.h index 3f244eb5b..e2bc5de73 100644 --- a/kdeprint/rlpr/kmrlpruimanager.h +++ b/kdeprint/rlpr/kmrlpruimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp index 1c037ae47..70defc27b 100644 --- a/kdeprint/rlpr/kmwrlpr.cpp +++ b/kdeprint/rlpr/kmwrlpr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -144,12 +144,12 @@ void KMWRlpr::initialize() { host = line.left(p).stripWhiteSpace(); TQListViewItem *hitem = new TQListViewItem(m_view,host); - hitem->setPixmap(0,SmallIcon("kdeprint_computer")); + hitem->setPixmap(0,SmallIcon("tdeprint_computer")); TQStringList prs = TQStringList::split(' ',line.right(line.length()-p-1),false); for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it) { TQListViewItem *pitem = new TQListViewItem(hitem,*it); - pitem->setPixmap(0,SmallIcon("kdeprint_printer")); + pitem->setPixmap(0,SmallIcon("tdeprint_printer")); } } } @@ -187,10 +187,10 @@ void KMWRlpr::initialize() if (!hitem) { hitem = new TQListViewItem(m_view,"localhost"); - hitem->setPixmap(0,SmallIcon("kdeprint_computer")); + hitem->setPixmap(0,SmallIcon("tdeprint_computer")); } TQListViewItem *pitem = new TQListViewItem(hitem,name); - pitem->setPixmap(0,SmallIcon("kdeprint_printer")); + pitem->setPixmap(0,SmallIcon("tdeprint_printer")); } } } diff --git a/kdeprint/rlpr/kmwrlpr.h b/kdeprint/rlpr/kmwrlpr.h index 14be9aee0..7c1aa74f2 100644 --- a/kdeprint/rlpr/kmwrlpr.h +++ b/kdeprint/rlpr/kmwrlpr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/krlprprinterimpl.cpp b/kdeprint/rlpr/krlprprinterimpl.cpp index ac18d1a2b..a6b0e5986 100644 --- a/kdeprint/rlpr/krlprprinterimpl.cpp +++ b/kdeprint/rlpr/krlprprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/rlpr/krlprprinterimpl.h b/kdeprint/rlpr/krlprprinterimpl.h index 9ed5eeebb..7af98df0c 100644 --- a/kdeprint/rlpr/krlprprinterimpl.h +++ b/kdeprint/rlpr/krlprprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/signal_proc.c b/kdeprint/signal_proc.c index 40fac6049..8ff30e56e 100644 --- a/kdeprint/signal_proc.c +++ b/kdeprint/signal_proc.c @@ -114,7 +114,7 @@ int main(int argc, char **argv) fprintf(stderr, "operation not authorized, switching to root\n"); snprintf(buf, 256, "kill -%d %d", signal_number, pid); - if (execlp("kdesu", "kdesu", "-c", buf, (void *)0) == -1) + if (execlp("tdesu", "tdesu", "-c", buf, (void *)0) == -1) { fprintf(stderr, "operation failed: %s\n", strerror(errno)); return -1; diff --git a/kdeprint/specials.desktop b/kdeprint/specials.desktop index 382440edc..72c648c4c 100644 --- a/kdeprint/specials.desktop +++ b/kdeprint/specials.desktop @@ -761,11 +761,11 @@ Comment[zh_CN]=外部 Comment[zh_HK]=外部 Comment[zh_TW]=外部 Comment[zu]=Ngaphandle -Icon=kdeprintfax -Command=kdeprintfax %in +Icon=tdeprintfax +Command=tdeprintfax %in File=0 Extension= -Require=exec:/kdeprintfax +Require=exec:/tdeprintfax [Printer 3] Command=ps2pdf -sPAPERSIZE=%psl %in %out && kmailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out @@ -1111,7 +1111,7 @@ Description[zh_TW]=使用 ksendfax 將目前文件傳真出去 Description[zu]=Sebenzisa i-ksendfax ukuthumela i-fax yohlu lwamafayela amanje Extension= File=0 -Icon=kdeprintfax +Icon=tdeprintfax Name=Advanced Faxing Tool (ksendfax) Name[af]=Gevorderde Faks Program (ksendfax) Name[ar]=أداة إرسال فاكس متقدمة (ksendfax) diff --git a/kdeprint/tests/Makefile.am b/kdeprint/tests/Makefile.am index 7a2d1865c..53021a6e2 100644 --- a/kdeprint/tests/Makefile.am +++ b/kdeprint/tests/Makefile.am @@ -1,15 +1,15 @@ -INCLUDES = -I$(top_srcdir)/kdeprint -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeprint -I$(top_srcdir) $(all_includes) check_PROGRAMS = helpviewer drawdemo helpviewer_SOURCES = helpwindow.cpp main.cpp richpage.cpp helpviewer_METASOURCES = helpwindow.moc -helpviewer_LDADD = $(top_builddir)/kdeprint/libtdeprint.la +helpviewer_LDADD = $(top_builddir)/tdeprint/libtdeprint.la helpviewer_LDFLAGS = $(all_libraries) drawdemo_SOURCES = drawdemo.cpp drawdemo_METASOURCES = drawdemo.moc -drawdemo_LDADD = $(top_builddir)/kdeprint/libtdeprint.la +drawdemo_LDADD = $(top_builddir)/tdeprint/libtdeprint.la drawdemo_LDFLAGS = $(all_libraries) EXTRA_DIST = home.xpm back.xpm forward.xpm diff --git a/kdeprint/tools/escputil/CMakeLists.txt b/kdeprint/tools/escputil/CMakeLists.txt index ec969c6b0..3494d3cfb 100644 --- a/kdeprint/tools/escputil/CMakeLists.txt +++ b/kdeprint/tools/escputil/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -24,12 +24,12 @@ link_directories( ##### other data ################################ -install( FILES escputil.desktop DESTINATION ${DATA_INSTALL_DIR}/kdeprint/tools ) +install( FILES escputil.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeprint/tools ) -##### kdeprint_tool_escputil #################### +##### tdeprint_tool_escputil #################### -set( target kdeprint_tool_escputil ) +set( target tdeprint_tool_escputil ) set( ${target}_SRCS escpwidget.cpp @@ -37,6 +37,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/tools/escputil/Makefile.am b/kdeprint/tools/escputil/Makefile.am index beb7c2a5e..ac7620ef1 100644 --- a/kdeprint/tools/escputil/Makefile.am +++ b/kdeprint/tools/escputil/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kdeprint_tool_escputil.la -kdeprint_tool_escputil_la_SOURCES = escpwidget.cpp -kdeprint_tool_escputil_la_METASOURCES = AUTO -kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) +kde_module_LTLIBRARIES = tdeprint_tool_escputil.la +tdeprint_tool_escputil_la_SOURCES = escpwidget.cpp +tdeprint_tool_escputil_la_METASOURCES = AUTO +tdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) noinst_HEADERS = escpwidget.h service_DATA = escputil.desktop -servicedir = $(kde_datadir)/kdeprint/tools +servicedir = $(kde_datadir)/tdeprint/tools diff --git a/kdeprint/tools/escputil/escpwidget.cpp b/kdeprint/tools/escputil/escpwidget.cpp index b55a374a7..3000b0788 100644 --- a/kdeprint/tools/escputil/escpwidget.cpp +++ b/kdeprint/tools/escputil/escpwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -55,8 +55,8 @@ protected: extern "C" { - void* init_kdeprint_tool_escputil() KDE_EXPORT; - void* init_kdeprint_tool_escputil() + void* init_tdeprint_tool_escputil() KDE_EXPORT; + void* init_tdeprint_tool_escputil() { return new EscpFactory; } @@ -78,7 +78,7 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) TQPushButton *alignbtn = new TQPushButton(this, "-a"); alignbtn->setPixmap(DesktopIcon("exec")); TQPushButton *inkbtn = new TQPushButton(this, "-i"); - inkbtn->setPixmap(DesktopIcon("kdeprint_inklevel")); + inkbtn->setPixmap(DesktopIcon("tdeprint_inklevel")); TQPushButton *identbtn = new TQPushButton(this, "-d"); identbtn->setPixmap(DesktopIcon("exec")); diff --git a/kdeprint/tools/escputil/escpwidget.h b/kdeprint/tools/escputil/escpwidget.h index 809bb89c3..7e3ba55e8 100644 --- a/kdeprint/tools/escputil/escpwidget.h +++ b/kdeprint/tools/escputil/escpwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/treecombobox.cpp b/kdeprint/treecombobox.cpp index b0fde0f11..7a2adc8ef 100644 --- a/kdeprint/treecombobox.cpp +++ b/kdeprint/treecombobox.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/treecombobox.h b/kdeprint/treecombobox.h index c50be34d2..6026b99f1 100644 --- a/kdeprint/treecombobox.h +++ b/kdeprint/treecombobox.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/util.cpp b/kdeprint/util.cpp index f47db5017..b4025a087 100644 --- a/kdeprint/util.cpp +++ b/kdeprint/util.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdeprint/util.h b/kdeprint/util.h index d51f248cf..db4ad1cd6 100644 --- a/kdeprint/util.h +++ b/kdeprint/util.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * 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/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt index 02a871cd9..97ede6b97 100644 --- a/kdesu/CMakeLists.txt +++ b/kdesu/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -25,33 +25,33 @@ link_directories( ##### headers ################################### install( FILES - defaults.h client.h process.h kdesu_pty.h + defaults.h client.h process.h tdesu_pty.h kcookie.h su.h ssh.h stub.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdesu ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdesu ) ##### libtdesu ################################## -set( target kdesu ) +set( target tdesu ) set( ${target}_SRCS client.cpp process.cpp kcookie.cpp - su.cpp ssh.cpp stub.cpp kdesu_pty.cpp + su.cpp ssh.cpp stub.cpp tdesu_pty.cpp ) tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kdecore-shared ${LIB_UTIL} + LINK tdecore-shared ${LIB_UTIL} DESTINATION ${LIB_INSTALL_DIR} ) -tde_install_symlink( kdesu_pty.h ${INCLUDE_INSTALL_DIR}/kdesu/pty.h ) +tde_install_symlink( tdesu_pty.h ${INCLUDE_INSTALL_DIR}/tdesu/pty.h ) -##### kdesu_stub ################################ +##### tdesu_stub ################################ -tde_add_executable( kdesu_stub - SOURCES kdesu_stub.c +tde_add_executable( tdesu_stub + SOURCES tdesu_stub.c DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesu/Mainpage.dox b/kdesu/Mainpage.dox index a887e2255..c39881397 100644 --- a/kdesu/Mainpage.dox +++ b/kdesu/Mainpage.dox @@ -1,7 +1,7 @@ /** @mainpage Console-mode authentication libtdesu provides functionality for building GUI front ends for -(password asking) console mode programs. For example, kdesu and +(password asking) console mode programs. For example, tdesu and kdessh use it to interface with su and ssh respectively. @authors @@ -16,6 +16,6 @@ Adriaan de Groot \<groot@kde.org\> */ -// DOXYGEN_REFERENCES = kdecore +// DOXYGEN_REFERENCES = tdecore // DOXYGEN_SET_PROJECT_NAME = Trinitysu // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kdesu/Makefile.am b/kdesu/Makefile.am index 31a553ec8..847a21ee1 100644 --- a/kdesu/Makefile.am +++ b/kdesu/Makefile.am @@ -3,28 +3,28 @@ INCLUDES = -I$(top_srcdir)/kio/ $(all_includes) lib_LTLIBRARIES = libtdesu.la -libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp kdesu_pty.cpp +libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp tdesu_pty.cpp libtdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) libtdesu_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la libtdesu_la_NMCHECK = $(srcdir)/libtdesu.nmcheck -libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/kdecore/libtdecore_weak.nmcheck \ - $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck +libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \ + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck -kdesudir = $(includedir)/kdesu -kdesu_HEADERS = defaults.h client.h process.h kdesu_pty.h kcookie.h su.h ssh.h stub.h +tdesudir = $(includedir)/tdesu +tdesu_HEADERS = defaults.h client.h process.h tdesu_pty.h kcookie.h su.h ssh.h stub.h install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(kdesudir) - -rm -f $(DESTDIR)$(kdesudir)/pty.h - ln -s kdesu_pty.h $(DESTDIR)$(kdesudir)/pty.h + $(mkinstalldirs) $(DESTDIR)$(tdesudir) + -rm -f $(DESTDIR)$(tdesudir)/pty.h + ln -s tdesu_pty.h $(DESTDIR)$(tdesudir)/pty.h uninstall-local: - -rm -f $(DESTDIR)$(kdesudir)/pty.h + -rm -f $(DESTDIR)$(tdesudir)/pty.h -bin_PROGRAMS = kdesu_stub -kdesu_stub_SOURCES = kdesu_stub.c -kdesu_stub_LDFLAGS = $(all_libraries) -kdesu_stub_LDADD = +bin_PROGRAMS = tdesu_stub +tdesu_stub_SOURCES = tdesu_stub.c +tdesu_stub_LDFLAGS = $(all_libraries) +tdesu_stub_LDADD = include $(top_srcdir)/admin/Doxyfile.am diff --git a/kdesu/README b/kdesu/README index 2ed2228bd..c81f5c23b 100644 --- a/kdesu/README +++ b/kdesu/README @@ -1,11 +1,11 @@ Maintainer: Adriaan de Groot <groot@kde.org> -Maintainer: kdesu was maintained by Alan Eldridge until his +Maintainer: tdesu was maintained by Alan Eldridge until his death in 2003. README for libtdesu. -Libkdesu provides functionality for building GUI front ends for -(password asking) console mode programs. For example, kdesu and +Libtdesu provides functionality for building GUI front ends for +(password asking) console mode programs. For example, tdesu and kdessh use it to interface with su and ssh respectively. libtdesu is Copyright (c) 1999,2000 Geert Jansen <jansen@kde.org> diff --git a/kdesu/client.cpp b/kdesu/client.cpp index 030053da0..18accc313 100644 --- a/kdesu/client.cpp +++ b/kdesu/client.cpp @@ -2,14 +2,14 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library * General Public License, version 2. See the file "COPYING.LIB" for the * exact licensing terms. * - * client.cpp: A client for kdesud. + * client.cpp: A client for tdesud. */ #include <config.h> @@ -64,7 +64,7 @@ KDEsuClient::KDEsuClient() TQCString display("QWS"); #endif - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display.data()))); + sock = TQFile::encodeName(locateLocal("socket", TQString("tdesud_%1").arg(display.data()))); d = new KDEsuClientPrivate; connect(); } @@ -387,9 +387,9 @@ int KDEsuClient::stopServer() static TQString findDaemon() { - TQString daemon = locate("bin", "kdesud"); + TQString daemon = locate("bin", "tdesud"); if (daemon.isEmpty()) // if not in KDEDIRS, rely on PATH - daemon = KStandardDirs::findExe("kdesud"); + daemon = KStandardDirs::findExe("tdesud"); if (daemon.isEmpty()) { @@ -422,14 +422,14 @@ int KDEsuClient::startServer() return -1; if (!isServerSGID()) { - kdWarning(900) << k_lineinfo << "kdesud not setgid!\n"; + kdWarning(900) << k_lineinfo << "tdesud not setgid!\n"; } - // kdesud only forks to the background after it is accepting + // tdesud only forks to the background after it is accepting // connections. - // We start it via kdeinit to make sure that it doesn't inherit + // We start it via tdeinit to make sure that it doesn't inherit // any fd's from the parent process. - int ret = kapp->kdeinitExecWait(d->daemon); + int ret = kapp->tdeinitExecWait(d->daemon); connect(); return ret; } diff --git a/kdesu/client.h b/kdesu/client.h index c1df06ff1..420d5dadd 100644 --- a/kdesu/client.h +++ b/kdesu/client.h @@ -2,14 +2,14 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library * General Public License, version 2. See the file "COPYING.LIB" for the * exact licensing terms. * - * client.h: client to access kdesud. + * client.h: client to access tdesud. */ #ifndef __KDE_su_Client_h_Included__ @@ -30,7 +30,7 @@ typedef TQValueList<TQCString> QCStringList; /** - * A client class to access kdesud, the KDE su daemon. Kdesud can assist in + * A client class to access tdesud, the KDE su daemon. Kdesud can assist in * password caching in two ways: * * @li For high security passwords, like for su and ssh, it executes the @@ -53,7 +53,7 @@ public: ~KDEsuClient(); /** - * Lets kdesud execute a command. If the daemon does not have a password + * Lets tdesud execute a command. If the daemon does not have a password * for this command, this will fail and you need to call setPass(). * * @param command The command to execute. @@ -169,7 +169,7 @@ public: int delGroup(const TQCString &group); /** - * Ping kdesud. This can be used for diagnostics. + * Ping tdesud. This can be used for diagnostics. * @return Zero on success, -1 on failure */ int ping(); @@ -180,7 +180,7 @@ public: int stopServer(); /** - * Try to start up kdesud + * Try to start up tdesud */ int startServer(); diff --git a/kdesu/configure.in.in b/kdesu/configure.in.in index 4b4c6b78f..5f398b720 100644 --- a/kdesu/configure.in.in +++ b/kdesu/configure.in.in @@ -14,24 +14,24 @@ else AC_DEFINE_UNQUOTED(__PATH_SUDO, "$path_sudo", [path to sudo]) fi -AC_ARG_WITH(sudo-kdesu-backend, - AC_HELP_STRING([--with-sudo-kdesu-backend], - [use sudo as backend for kdesu (default is su)]), +AC_ARG_WITH(sudo-tdesu-backend, + AC_HELP_STRING([--with-sudo-tdesu-backend], + [use sudo as backend for tdesu (default is su)]), [ if test x$withval = xyes; then - use_kdesu_backend="sudo" + use_tdesu_backend="sudo" else - use_kdesu_backend="su" + use_tdesu_backend="su" fi ], - use_kdesu_backend="su" + use_tdesu_backend="su" ) -if test x$use_kdesu_backend = xsudo -a x$path_sudo = xno; then - AC_MSG_ERROR(sudo was chosen as kdesu backend, but was not found in path.) +if test x$use_tdesu_backend = xsudo -a x$path_sudo = xno; then + AC_MSG_ERROR(sudo was chosen as tdesu backend, but was not found in path.) fi -AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_kdesu_backend", [Use su or sudo]) +AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_tdesu_backend", [Use su or sudo]) dnl Check for POSIX.1b scheduling AC_MSG_CHECKING([POSIX.1b scheduling]) diff --git a/kdesu/defaults.h b/kdesu/defaults.h index 668cdd02f..4649b2b16 100644 --- a/kdesu/defaults.h +++ b/kdesu/defaults.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kcookie.cpp b/kdesu/kcookie.cpp index f60ec7314..99b34ec4e 100644 --- a/kdesu/kcookie.cpp +++ b/kdesu/kcookie.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kcookie.h b/kdesu/kcookie.h index 4bd9fbf1e..713922011 100644 --- a/kdesu/kcookie.h +++ b/kdesu/kcookie.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu + * This file is part of the KDE project, module tdesu * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kdesu_pty.cpp b/kdesu/kdesu_pty.cpp index 8f48f0b88..d3392ec5e 100644 --- a/kdesu/kdesu_pty.cpp +++ b/kdesu/kdesu_pty.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This file contains code from TEShell.C of the KDE konsole. @@ -42,7 +42,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include "kdesu_pty.h" +#include "tdesu_pty.h" // stdlib.h is meant to declare the prototypes but doesn't :( #ifndef __THROW diff --git a/kdesu/kdesu_pty.h b/kdesu/kdesu_pty.h index 1a6a12c35..1dab49dcb 100644 --- a/kdesu/kdesu_pty.h +++ b/kdesu/kdesu_pty.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/kdesu_stub.c b/kdesu/kdesu_stub.c index 8ef7f503e..5e1f09c24 100644 --- a/kdesu/kdesu_stub.c +++ b/kdesu/kdesu_stub.c @@ -2,10 +2,10 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * - * kdesu_stub.c: KDE su executes this stub through su or ssh. This stub in turn + * tdesu_stub.c: KDE su executes this stub through su or ssh. This stub in turn * executes the target program. Before that, startup parameters * are sent through stdin. * @@ -14,7 +14,7 @@ * * Parameter Description Format (csl = comma separated list) * - * - kdesu_stub Header "ok" | "stop" + * - tdesu_stub Header "ok" | "stop" * - display X11 display string * - display_auth X11 authentication "type cookie" pair * - dcopserver KDE dcopserver csl of netids @@ -67,7 +67,7 @@ struct param_struct struct param_struct params[] = { - { "kdesu_stub", 0L }, + { "tdesu_stub", 0L }, { "display", 0L }, { "display_auth", 0L }, { "dcopserver", 0L }, @@ -192,7 +192,7 @@ int main() pid_t pid; FILE *fout; struct passwd *pw; - const char* kdesu_lc_all; + const char* tdesu_lc_all; /* Get startup parameters. */ @@ -203,7 +203,7 @@ int main() if (fgets(buf, BUFSIZE, stdin) == 0L) { printf("end\n"); fflush(stdout); - perror("kdesu_stub: fgets()"); + perror("tdesu_stub: fgets()"); exit(1); } params[i].value = xstrdup(buf); @@ -222,7 +222,7 @@ int main() if (fgets(buf, BUFSIZE, stdin) == 0L) { printf("end\n"); fflush(stdout); - perror("kdesu_stub: fgets()"); + perror("tdesu_stub: fgets()"); exit(1); } tmp = xstrdup( buf ); @@ -237,9 +237,9 @@ int main() xsetenv("PATH", params[P_PATH].value); xsetenv("DESKTOP_STARTUP_ID", params[P_APP_STARTUP_ID].value); - kdesu_lc_all = getenv( "KDESU_LC_ALL" ); - if( kdesu_lc_all != NULL ) - xsetenv("LC_ALL",kdesu_lc_all); + tdesu_lc_all = getenv( "KDESU_LC_ALL" ); + if( tdesu_lc_all != NULL ) + xsetenv("LC_ALL",tdesu_lc_all); else unsetenv("LC_ALL"); @@ -248,7 +248,7 @@ int main() pw = getpwnam(params[P_USER].value); if (pw == 0L) { - printf("kdesu_stub: user %s does not exist!\n", params[P_USER].value); + printf("tdesu_stub: user %s does not exist!\n", params[P_USER].value); exit(1); } xsetenv("HOME", pw->pw_dir); @@ -265,7 +265,7 @@ int main() sched.sched_priority = min + (int) (((double) prio) * (max - min) / 100 + 0.5); sched_setscheduler(0, SCHED_FIFO, &sched); #else - printf("kdesu_stub: realtime scheduling not supported\n"); + printf("tdesu_stub: realtime scheduling not supported\n"); #endif } else { @@ -281,19 +281,19 @@ int main() { if (setgid(pw->pw_gid) == -1) { - perror("kdesu_stub: setgid()"); + perror("tdesu_stub: setgid()"); exit(1); } #ifdef HAVE_INITGROUPS if (initgroups(pw->pw_name, pw->pw_gid) == -1) { - perror("kdesu_stub: initgroups()"); + perror("tdesu_stub: initgroups()"); exit(1); } #endif if (setuid(pw->pw_uid) == -1) { - perror("kdesu_stub: setuid()"); + perror("tdesu_stub: setuid()"); exit(1); } xsetenv("HOME", pw->pw_dir); @@ -323,7 +323,7 @@ int main() umask(oldumask); if (fd2 == -1) { - perror("kdesu_stub: mkstemp()"); + perror("tdesu_stub: mkstemp()"); exit(1); } else close(fd2); @@ -332,7 +332,7 @@ int main() fout = popen("xauth >/dev/null 2>&1","w"); if (fout == NULL) { - perror("kdesu_stub: popen(xauth)"); + perror("tdesu_stub: popen(xauth)"); exit(1); } fprintf(fout, "add %s %s\n", disp, @@ -361,7 +361,7 @@ int main() fd = mkstemp(iceauthority); umask(oldumask); if (fd == -1) { - perror("kdesu_stub: mkstemp()"); + perror("tdesu_stub: mkstemp()"); exit(1); } else close(fd); @@ -369,7 +369,7 @@ int main() fout = popen("iceauth >/dev/null 2>&1", "w"); if (!fout) { - perror("kdesu_stub: popen iceauth"); + perror("tdesu_stub: popen iceauth"); exit(1); } for (i=0; host[i]; i++) @@ -381,11 +381,11 @@ int main() } } - /* Rebuild the sycoca and start kdeinit? */ + /* Rebuild the sycoca and start tdeinit? */ if (strcmp(params[P_XWIN_ONLY].value, "no")) { - system("kdeinit --suicide"); + system("tdeinit --suicide"); } /* Execute the command */ @@ -393,7 +393,7 @@ int main() pid = fork(); if (pid == -1) { - perror("kdesu_stub: fork()"); + perror("tdesu_stub: fork()"); exit(1); } if (pid) @@ -408,7 +408,7 @@ int main() if (errno == EINTR) continue; if (errno != ECHILD) - perror("kdesu_stub: waitpid()"); + perror("tdesu_stub: waitpid()"); break; } if (WIFEXITED(state)) @@ -426,7 +426,7 @@ int main() /* Child: exec command. */ sprintf(buf, "%s", params[P_COMMAND].value); execl("/bin/sh", "sh", "-c", buf, (void *)0); - perror("kdesu_stub: exec()"); + perror("tdesu_stub: exec()"); _exit(1); } } diff --git a/kdesu/libkdesu.nmcheck b/kdesu/libkdesu.nmcheck index 11712f7d6..8e4827481 100644 --- a/kdesu/libkdesu.nmcheck +++ b/kdesu/libkdesu.nmcheck @@ -1,6 +1,6 @@ # KDE namespace check file -# kdesu classes +# tdesu classes SshProcess:* PTY::* SuProcess::* diff --git a/kdesu/process.cpp b/kdesu/process.cpp index d50e188f5..d52308f63 100644 --- a/kdesu/process.cpp +++ b/kdesu/process.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This file contains code from TEShell.C of the KDE konsole. @@ -53,7 +53,7 @@ #include <kstandarddirs.h> #include "process.h" -#include "kdesu_pty.h" +#include "tdesu_pty.h" #include "kcookie.h" int PtyProcess::waitMS(int fd,int ms) diff --git a/kdesu/process.h b/kdesu/process.h index c45132a9c..ec3af9a62 100644 --- a/kdesu/process.h +++ b/kdesu/process.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library @@ -128,7 +128,7 @@ public: public: /* static */ /* ** This is a collection of static functions that can be - ** used for process control inside kdesu. I'd suggest + ** used for process control inside tdesu. I'd suggest ** against using this publicly. There are probably ** nicer Qt based ways to do what you want. */ diff --git a/kdesu/ssh.cpp b/kdesu/ssh.cpp index d39634ac5..f45b38e7e 100644 --- a/kdesu/ssh.cpp +++ b/kdesu/ssh.cpp @@ -2,7 +2,7 @@ * * $Id$ * -* This file is part of the KDE project, module kdesu. +* This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library @@ -44,7 +44,7 @@ SshProcess::SshProcess(const TQCString &host, const TQCString &user, const TQCSt m_Host = host; m_User = user; m_Command = command; - m_Stub = "kdesu_stub"; + m_Stub = "tdesu_stub"; srand(time(0L)); } @@ -116,7 +116,7 @@ int SshProcess::exec(const char *password, int check) if (ret < 0) { if (!check) - kdError(900) << k_lineinfo << "Converstation with kdesu_stub failed\n"; + kdError(900) << k_lineinfo << "Converstation with tdesu_stub failed\n"; return ret; } else if (ret == 1) @@ -205,8 +205,8 @@ int SshProcess::ConverseSsh(const char *password, int check) switch (state) { case 0: - // Check for "kdesu_stub" header. - if (line == "kdesu_stub") + // Check for "tdesu_stub" header. + if (line == "tdesu_stub") { unreadLine(line); return 0; diff --git a/kdesu/ssh.h b/kdesu/ssh.h index 66ee0fccc..c84c56d02 100644 --- a/kdesu/ssh.h +++ b/kdesu/ssh.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdesu/stub.cpp b/kdesu/stub.cpp index 2af171d72..7f083d71b 100644 --- a/kdesu/stub.cpp +++ b/kdesu/stub.cpp @@ -2,14 +2,14 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library * General Public License, version 2. See the file "COPYING.LIB" for the * exact licensing terms. * - * stub.cpp: Conversation with kdesu_stub. + * stub.cpp: Conversation with tdesu_stub. */ #include <config.h> @@ -72,8 +72,8 @@ TQCString StubProcess::commaSeparatedList(QCStringList lst) } /* - * Conversation with kdesu_stub. This is how we pass the authentication - * tokens (X11, DCOP) and other stuff to kdesu_stub. + * Conversation with tdesu_stub. This is how we pass the authentication + * tokens (X11, DCOP) and other stuff to tdesu_stub. * return values: -1 = error, 0 = ok, 1 = kill me */ @@ -86,7 +86,7 @@ int StubProcess::ConverseStub(int check) if (line.isNull()) return -1; - if (line == "kdesu_stub") + if (line == "tdesu_stub") { // This makes parsing a lot easier. enableLocalEcho(false); diff --git a/kdesu/stub.h b/kdesu/stub.h index 48d2f65bb..8bfc70a7f 100644 --- a/kdesu/stub.h +++ b/kdesu/stub.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library @@ -24,9 +24,9 @@ typedef TQValueList<TQCString> QCStringList; /** - * Chat with kdesu_stub. + * Chat with tdesu_stub. * - * StubProcess extends PtyProcess with functionality to chat with kdesu_stub. + * StubProcess extends PtyProcess with functionality to chat with tdesu_stub. */ class KDESU_EXPORT StubProcess: public PtyProcess @@ -52,7 +52,7 @@ public: void setUser(const TQCString &user) { m_User = user; } /** - * Set to "X only mode": Sycoca is not built and kdeinit is not launched. + * Set to "X only mode": Sycoca is not built and tdeinit is not launched. */ void setXOnly(bool xonly) { m_bXOnly = xonly; } @@ -82,7 +82,7 @@ public: protected: /** - * Exchange all parameters with kdesu_stub. + * Exchange all parameters with tdesu_stub. */ int ConverseStub(int check); diff --git a/kdesu/su.cpp b/kdesu/su.cpp index 864a3bcc0..0739c29c3 100644 --- a/kdesu/su.cpp +++ b/kdesu/su.cpp @@ -2,7 +2,7 @@ * * $Id$ * -* This file is part of the KDE project, module kdesu. +* This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * Sudo support added by Jonathan Riddell <jriddell@ ubuntu.com> @@ -112,7 +112,7 @@ int SuProcess::exec(const char *password, int check) if (superUserCommand == "su") { args += "-c"; } - args += TQCString(__KDE_BINDIR) + "/kdesu_stub"; + args += TQCString(__KDE_BINDIR) + "/tdesu_stub"; #ifndef Q_OS_DARWIN args += "-"; #endif @@ -199,7 +199,7 @@ int SuProcess::exec(const char *password, int check) if (iret < 0) { if (!check) - kdError(900) << k_lineinfo << "Converstation with kdesu_stub failed\n"; + kdError(900) << k_lineinfo << "Converstation with tdesu_stub failed\n"; return iret; } else if (iret == 1) @@ -245,7 +245,7 @@ int SuProcess::ConverseSU(const char *password) case WaitForPrompt: { // In case no password is needed. - if (line == "kdesu_stub") + if (line == "tdesu_stub") { unreadLine(line); return ok; @@ -319,8 +319,8 @@ int SuProcess::ConverseSU(const char *password) } ////////////////////////////////////////////////////////////////////////// case HandleStub: - // Read till we get "kdesu_stub" - if (line == "kdesu_stub") + // Read till we get "tdesu_stub" + if (line == "tdesu_stub") { unreadLine(line); return ok; diff --git a/kdesu/su.h b/kdesu/su.h index bb99e6f31..dcb67a14c 100644 --- a/kdesu/su.h +++ b/kdesu/su.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * This is free software; you can use this library under the GNU Library diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index 2623a1cea..284a37409 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -21,10 +21,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile @@ -84,7 +84,7 @@ install( FILES install( FILES aboutkde.png ktip-bulb.png ktip-background.png - DESTINATION ${DATA_INSTALL_DIR}/kdeui/pics ) + DESTINATION ${DATA_INSTALL_DIR}/tdeui/pics ) install( FILES ui_standards.rc @@ -97,7 +97,7 @@ install( PROGRAMS ##### libtdeui ################################## -set( target kdeui ) +set( target tdeui ) set( ${target}_SRCS qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp @@ -148,7 +148,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} + LINK tdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} DEPENDENCIES dcopidl DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kdeui/Makefile.am b/kdeui/Makefile.am index 66719d8b1..4752cdb95 100644 --- a/kdeui/Makefile.am +++ b/kdeui/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = . tests about kdetrayproxy -INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/kdefx -I$(top_srcdir)/interfaces $(all_includes) +INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/tdefx -I$(top_srcdir)/interfaces $(all_includes) # For the future: examine if condensing the tons of *_LDFLAGS variables # into $(all_libraries) isn't better @@ -28,12 +28,12 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) lib_LTLIBRARIES = libtdeui.la libkspell.la libtdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2 -libtdeui_la_LIBADD = ../kdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kdefx/libtdefx.la $(LIB_XEXT) +libtdeui_la_LIBADD = ../tdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/tdefx/libtdefx.la $(LIB_XEXT) libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined libkspell_la_SOURCES = dummy.cpp -picsdir = $(kde_datadir)/kdeui/pics +picsdir = $(kde_datadir)/tdeui/pics pics_DATA = aboutkde.png ktip-bulb.png ktip-background.png include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \ @@ -135,8 +135,8 @@ scriptsdir = $(kde_bindir) libtdeui_la_METASOURCES = AUTO libtdeui_la_NMCHECK = $(srcdir)/libtdeui.nmcheck -libtdeui_la_NMCHECKWEAK = $(srcdir)/libtdeui_weak.nmcheck $(top_srcdir)/kdecore/libtdecore_weak.nmcheck \ - $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck +libtdeui_la_NMCHECKWEAK = $(srcdir)/libtdeui_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \ + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck rcdir = $(kde_confdir)/ui rc_DATA = ui_standards.rc @@ -166,6 +166,6 @@ dummy.cpp: echo "}" >> dummy.cpp echo "#endif" >> dummy.cpp -DOXYGEN_REFERENCES = kdecore kdefx dcop kio kutils +DOXYGEN_REFERENCES = tdecore tdefx dcop kio kutils DOXYGEN_SET_INTERNAL_DOCS = YES include ../admin/Doxyfile.am diff --git a/kdeui/about/CMakeLists.txt b/kdeui/about/CMakeLists.txt index 63b43e462..7330005e2 100644 --- a/kdeui/about/CMakeLists.txt +++ b/kdeui/about/CMakeLists.txt @@ -18,4 +18,4 @@ install( FILES box-top-left.png bar-middle-right.png box-bottom-left.png box-top-middle.png bar-top-left.png box-bottom-middle.png box-top-right.png bar-top-middle.png box-bottom-right.png kde_infopage.css kde_infopage_rtl.css - DESTINATION ${DATA_INSTALL_DIR}/kdeui/about ) + DESTINATION ${DATA_INSTALL_DIR}/tdeui/about ) diff --git a/kdeui/about/Makefile.am b/kdeui/about/Makefile.am index 6bff21130..478bb71e0 100644 --- a/kdeui/about/Makefile.am +++ b/kdeui/about/Makefile.am @@ -1,5 +1,5 @@ -kde_infopage_datadir = $(kde_datadir)/kdeui/about +kde_infopage_datadir = $(kde_datadir)/tdeui/about kde_infopage_data_DATA = \ bar-bottom-left.png bar-top-right.png bar-bottom-middle.png bottom-left.png \ box-middle-left.png top-left.png bar-bottom-right.png bottom-middle.png \ diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp index 807604c47..b520e8380 100644 --- a/kdeui/kaboutkde.cpp +++ b/kdeui/kaboutkde.cpp @@ -82,6 +82,6 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) addTextPage( i18n("&Report Bugs or Wishes"), text2, true ); addTextPage( i18n("&Join the Trinity Team"), text3, true ); addTextPage( i18n("&Support Trinity"), text4, true ); - setImage( locate( "data", TQString::tqfromLatin1("kdeui/pics/aboutkde.png")) ); + setImage( locate( "data", TQString::tqfromLatin1("tdeui/pics/aboutkde.png")) ); setImageBackgroundColor( white ); } diff --git a/kdeui/kactivelabel.cpp b/kdeui/kactivelabel.cpp index 0315e348d..e16de1374 100644 --- a/kdeui/kactivelabel.cpp +++ b/kdeui/kactivelabel.cpp @@ -74,7 +74,7 @@ void KActiveLabel::openLink(const TQString & link) TQStringList args; args << "exec" << link; - kapp->kdeinitExec("kfmclient", args); + kapp->tdeinitExec("kfmclient", args); } void KActiveLabel::virtual_hook( int, void* ) diff --git a/kdeui/kcmodule.cpp b/kdeui/kcmodule.cpp index 0c26d11ec..7d82d2957 100644 --- a/kdeui/kcmodule.cpp +++ b/kdeui/kcmodule.cpp @@ -1,7 +1,7 @@ /* This file is part of the KDE libraries -<<<Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> +<<<Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> Copyright (C) 2004 Frans Englich <frans.englich@telia.com> This library is free software; you can redistribute it and/or diff --git a/kdeui/kdepackages.h b/kdeui/kdepackages.h index 28248210a..0f146975b 100644 --- a/kdeui/kdepackages.h +++ b/kdeui/kdepackages.h @@ -414,11 +414,11 @@ const char * const packages[] = { "kdelibs", "kdelibs/kbugreport", "kdelibs/kcertpart", -"kdelibs/kdecore", +"kdelibs/tdecore", "kdelibs/kded", -"kdelibs/kdeinit", -"kdelibs/kdesasl", -"kdelibs/kdeui", +"kdelibs/tdeinit", +"kdelibs/tdesasl", +"kdelibs/tdeui", "kdelibs/kedittoolbar", "kdelibs/kimgio", "kdelibs/klauncher", @@ -437,20 +437,20 @@ const char * const packages[] = { "kdelirc/kcmlirc", "kdemultimedia", "kdepasswd", -"kdepimlibs", -"kdepimlibs/gpgme++", -"kdepimlibs/kabc", -"kdepimlibs/kblog", -"kdepimlibs/kcal", -"kdepimlibs/kldap", -"kdepimlibs/kmime", -"kdepimlibs/kpimidentities", -"kdepimlibs/mailtransport", -"kdepimlibs/qgpgme", -"kdepimlibs/syndication", -"kdeprint", -"kdeprint/kdeprintfax", -"kdeprint/kjobviewer", +"tdepimlibs", +"tdepimlibs/gpgme++", +"tdepimlibs/kabc", +"tdepimlibs/kblog", +"tdepimlibs/kcal", +"tdepimlibs/kldap", +"tdepimlibs/kmime", +"tdepimlibs/kpimidentities", +"tdepimlibs/mailtransport", +"tdepimlibs/qgpgme", +"tdepimlibs/syndication", +"tdeprint", +"tdeprint/tdeprintfax", +"tdeprint/kjobviewer", "kdesdk-scripts", "kdesdk-scripts/Miscellaneous", "kdesdk-scripts/cmake", @@ -460,9 +460,9 @@ const char * const packages[] = { "kdesktop/minicli", "kdesktop/wallpaper", "kdessh", -"kdesu", -"kdesu/kdesu", -"kdesu/kdesud", +"tdesu", +"tdesu/tdesu", +"tdesu/tdesud", "kdesvn-build", "kdetv", "kdevelop", diff --git a/kdeui/kdetrayproxy/CMakeLists.txt b/kdeui/kdetrayproxy/CMakeLists.txt index 1d26e60a5..be341b277 100644 --- a/kdeui/kdetrayproxy/CMakeLists.txt +++ b/kdeui/kdetrayproxy/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/kded - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -40,7 +40,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdecore-shared kdeinit_kded-shared + LINK tdecore-shared tdeinit_kded-shared DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeui/kpanelmenu.cpp b/kdeui/kpanelmenu.cpp index c1431a22e..ed13502a4 100644 --- a/kdeui/kpanelmenu.cpp +++ b/kdeui/kpanelmenu.cpp @@ -1,7 +1,7 @@ /***************************************************************** Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. - (c) Michael Goffioul <kdeprint@swing.be> + (c) Michael Goffioul <tdeprint@swing.be> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/kdeui/kpanelmenu.h b/kdeui/kpanelmenu.h index de0b065eb..7db6393b2 100644 --- a/kdeui/kpanelmenu.h +++ b/kdeui/kpanelmenu.h @@ -1,7 +1,7 @@ /***************************************************************** Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. - (c) 2001 Michael Goffioul <kdeprint@swing.be> + (c) 2001 Michael Goffioul <tdeprint@swing.be> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -48,7 +48,7 @@ class KPanelMenuPrivate; * library name without any extension). This desktop file has to be installed in * $KDEDIR/share/apps/kicker/menuext/. * - * @author The kicker maintainers, Michael Goffioul <kdeprint@swing.be> + * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be> */ class KDEUI_EXPORT KPanelMenu : public KPopupMenu { diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp index dad923c62..c10a1b673 100644 --- a/kdeui/kpassdlg.cpp +++ b/kdeui/kpassdlg.cpp @@ -49,7 +49,7 @@ #include "kpassdlg.h" -#include "../kdesu/defaults.h" +#include "../tdesu/defaults.h" /* * Password line editor. @@ -339,7 +339,7 @@ void KPasswordDialog::init() KConfig* const cfg = KGlobal::config(); const KConfigGroupSaver saver(cfg, "Passwords"); - bool def = ( qstrcmp( tqAppName(), "kdesu" ) == 0 ? defKeep : false ); + bool def = ( qstrcmp( tqAppName(), "tdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) ++m_Keep; diff --git a/kdeui/kpixmapio.cpp b/kdeui/kpixmapio.cpp index 4d1e3c06a..1900da11f 100644 --- a/kdeui/kpixmapio.cpp +++ b/kdeui/kpixmapio.cpp @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdeui. + * This file is part of the KDE project, module tdeui. * Copyright (C) 2000 Geert Jansen <jansen@kde.org>. * * You can Freely distribute this program under the GNU Library General diff --git a/kdeui/kpixmapio.h b/kdeui/kpixmapio.h index 4913de580..62bde1c35 100644 --- a/kdeui/kpixmapio.h +++ b/kdeui/kpixmapio.h @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdeui. + * This file is part of the KDE project, module tdeui. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> * * You can Freely distribute this program under the GNU Library General diff --git a/kdeui/kpixmapregionselectorwidget.cpp b/kdeui/kpixmapregionselectorwidget.cpp index df096067e..1af5ef14a 100644 --- a/kdeui/kpixmapregionselectorwidget.cpp +++ b/kdeui/kpixmapregionselectorwidget.cpp @@ -18,8 +18,8 @@ */ /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. */ diff --git a/kdeui/kpixmapregionselectorwidget.h b/kdeui/kpixmapregionselectorwidget.h index 3709f1fde..6bd518c93 100644 --- a/kdeui/kpixmapregionselectorwidget.h +++ b/kdeui/kpixmapregionselectorwidget.h @@ -34,8 +34,8 @@ class KPopupMenu; * user with a friendly way to select a rectangular subregion of the pixmap. * * NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. * * @author Antonio Larrosa <larrosa@kde.org> diff --git a/kdeui/krootpixmap.cpp b/kdeui/krootpixmap.cpp index 8dbdf6149..6f664b9a0 100644 --- a/kdeui/krootpixmap.cpp +++ b/kdeui/krootpixmap.cpp @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdeui. + * This file is part of the KDE project, module tdeui. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * * You can Freely distribute this program under the GNU Library diff --git a/kdeui/ktip.cpp b/kdeui/ktip.cpp index f8e30fcd1..8ccd23945 100644 --- a/kdeui/ktip.cpp +++ b/kdeui/ktip.cpp @@ -216,11 +216,11 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQHBoxLayout *pl = new TQHBoxLayout(vbox, 0, 0); TQLabel *bulb = new TQLabel(this); - bulb->setPixmap(locate("data", "kdeui/pics/ktip-bulb.png")); + bulb->setPixmap(locate("data", "tdeui/pics/ktip-bulb.png")); pl->addWidget(bulb); TQLabel *titlePane = new TQLabel(this); - titlePane->setBackgroundPixmap(locate("data", "kdeui/pics/ktip-background.png")); + titlePane->setBackgroundPixmap(locate("data", "tdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); titlePane->tqsetAlignment(TQLabel::AlignCenter); diff --git a/kdeui/libkdeui.nmcheck b/kdeui/libkdeui.nmcheck index 8f9ee9237..df40cf046 100644 --- a/kdeui/libkdeui.nmcheck +++ b/kdeui/libkdeui.nmcheck @@ -1,5 +1,5 @@ # KDE namespace check file -# kdeui classes +# tdeui classes K*::* QXEmbed::* diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index 6288fea57..03d9ca1d2 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -447,7 +447,7 @@ static int qxembed_x11_event_filter( XEvent* e) extra->embedded = 1; #ifdef USE_QT4 // [FIXME] - printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); + printf("[FIXME] WId not set in kdelibs/tdeui/qxembed.cpp\n\r"); #else // USE_QT4 extra->parentWinId = e->xclient.data.l[3]; #endif // USE_QT4 @@ -1320,7 +1320,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) ((QXEmbed*)client)->topData()->embedded = true; #ifdef USE_QT4 // [FIXME] - printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); + printf("[FIXME] WId not set in kdelibs/tdeui/qxembed.cpp\n\r"); #else // USE_QT4 ((QXEmbed*)client)->topData()->parentWinId = window; #endif // USE_QT4 diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt index c6baf54ab..3cc853235 100644 --- a/kdeui/tests/CMakeLists.txt +++ b/kdeui/tests/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/dcop ) @@ -45,5 +45,5 @@ set( test_PROGS ) foreach( PROG ${test_PROGS} ) - tde_add_executable( ${PROG} AUTOMOC SOURCES "${PROG}.cpp" LINK kdeui-shared ) + tde_add_executable( ${PROG} AUTOMOC SOURCES "${PROG}.cpp" LINK tdeui-shared ) endforeach( PROG ${test_PROGS} ) diff --git a/kdeui/tests/Makefile.am b/kdeui/tests/Makefile.am index 607196380..b919ab3b4 100644 --- a/kdeui/tests/Makefile.am +++ b/kdeui/tests/Makefile.am @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui \ +INCLUDES = -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeui \ $(all_includes) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH) diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt index 644a9dbb1..d68fbd3d6 100644 --- a/kdewidgets/CMakeLists.txt +++ b/kdewidgets/CMakeLists.txt @@ -19,10 +19,10 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kfile ) @@ -42,7 +42,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am index ef57238d7..cb5934e88 100644 --- a/kdewidgets/Makefile.am +++ b/kdewidgets/Makefile.am @@ -25,8 +25,8 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes) bin_PROGRAMS = makekdewidgets makekdewidgets_SOURCES = makekdewidgets.cpp -makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -makekdewidgets_LDADD = $(LIB_QT) ../kdecore/libtdecore.la +makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +makekdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la kde_widget_LTLIBRARIES = kdewidgets.la kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt index 67fae5fa7..81ae33be0 100644 --- a/kdoctools/CMakeLists.txt +++ b/kdoctools/CMakeLists.txt @@ -14,8 +14,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kioslave diff --git a/kdoctools/Mainpage.dox b/kdoctools/Mainpage.dox index 5c102c941..e6a5120d4 100644 --- a/kdoctools/Mainpage.dox +++ b/kdoctools/Mainpage.dox @@ -21,6 +21,6 @@ holders. */ -// DOXYGEN_REFERENCES = kdecore kdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui kio // DOXYGEN_SET_PROJECT_NAME = KDocTools // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kdoctools/configure.in.in b/kdoctools/configure.in.in index 2fcb7b75a..1905d9a21 100644 --- a/kdoctools/configure.in.in +++ b/kdoctools/configure.in.in @@ -3,7 +3,7 @@ HELP_SUBDIR=kdoctools KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [ - AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)]) + AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in tdesupport for CVS users' convience)]) HELP_SUBDIR= ]) @@ -35,7 +35,7 @@ fi if test -n "$HELP_SUBDIR"; then KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [ - AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)]) + AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in tdesupport for CVS users' convience)]) HELP_SUBDIR= ]) diff --git a/kdoctools/customization/entities/contributor.entities b/kdoctools/customization/entities/contributor.entities index 050165f53..53b24628a 100644 --- a/kdoctools/customization/entities/contributor.entities +++ b/kdoctools/customization/entities/contributor.entities @@ -142,7 +142,7 @@ <!ENTITY Francis.Giannaros '<personname><firstname>Francis</firstname><surname>Giannaros</surname></personname>'> <!ENTITY Francis.Giannaros.mail '<email>francisg@gmail.com</email>'> <!ENTITY Michael.Goffioul '<personname><firstname>Michael</firstname><surname>Goffioul</surname></personname>'> -<!ENTITY Michael.Goffioul.mail '<email>kdeprint@swing.be</email>'> +<!ENTITY Michael.Goffioul.mail '<email>tdeprint@swing.be</email>'> <!ENTITY Robert.Gogolok '<personname><firstname>Robert</firstname><surname>Gogolok</surname></personname>'> <!ENTITY Robert.Gogolok.mail '<email>mail@robert-gogolok.de</email>'> <!ENTITY Nicolas.Goutte '<personname><firstname>Nicolas</firstname><surname>Goutte</surname></personname>'> diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities index 485f5d5be..36e2914b7 100644 --- a/kdoctools/customization/entities/general.entities +++ b/kdoctools/customization/entities/general.entities @@ -189,10 +189,10 @@ <!ENTITY kde-http '<ulink url="http://www.kde.org/">http://www.kde.org/</ulink>'> <!ENTITY kde-ftp '<ulink url="ftp://ftp.kde.org/pub/kde/">ftp://ftp.kde.org/pub/kde/</ulink>'> <!ENTITY kdepasswd "<application>kdepasswd</application>"> -<!ENTITY kdeprint "<application>KDEPrint</application>"> +<!ENTITY tdeprint "<application>KDEPrint</application>"> <!ENTITY kdesktop "<application>KDesktop</application>"> <!ENTITY kdessh "<application>kdessh</application>"> -<!ENTITY kdesu "<application>KDE su</application>"> +<!ENTITY tdesu "<application>KDE su</application>"> <!ENTITY kdiskfree "<application>KDiskFree</application>"> <!ENTITY kdict "<application>KDict</application>"> <!ENTITY kdm "<application>kdm</application>"> diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities index 50e7c2ee3..11f6e5aa1 100644 --- a/kdoctools/customization/obsolete/general.entities +++ b/kdoctools/customization/obsolete/general.entities @@ -188,7 +188,7 @@ <!ENTITY kdepasswd "<application>kdepasswd</application>"> <!ENTITY kdesktop "<application>KDesktop</application>"> <!ENTITY kdessh "<application>kdessh</application>"> -<!ENTITY kdesu "<application>KDE su</application>"> +<!ENTITY tdesu "<application>KDE su</application>"> <!ENTITY kdiskfree "<application>KDiskFree</application>"> <!ENTITY kdict "<application>KDict</application>"> <!ENTITY kdm "<application>kdm</application>"> diff --git a/kdoctools/customization/sr/user.entities b/kdoctools/customization/sr/user.entities index 41c1aa37a..356e3d7c3 100644 --- a/kdoctools/customization/sr/user.entities +++ b/kdoctools/customization/sr/user.entities @@ -220,7 +220,7 @@ <!ENTITY kdeedu-n "<acronym>КДЕ</acronym>-образовање" > <!ENTITY kdeexp-g "К радног окружења" > <!ENTITY kdeexp-n "К радно окружење" > -<!ENTITY kdegames-n "<acronym>КДЕ</acronym>-игре" > +<!ENTITY tdegames-n "<acronym>КДЕ</acronym>-игре" > <!ENTITY kdegraphics-n "<acronym>КДЕ</acronym>-графика" > <!ENTITY kdelibs-n "<acronym>КДЕ</acronym>-библиотеке" > <!ENTITY kdemultimedia-n "<acronym>КДЕ</acronym>-мултимедија" > diff --git a/kdoctools/template.docbook b/kdoctools/template.docbook index 719379c1f..0b0b5940b 100644 --- a/kdoctools/template.docbook +++ b/kdoctools/template.docbook @@ -502,7 +502,7 @@ application --> <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, +.Libraries or other software that is not included in tdesupport, kdelibs, or kdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt index 9a2488c4a..fc503ca81 100644 --- a/khtml/CMakeLists.txt +++ b/khtml/CMakeLists.txt @@ -28,20 +28,20 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kjs ${CMAKE_BINARY_DIR}/kio/kssl - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/kwallet/client - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -88,7 +88,7 @@ tde_add_library( ${target} SHARED AUTOMOC VERSION 4.2.0 LINK ${VSCRIPT} kjava-static kjs_html-static khtmldom-static khtmlcss-static khtmlhtml-static khtmlxml-static khtmlrender-static khtmlmisc-static - kutils-shared kdeprint-shared kjs-shared ${JPEG_LIBRARIES} + kutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} DEPENDENCIES dcopidl ) diff --git a/khtml/Mainpage.dox b/khtml/Mainpage.dox index 2e838b4a6..02ac5c5dd 100644 --- a/khtml/Mainpage.dox +++ b/khtml/Mainpage.dox @@ -40,7 +40,7 @@ Maksim Orlovich @lgpl */ -// DOXYGEN_REFERENCES = kdecore kdeui kio kparts kjs +// DOXYGEN_REFERENCES = tdecore tdeui kio kparts kjs // DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test // DOXYGEN_SET_PROJECT_NAME = KHTML // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/khtml/Makefile.am b/khtml/Makefile.am index a81d679d8..61e3a5865 100644 --- a/khtml/Makefile.am +++ b/khtml/Makefile.am @@ -55,7 +55,7 @@ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \ ./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \ $(LIB_KPARTS) \ $(LIBTHAI) \ - $(top_builddir)/kdeprint/libtdeprint.la \ + $(top_builddir)/tdeprint/libtdeprint.la \ $(top_builddir)/kutils/libkutils.la \ $(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11) @@ -84,7 +84,7 @@ INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \ -I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \ -I$(top_srcdir)/libltdl \ -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \ - -I$(top_srcdir)/kdeprint \ + -I$(top_srcdir)/tdeprint \ -I$(top_srcdir)/interfaces \ -I$(top_srcdir)/interfaces/kregexpeditor \ -I$(top_srcdir)/kwallet/client \ @@ -102,7 +102,7 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore \ + kdoc -H -d $(SRCDOC_DEST) tdecore \ $(include_HEADERS) -lqt EXTRA_DIST = CHANGES DESIGN README.HTMLWidget README.tags @@ -124,7 +124,7 @@ testkhtml_static_LDFLAGS = -static testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp testregression_LDADD = libkhtml.la -DOXYGEN_REFERENCES = kdecore kdeui kio kdefx kparts +DOXYGEN_REFERENCES = tdecore tdeui kio tdefx kparts DOXYGEN_EXCLUDE = test*.* css ecma html java kmultipart misc pics rendering test xml include ../admin/Doxyfile.am diff --git a/khtml/css/CMakeLists.txt b/khtml/css/CMakeLists.txt index 1283dce2d..50ca11815 100644 --- a/khtml/css/CMakeLists.txt +++ b/khtml/css/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kwallet/client diff --git a/khtml/design.h b/khtml/design.h index 22a989b02..5f54c3137 100644 --- a/khtml/design.h +++ b/khtml/design.h @@ -34,7 +34,7 @@ * cascading style sheets (CSS2), and JavaScript. * * If you want to add to your application a widget that only needs simple text - * browsing, you can also use the KTextBrowser widget in kdeui. + * browsing, you can also use the KTextBrowser widget in tdeui. * * KHTMLPart : * The main part/widget for using khtml. diff --git a/khtml/dom/CMakeLists.txt b/khtml/dom/CMakeLists.txt index ea0837cdf..83dd88c5c 100644 --- a/khtml/dom/CMakeLists.txt +++ b/khtml/dom/CMakeLists.txt @@ -15,9 +15,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ) diff --git a/khtml/dom/Makefile.am b/khtml/dom/Makefile.am index f17e29423..a799e8c0d 100644 --- a/khtml/dom/Makefile.am +++ b/khtml/dom/Makefile.am @@ -54,5 +54,5 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt diff --git a/khtml/ecma/CMakeLists.txt b/khtml/ecma/CMakeLists.txt index 307623f48..77457436b 100644 --- a/khtml/ecma/CMakeLists.txt +++ b/khtml/ecma/CMakeLists.txt @@ -14,13 +14,13 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kjs - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/bookmarks diff --git a/khtml/html/CMakeLists.txt b/khtml/html/CMakeLists.txt index 0736cb407..8f47c06f8 100644 --- a/khtml/html/CMakeLists.txt +++ b/khtml/html/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/khtml/java/CMakeLists.txt b/khtml/java/CMakeLists.txt index 94a249318..abda3ed66 100644 --- a/khtml/java/CMakeLists.txt +++ b/khtml/java/CMakeLists.txt @@ -15,13 +15,13 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/kio/kssl ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kssl ) diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 5076e1c89..6412902a7 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() { void KHTMLPart::launchJSConfigDialog() { TQStringList args; args << "khtml_java_js"; - KApplication::kdeinitExec( "kcmshell", args ); + KApplication::tdeinitExec( "kcmshell", args ); } TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script) diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp index 466e3066c..ed998ffb7 100644 --- a/khtml/khtml_printsettings.cpp +++ b/khtml/khtml_printsettings.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * 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/khtml/khtml_printsettings.h b/khtml/khtml_printsettings.h index b26c98144..9f69d9b88 100644 --- a/khtml/khtml_printsettings.h +++ b/khtml/khtml_printsettings.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #ifndef KHTML_PRINTSETTINGS_H #define KHTML_PRINTSETTINGS_H -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class TQCheckBox; diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index bcf9ede59..c895df5f6 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -2785,7 +2785,7 @@ void KHTMLView::print(bool quick) if ( !docname.isEmpty() ) docname = KStringHandler::csqueeze(docname, 80); if(quick || printer->setup(this, i18n("Print %1").arg(docname))) { - viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in kdeprint's dialogs + viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs // set up KPrinter printer->setFullPage(false); printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)); diff --git a/khtml/kmultipart/CMakeLists.txt b/khtml/kmultipart/CMakeLists.txt index 4c798f584..3f07007bd 100644 --- a/khtml/kmultipart/CMakeLists.txt +++ b/khtml/kmultipart/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kutils diff --git a/khtml/misc/CMakeLists.txt b/khtml/misc/CMakeLists.txt index ea074a639..3ef86c200 100644 --- a/khtml/misc/CMakeLists.txt +++ b/khtml/misc/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kutils diff --git a/khtml/misc/Makefile.am b/khtml/misc/Makefile.am index a64706e73..fcb4ed025 100644 --- a/khtml/misc/Makefile.am +++ b/khtml/misc/Makefile.am @@ -39,5 +39,5 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt diff --git a/khtml/rendering/CMakeLists.txt b/khtml/rendering/CMakeLists.txt index 45924ac2d..fe3301265 100644 --- a/khtml/rendering/CMakeLists.txt +++ b/khtml/rendering/CMakeLists.txt @@ -14,11 +14,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/khtml/rendering/Makefile.am b/khtml/rendering/Makefile.am index 4389b29f8..c81b4bea1 100644 --- a/khtml/rendering/Makefile.am +++ b/khtml/rendering/Makefile.am @@ -49,7 +49,7 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt ## maintainer: regen loading icon loading-icon: diff --git a/khtml/xml/CMakeLists.txt b/khtml/xml/CMakeLists.txt index c9ea9f696..82fe99d4c 100644 --- a/khtml/xml/CMakeLists.txt +++ b/khtml/xml/CMakeLists.txt @@ -14,12 +14,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kjs - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kwallet/client diff --git a/khtml/xml/Makefile.am b/khtml/xml/Makefile.am index 8f7cd6b7f..676c945be 100644 --- a/khtml/xml/Makefile.am +++ b/khtml/xml/Makefile.am @@ -44,5 +44,5 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt index 5b09dfff2..f227b4f88 100644 --- a/kimgio/CMakeLists.txt +++ b/kimgio/CMakeLists.txt @@ -14,8 +14,8 @@ set( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${USE_EXCEPTIONS} ) include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -29,7 +29,7 @@ set( target kimg_eps ) tde_add_kpart( ${target} SOURCES eps.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -40,7 +40,7 @@ set( target kimg_xview ) tde_add_kpart( ${target} SOURCES xview.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -51,7 +51,7 @@ if( TIFF_FOUND ) set( target kimg_tiff ) tde_add_kpart( ${target} SOURCES tiffr.cpp - LINK kdecore-shared ${TIFF_LIBRARIES} + LINK tdecore-shared ${TIFF_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES tiff.kimgio DESTINATION ${SERVICES_INSTALL_DIR} ) @@ -64,7 +64,7 @@ set( target kimg_ico ) tde_add_kpart( ${target} SOURCES ico.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -75,7 +75,7 @@ if( JASPER_FOUND ) set( target kimg_jp2 ) tde_add_kpart( ${target} SOURCES jp2.cpp - LINK kdecore-shared ${JASPER_LIBRARIES} + LINK tdecore-shared ${JASPER_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES jp2.kimgio DESTINATION ${SERVICES_INSTALL_DIR} ) @@ -87,7 +87,7 @@ endif( JASPER_FOUND ) set( target kimg_pcx ) tde_add_kpart( ${target} SOURCES pcx.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -97,7 +97,7 @@ tde_add_kpart( ${target} set( target kimg_tga ) tde_add_kpart( ${target} SOURCES tga.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -107,7 +107,7 @@ tde_add_kpart( ${target} set( target kimg_rgb ) tde_add_kpart( ${target} SOURCES rgb.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -117,7 +117,7 @@ tde_add_kpart( ${target} set( target kimg_xcf ) tde_add_kpart( ${target} SOURCES xcf.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -127,7 +127,7 @@ tde_add_kpart( ${target} set( target kimg_dds ) tde_add_kpart( ${target} SOURCES dds.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -138,7 +138,7 @@ if( OPENEXR_FOUND ) set( target kimg_exr ) tde_add_kpart( ${target} SOURCES exr.cpp - LINK kdecore-shared ${OPENEXR_LIBRARIES} + LINK tdecore-shared ${OPENEXR_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) # FIXME COMPILE_FLAGS must be written a little better @@ -152,7 +152,7 @@ endif( OPENEXR_FOUND ) set( target kimg_psd ) tde_add_kpart( ${target} SOURCES psd.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -161,7 +161,7 @@ tde_add_kpart( ${target} set( target kimg_hdr ) tde_add_kpart( ${target} SOURCES hdr.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am index bc94ff12a..bfdcc38b9 100644 --- a/kimgio/Makefile.am +++ b/kimgio/Makefile.am @@ -45,7 +45,7 @@ kimg_ico_la_LIBADD = $(LIB_QT) kimg_jp2_la_SOURCES = jp2.cpp kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries) -kimg_jp2_la_LIBADD = $(LIB_QT) $(LIB_JASPER) ../kdecore/libtdecore.la +kimg_jp2_la_LIBADD = $(LIB_QT) $(LIB_JASPER) ../tdecore/libtdecore.la kimg_pcx_la_SOURCES = pcx.cpp kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries) diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index c64bcfc33..d5b637ee4 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -14,11 +14,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${FREETYPE_INCLUDE_DIRS} @@ -29,9 +29,9 @@ link_directories( ) -#### kdeinit #################################### +#### tdeinit #################################### -set( target kdeinit ) +set( target tdeinit ) set( ${target}_SRCS kinit.cpp setproctitle.cpp @@ -44,9 +44,9 @@ tde_add_executable( ${target} ) -#### kdeinit_wrapper ############################ +#### tdeinit_wrapper ############################ -set( target kdeinit_wrapper ) +set( target tdeinit_wrapper ) tde_add_executable( ${target} SOURCES wrapper.c @@ -64,9 +64,9 @@ tde_add_executable( ${target} ) -#### kdeinit_shutdown ########################### +#### tdeinit_shutdown ########################### -set( target kdeinit_shutdown ) +set( target tdeinit_shutdown ) tde_add_executable( ${target} SOURCES wrapper.c @@ -111,7 +111,7 @@ set( target kstartupconfig ) tde_add_executable( ${target} AUTOMOC SOURCES kstartupconfig.cpp - LINK kdefakes-shared ${TQT_LIBRARIES} + LINK tdefakes-shared ${TQT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) @@ -122,33 +122,33 @@ set( target kdostartupconfig ) tde_add_executable( ${target} AUTOMOC SOURCES kdostartupconfig.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) -#### start_kdeinit ############################## +#### start_tdeinit ############################## -set( target start_kdeinit ) +set( target start_tdeinit ) if( KDEINIT_SETUID ) set( _setuid SETUID ) endif( KDEINIT_SETUID ) tde_add_executable( ${target} ${_setuid} - SOURCES start_kdeinit.c + SOURCES start_tdeinit.c DESTINATION ${BIN_INSTALL_DIR} ) -set_target_properties( ${target} PROPERTIES COMPILE_FLAGS -DEXECUTE=\\"${BIN_INSTALL_DIR}/kdeinit\\" ) +set_target_properties( ${target} PROPERTIES COMPILE_FLAGS -DEXECUTE=\\"${BIN_INSTALL_DIR}/tdeinit\\" ) -#### start_kdeinit_wrapper ###################### +#### start_tdeinit_wrapper ###################### -set( target start_kdeinit_wrapper ) +set( target start_tdeinit_wrapper ) tde_add_executable( ${target} - SOURCES start_kdeinit_wrapper.c + SOURCES start_tdeinit_wrapper.c DESTINATION ${BIN_INSTALL_DIR} ) @@ -161,7 +161,7 @@ set( ${target}_SRCS klauncher.cpp klauncher_main.cpp autostart.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared ) diff --git a/kinit/Mainpage.dox b/kinit/Mainpage.dox index 5f76313c7..06a34909b 100644 --- a/kinit/Mainpage.dox +++ b/kinit/Mainpage.dox @@ -1,6 +1,6 @@ /** @mainpage Trinity Initialization Routines -kdeinit is a process launcher somewhat similar to the +tdeinit is a process launcher somewhat similar to the famous init used for booting UNIX. <p> It launches processes by forking and then loading a @@ -8,8 +8,8 @@ dynamic library which should contain a 'main(...)' function. This both increases the startup speed and reduces the memory consumption of Trinity applications. -kdeinit_wrapper, kshell and kwrapper provide methods -of starting programs via kdeinit. +tdeinit_wrapper, kshell and kwrapper provide methods +of starting programs via tdeinit. @authors Waldo Bastian \<bastian@kde.org\><br> @@ -24,6 +24,6 @@ Most code is @lgpl */ -// DOXYGEN_REFERENCES = kdecore +// DOXYGEN_REFERENCES = tdecore // DOXYGEN_SET_PROJECT_NAME = KInit // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kinit/Makefile.am b/kinit/Makefile.am index 05d8dd8ce..952f32a46 100644 --- a/kinit/Makefile.am +++ b/kinit/Makefile.am @@ -19,35 +19,35 @@ INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(KDEINIT_XFT_INCLUDES) SUBDIRS = . tests -bin_PROGRAMS = kdeinit kdeinit_wrapper kshell kdeinit_shutdown lnusertemp kwrapper kioslave \ - kstartupconfig kdostartupconfig start_kdeinit start_kdeinit_wrapper +bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper kioslave \ + kstartupconfig kdostartupconfig start_tdeinit start_tdeinit_wrapper lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = klauncher.la -kdeinit_SOURCES = kinit.cpp setproctitle.cpp +tdeinit_LTLIBRARIES = klauncher.la +tdeinit_SOURCES = kinit.cpp setproctitle.cpp # NOTE: We link against all common libraries even if we don't need them ourselves. # For the future: examine if condensing the tons of *_LDFLAGS variables # into $(all_libraries) isn't better AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) -kdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ +tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -kdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT) +tdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT) kioslave_SOURCES = kioslave.cpp kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) kioslave_LDADD = $(LIB_KIO) -kdeinit_wrapper_SOURCES = wrapper.c -kdeinit_wrapper_LDADD = $(LIBSOCKET) +tdeinit_wrapper_SOURCES = wrapper.c +tdeinit_wrapper_LDADD = $(LIBSOCKET) kshell_SOURCES = shell.c kshell_LDADD = $(LIBSOCKET) -kdeinit_shutdown_SOURCES = wrapper.c -kdeinit_shutdown_LDADD = $(LIBSOCKET) +tdeinit_shutdown_SOURCES = wrapper.c +tdeinit_shutdown_LDADD = $(LIBSOCKET) lnusertemp_SOURCES = lnusertemp.c lnusertemp_LDFLAGS = $(KDE_RPATH) @@ -60,18 +60,18 @@ klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/l klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp kstartupconfig_SOURCES = kstartupconfig.cpp -kstartupconfig_LDADD = $(top_builddir)/kdecore/libtdefakes.la $(LIB_QT) +kstartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT) kdostartupconfig_SOURCES = kdostartupconfig.cpp kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) kdostartupconfig_LDADD = $(LIB_KDECORE) -start_kdeinit_SOURCES = start_kdeinit.c -kdeinitpath = $(bindir)/kdeinit -start_kdeinit_CFLAGS = $(KDE_USE_FPIE) -DEXECUTE=\"$(kdeinitpath)\" -start_kdeinit_LDFLAGS = $(KDE_USE_PIE) +start_tdeinit_SOURCES = start_tdeinit.c +tdeinitpath = $(bindir)/tdeinit +start_tdeinit_CFLAGS = $(KDE_USE_FPIE) -DEXECUTE=\"$(tdeinitpath)\" +start_tdeinit_LDFLAGS = $(KDE_USE_PIE) -start_kdeinit_wrapper_SOURCES = start_kdeinit_wrapper.c +start_tdeinit_wrapper_SOURCES = start_tdeinit_wrapper.c METASOURCES = AUTO @@ -86,7 +86,7 @@ dummy.cpp: install-exec-hook: @if test \${KDEINIT_SETUID} != 0; then \ - (chown 0 $(DESTDIR)$(bindir)/start_kdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_kdeinit) || echo "Please make start_kdeinit setuid root" ; \ + (chown 0 $(DESTDIR)$(bindir)/start_tdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_tdeinit) || echo "Please make start_tdeinit setuid root" ; \ fi include $(top_srcdir)/admin/Doxyfile.am diff --git a/kinit/README b/kinit/README index 624847a47..2e5f6c236 100644 --- a/kinit/README +++ b/kinit/README @@ -1,6 +1,6 @@ README -kdeinit is a process launcher somewhat similar to the +tdeinit is a process launcher somewhat similar to the famous init used for booting UNIX. It launches processes by forking and then loading a @@ -10,7 +10,7 @@ function. Executive summary ================= -Using kdeinit to launch KDE applications makes starting +Using tdeinit to launch KDE applications makes starting a typical KDE applications 2.5 times faster (100ms instead of 250ms on a P-III 500) It reduces memory consumption by approx. 350Kb per application. @@ -19,7 +19,7 @@ consumption by approx. 350Kb per application. How it works ============ -kdeinit is linked against all libraries a standard KDE +tdeinit is linked against all libraries a standard KDE application needs. With this technique starting an application becomes much faster because now only the application itself needs to be linked whereas @@ -31,7 +31,7 @@ Startup Speed Starting an application linked against libqt, libtdecore and libtdeui in the conventional way takes approx. 150ms on a Pentium III - 500Mhz. -Starting the same application via kdeinit takes less than 10ms. +Starting the same application via tdeinit takes less than 10ms. (application without KApplication constructor, the KApplication constructor requires an extra 100ms in both cases) @@ -42,24 +42,24 @@ Memory Usage An application linked against libqt, libtdecore and libtdeui started in the conventional way requires about 498Kb memory. (average of 10 instances) If the same application is started via -kdeinit it requires about 142Kb. A difference of 356Kb (application +tdeinit it requires about 142Kb. A difference of 356Kb (application without KApplication constructor) If we take the KApplication constructor into account, an application started in the conventional way takes about 679Kb memory while the same -application started via kdeinit requires about 380Kb. Here the difference +application started via tdeinit requires about 380Kb. Here the difference is somewhat less, 299Kb. This seems to be caused by the fact that the dynamic linker does "lazy linking". We can force the linker to link -everything at startup by specifying "LD_BIND_NOW=true". When kdeinit is -started with this option on, kdeinit is back to its full efficiency, an +everything at startup by specifying "LD_BIND_NOW=true". When tdeinit is +started with this option on, tdeinit is back to its full efficiency, an application with a KApplication constructor now uses 338Kb of memory. A difference of 341Kb with the normal case. -Adapting programs to use kdeinit. +Adapting programs to use tdeinit. =============================== The sourcecode of a program does not require any change to take advantage -of kdeinit. Only the makefile requires an adaption, if the Makefile.am of +of tdeinit. Only the makefile requires an adaption, if the Makefile.am of a normal program looks like this: bin_PROGRAMS = kicker @@ -67,7 +67,7 @@ kicker_LDADD = $(top_builddir)/libkonq/libkonq.la kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) The following lines need to be added to make a library version useable -by kdeinit: +by tdeinit: lib_LTLIBRARIES = kicker.la libkicker_la_LIBADD = $(top_builddir)/libkonq/libkonq.la @@ -76,9 +76,9 @@ libkicker_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module Disadvantages ============= -The process name of applications started via kdeinit is "kdeinit". This problem +The process name of applications started via tdeinit is "tdeinit". This problem can be corrected to a degree by changing the application name as shown -by 'ps'. However, applications like "killall" will only see "kdeinit" as +by 'ps'. However, applications like "killall" will only see "tdeinit" as process name. To workaround this, use "kdekillall", from kdesdk/scripts, -for applications started via kdeinit. +for applications started via tdeinit. diff --git a/kinit/README.wrapper b/kinit/README.wrapper index 48bfdc7e8..077d2b870 100644 --- a/kinit/README.wrapper +++ b/kinit/README.wrapper @@ -1,24 +1,24 @@ README -kdeinit_wrapper, kshell and kwrapper are a programs that -start programs via kdeinit. +tdeinit_wrapper, kshell and kwrapper are a programs that +start programs via tdeinit. E.g. You can make a symbolic link from $KDEDIR/bin/konsole to -$KDEDIR/bin/kdeinit_wrapper. Typing 'konsole' on the command line -will then start 'konsole.la' through kdeinit instead. +$KDEDIR/bin/tdeinit_wrapper. Typing 'konsole' on the command line +will then start 'konsole.la' through tdeinit instead. -kdeinit_wrapper is the simplest for, it only passes the program -and arguments to kdeinit, nothing else +tdeinit_wrapper is the simplest for, it only passes the program +and arguments to tdeinit, nothing else kshell is usually the best choice, it passes the program, arguments, complete environment ( $PATH, etc. ) and current -working directory to kdeinit +working directory to tdeinit kwrapper tries to make the program look like it was actually -really started directly and not via kdeinit. In addition to +really started directly and not via tdeinit. In addition to what kshell does, it also tries to redirect the program output to the console from which kwrapper was started, it waits -for the program started via kdeinit to finish and only after then +for the program started via tdeinit to finish and only after then it exits ( it doesn't return its return value though ), and it also passes most signals it gets to the process of the started program ( thus allowing you to break it using Ctrl+C or stopping @@ -31,8 +31,8 @@ TODO ==== * There is no portable way to read out the complete environment and - pass it to kdeinit. - kdeinit should probably unset every + pass it to tdeinit. - tdeinit should probably unset every variable that's not set in the environment it gets from kshell or kwrapper * stdout/stderr of the started application goes to the console where - kdeinit was started. - done, I hope it's ok + tdeinit was started. - done, I hope it's ok diff --git a/kinit/configure.in.in b/kinit/configure.in.in index 2ba692872..6330594b6 100644 --- a/kinit/configure.in.in +++ b/kinit/configure.in.in @@ -28,24 +28,24 @@ fi KDE_FIND_PATH(freetype-config, KDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin]) if test -n "$KDEINIT_FREETYPE_CONFIG"; then KDEINIT_XFT_INCLUDES="`$KDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS" - kdeinit_cppflags=$CPPFLAGS + tdeinit_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS" KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[KDEINIT_USE_XFT=]) - CPPFLAGS=$kdeinit_cppflags + CPPFLAGS=$tdeinit_cppflags else KDEINIT_USE_XFT= fi if test -n "$KDEINIT_USE_XFT"; then - AC_DEFINE(KDEINIT_USE_XFT,1,[Use Xft preinitialization in kdeinit]) + AC_DEFINE(KDEINIT_USE_XFT,1,[Use Xft preinitialization in tdeinit]) fi if test -n "$KDEINIT_FONTCONFIG"; then - AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in kdeinit]) + AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in tdeinit]) fi AC_SUBST(KDEINIT_XFT_INCLUDES) -AC_MSG_CHECKING(whether to make kdeinit setuid root in order to protect it from bad Linux OOM-killer) -kdeinit_setuid= +AC_MSG_CHECKING(whether to make tdeinit setuid root in order to protect it from bad Linux OOM-killer) +tdeinit_setuid= case $target_os in linux*) AC_MSG_RESULT(yes) diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index bda7a7d35..2527dfb56 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -161,8 +161,8 @@ static struct { //#if defined Q_WS_X11 && ! defined K_WS_QTONLY #ifdef Q_WS_X11 extern "C" { -int kdeinit_xio_errhandler( Display * ); -int kdeinit_x_errhandler( Display *, XErrorEvent *err ); +int tdeinit_xio_errhandler( Display * ); +int tdeinit_x_errhandler( Display *, XErrorEvent *err ); } #endif @@ -256,25 +256,25 @@ static void setup_tty( const char* tty ) int fd = open( tty, O_WRONLY ); if( fd < 0 ) { - fprintf(stderr, "kdeinit: couldn't open() %s: %s\n", tty, strerror (errno) ); + fprintf(stderr, "tdeinit: couldn't open() %s: %s\n", tty, strerror (errno) ); return; } if( dup2( fd, STDOUT_FILENO ) < 0 ) { - fprintf(stderr, "kdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) ); + fprintf(stderr, "tdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) ); close( fd ); return; } if( dup2( fd, STDERR_FILENO ) < 0 ) { - fprintf(stderr, "kdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) ); + fprintf(stderr, "tdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) ); close( fd ); return; } close( fd ); } -// from kdecore/netwm.cpp +// from tdecore/netwm.cpp static int get_current_desktop( Display* disp ) { int desktop = 0; // no desktop by default @@ -435,7 +435,7 @@ static pid_t launch(int argc, const char *_name, const char *args, */ if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, d.launcher)) { - perror("kdeinit: socketpair() failed!\n"); + perror("tdeinit: socketpair() failed!\n"); exit(255); } launcher = 1; @@ -470,7 +470,7 @@ static pid_t launch(int argc, const char *_name, const char *args, if (0 > pipe(d.fd)) { - perror("kdeinit: pipe() failed!\n"); + perror("tdeinit: pipe() failed!\n"); d.result = 3; d.errorMsg = i18n("Unable to start new process.\n" "The system may have reached the maximum number of open files possible or the maximum number of open files that you are allowed to use has been reached.").utf8(); @@ -492,7 +492,7 @@ static pid_t launch(int argc, const char *_name, const char *args, d.fork = fork(); switch(d.fork) { case -1: - perror("kdeinit: fork() failed!\n"); + perror("tdeinit: fork() failed!\n"); d.result = 3; d.errorMsg = i18n("Unable to create new process.\n" "The system may have reached the maximum number of processes possible or the maximum number of processes that you are allowed to use has been reached.").utf8(); @@ -575,11 +575,11 @@ static pid_t launch(int argc, const char *_name, const char *args, /* set the process name, so that killall works like intended */ r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0); if ( r == 0 ) - kdeinit_setproctitle( "%s [kdeinit]%s", name.data(), procTitle.data() ? procTitle.data() : "" ); + tdeinit_setproctitle( "%s [tdeinit]%s", name.data(), procTitle.data() ? procTitle.data() : "" ); else - kdeinit_setproctitle( "kdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" ); + tdeinit_setproctitle( "tdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" ); #else - kdeinit_setproctitle( "kdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" ); + tdeinit_setproctitle( "tdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" ); #endif } @@ -632,7 +632,7 @@ static pid_t launch(int argc, const char *_name, const char *args, exit(255); } - d.sym = lt_dlsym( d.handle, "kdeinitmain"); + d.sym = lt_dlsym( d.handle, "tdeinitmain"); if (!d.sym ) { d.sym = lt_dlsym( d.handle, "kdemain" ); @@ -659,9 +659,9 @@ static pid_t launch(int argc, const char *_name, const char *args, d.func = (int (*)(int, char *[])) d.sym; if (d.debug_wait) { - fprintf(stderr, "kdeinit: Suspending process\n" - "kdeinit: 'gdb kdeinit %d' to debug\n" - "kdeinit: 'kill -SIGCONT %d' to continue\n", + fprintf(stderr, "tdeinit: Suspending process\n" + "tdeinit: 'gdb tdeinit %d' to debug\n" + "tdeinit: 'kill -SIGCONT %d' to continue\n", getpid(), getpid()); kill(getpid(), SIGSTOP); } @@ -728,11 +728,11 @@ static pid_t launch(int argc, const char *_name, const char *args, } if (d.n == 0) { - perror("kdeinit: Pipe closed unexpectedly"); + perror("tdeinit: Pipe closed unexpectedly"); d.result = 1; // Error break; } - perror("kdeinit: Error reading from pipe"); + perror("tdeinit: Error reading from pipe"); d.result = 1; // Error break; } @@ -777,20 +777,20 @@ static void init_signals() if (pipe(d.deadpipe) != 0) { - perror("kdeinit: Aborting. Can't create pipe: "); + perror("tdeinit: Aborting. Can't create pipe: "); exit(255); } options = fcntl(d.deadpipe[0], F_GETFL); if (options == -1) { - perror("kdeinit: Aborting. Can't make pipe non-blocking: "); + perror("tdeinit: Aborting. Can't make pipe non-blocking: "); exit(255); } if (fcntl(d.deadpipe[0], F_SETFL, options | O_NONBLOCK) == -1) { - perror("kdeinit: Aborting. Can't make pipe non-blocking: "); + perror("tdeinit: Aborting. Can't make pipe non-blocking: "); exit(255); } @@ -821,7 +821,7 @@ static void init_signals() sigaction( SIGPIPE, &act, 0L); } -static void init_kdeinit_socket() +static void init_tdeinit_socket() { struct sockaddr_un sa; struct sockaddr_un sa_old; @@ -831,7 +831,7 @@ static void init_kdeinit_socket() int max_tries = 10; if (!home_dir || !home_dir[0]) { - fprintf(stderr, "kdeinit: Aborting. $HOME not set!"); + fprintf(stderr, "tdeinit: Aborting. $HOME not set!"); exit(255); } chdir(home_dir); @@ -843,12 +843,12 @@ static void init_kdeinit_socket() { if (errno == ENOENT) { - fprintf(stderr, "kdeinit: Aborting. $HOME directory (%s) does not exist.\n", path.data()); + fprintf(stderr, "tdeinit: Aborting. $HOME directory (%s) does not exist.\n", path.data()); exit(255); } else if (readOnly.isEmpty()) { - fprintf(stderr, "kdeinit: Aborting. No write access to $HOME directory (%s).\n", path.data()); + fprintf(stderr, "tdeinit: Aborting. No write access to $HOME directory (%s).\n", path.data()); exit(255); } } @@ -860,7 +860,7 @@ static void init_kdeinit_socket() } if (access(path.data(), R_OK|W_OK) && (errno != ENOENT)) { - fprintf(stderr, "kdeinit: Aborting. No write access to '%s'.\n", path.data()); + fprintf(stderr, "tdeinit: Aborting. No write access to '%s'.\n", path.data()); exit(255); } } @@ -874,7 +874,7 @@ static void init_kdeinit_socket() int s; struct sockaddr_un server; -// fprintf(stderr, "kdeinit: Warning, socket_file already exists!\n"); +// fprintf(stderr, "tdeinit: Warning, socket_file already exists!\n"); /* * create the socket stream */ @@ -890,7 +890,7 @@ static void init_kdeinit_socket() if(connect(s, (struct sockaddr *)&server, socklen) == 0) { - fprintf(stderr, "kdeinit: Shutting down running client.\n"); + fprintf(stderr, "tdeinit: Shutting down running client.\n"); klauncher_header request_header; request_header.cmd = LAUNCHER_TERMINATE_KDEINIT; request_header.arg_length = 0; @@ -908,21 +908,21 @@ static void init_kdeinit_socket() d.wrapper = socket(PF_UNIX, SOCK_STREAM, 0); if (d.wrapper < 0) { - perror("kdeinit: Aborting. socket() failed: "); + perror("tdeinit: Aborting. socket() failed: "); exit(255); } options = fcntl(d.wrapper, F_GETFL); if (options == -1) { - perror("kdeinit: Aborting. Can't make socket non-blocking: "); + perror("tdeinit: Aborting. Can't make socket non-blocking: "); close(d.wrapper); exit(255); } if (fcntl(d.wrapper, F_SETFL, options | O_NONBLOCK) == -1) { - perror("kdeinit: Aborting. Can't make socket non-blocking: "); + perror("tdeinit: Aborting. Can't make socket non-blocking: "); close(d.wrapper); exit(255); } @@ -936,7 +936,7 @@ static void init_kdeinit_socket() if(bind(d.wrapper, (struct sockaddr *)&sa, socklen) != 0) { if (max_tries == 0) { - perror("kdeinit: Aborting. bind() failed: "); + perror("tdeinit: Aborting. bind() failed: "); fprintf(stderr, "Could not bind to socket '%s'\n", sock_file); close(d.wrapper); exit(255); @@ -949,7 +949,7 @@ static void init_kdeinit_socket() /** set permissions **/ if (chmod(sock_file, 0600) != 0) { - perror("kdeinit: Aborting. Can't set permissions on socket: "); + perror("tdeinit: Aborting. Can't set permissions on socket: "); fprintf(stderr, "Wrong permissions of socket '%s'\n", sock_file); unlink(sock_file); close(d.wrapper); @@ -958,7 +958,7 @@ static void init_kdeinit_socket() if(listen(d.wrapper, SOMAXCONN) < 0) { - perror("kdeinit: Aborting. listen() failed: "); + perror("tdeinit: Aborting. listen() failed: "); unlink(sock_file); close(d.wrapper); exit(255); @@ -968,14 +968,14 @@ static void init_kdeinit_socket() d.wrapper_old = socket(PF_UNIX, SOCK_STREAM, 0); if (d.wrapper_old < 0) { - // perror("kdeinit: Aborting. socket() failed: "); + // perror("tdeinit: Aborting. socket() failed: "); return; } options = fcntl(d.wrapper_old, F_GETFL); if (options == -1) { - // perror("kdeinit: Aborting. Can't make socket non-blocking: "); + // perror("tdeinit: Aborting. Can't make socket non-blocking: "); close(d.wrapper_old); d.wrapper_old = 0; return; @@ -983,7 +983,7 @@ static void init_kdeinit_socket() if (fcntl(d.wrapper_old, F_SETFL, options | O_NONBLOCK) == -1) { - // perror("kdeinit: Aborting. Can't make socket non-blocking: "); + // perror("tdeinit: Aborting. Can't make socket non-blocking: "); close(d.wrapper_old); d.wrapper_old = 0; return; @@ -999,7 +999,7 @@ static void init_kdeinit_socket() if(bind(d.wrapper_old, (struct sockaddr *)&sa_old, socklen) != 0) { if (max_tries == 0) { - // perror("kdeinit: Aborting. bind() failed: "); + // perror("tdeinit: Aborting. bind() failed: "); fprintf(stderr, "Could not bind to socket '%s'\n", sock_file_old); close(d.wrapper_old); d.wrapper_old = 0; @@ -1022,7 +1022,7 @@ static void init_kdeinit_socket() if(listen(d.wrapper_old, SOMAXCONN) < 0) { - // perror("kdeinit: Aborting. listen() failed: "); + // perror("tdeinit: Aborting. listen() failed: "); unlink(sock_file_old); close(d.wrapper_old); d.wrapper_old = 0; @@ -1069,14 +1069,14 @@ static void launcher_died() if (!d.launcher_ok) { /* This is bad. */ - fprintf(stderr, "kdeinit: Communication error with launcher. Exiting!\n"); + fprintf(stderr, "tdeinit: Communication error with launcher. Exiting!\n"); ::exit(255); return; } // KLauncher died... restart #ifndef NDEBUG - fprintf(stderr, "kdeinit: KLauncher died unexpectedly.\n"); + fprintf(stderr, "tdeinit: KLauncher died unexpectedly.\n"); #endif // Make sure it's really dead. if (d.launcher_pid) @@ -1092,7 +1092,7 @@ static void launcher_died() pid_t pid = launch( 1, "klauncher", 0 ); #ifndef NDEBUG - fprintf(stderr, "kdeinit: Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result); + fprintf(stderr, "tdeinit: Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result); #endif } @@ -1156,7 +1156,7 @@ static void handle_launcher_request(int sock = -1) const char *startup_id_str = "0"; #ifndef NDEBUG - fprintf(stderr, "kdeinit: Got %s '%s' from %s.\n", + fprintf(stderr, "tdeinit: Got %s '%s' from %s.\n", (request_header.cmd == LAUNCHER_EXEC ? "EXEC" : (request_header.cmd == LAUNCHER_EXT_EXEC ? "EXT_EXEC" : (request_header.cmd == LAUNCHER_EXEC_NEW ? "EXEC_NEW" : @@ -1218,7 +1218,7 @@ static void handle_launcher_request(int sock = -1) if ((arg_n - request_data) != request_header.arg_length) { #ifndef NDEBUG - fprintf(stderr, "kdeinit: EXEC request has invalid format.\n"); + fprintf(stderr, "tdeinit: EXEC request has invalid format.\n"); #endif free(request_data); d.debug_wait = false; @@ -1273,16 +1273,16 @@ static void handle_launcher_request(int sock = -1) #ifndef NDEBUG if (launcher) - fprintf(stderr, "kdeinit: Got SETENV '%s=%s' from klauncher.\n", env_name, env_value); + fprintf(stderr, "tdeinit: Got SETENV '%s=%s' from klauncher.\n", env_name, env_value); else - fprintf(stderr, "kdeinit: Got SETENV '%s=%s' from socket.\n", env_name, env_value); + fprintf(stderr, "tdeinit: Got SETENV '%s=%s' from socket.\n", env_name, env_value); #endif if ( request_header.arg_length != (int) (strlen(env_name) + strlen(env_value) + 2)) { #ifndef NDEBUG - fprintf(stderr, "kdeinit: SETENV request has invalid format.\n"); + fprintf(stderr, "tdeinit: SETENV request has invalid format.\n"); #endif free(request_data); return; @@ -1292,16 +1292,16 @@ static void handle_launcher_request(int sock = -1) else if (request_header.cmd == LAUNCHER_TERMINATE_KDE) { #ifndef NDEBUG - fprintf(stderr,"kdeinit: terminate KDE.\n"); + fprintf(stderr,"tdeinit: terminate KDE.\n"); #endif #ifdef Q_WS_X11 - kdeinit_xio_errhandler( 0L ); + tdeinit_xio_errhandler( 0L ); #endif } else if (request_header.cmd == LAUNCHER_TERMINATE_KDEINIT) { #ifndef NDEBUG - fprintf(stderr,"kdeinit: Killing kdeinit/klauncher.\n"); + fprintf(stderr,"tdeinit: Killing tdeinit/klauncher.\n"); #endif if (d.launcher_pid) kill(d.launcher_pid, SIGTERM); @@ -1311,7 +1311,7 @@ static void handle_launcher_request(int sock = -1) else if (request_header.cmd == LAUNCHER_DEBUG_WAIT) { #ifndef NDEBUG - fprintf(stderr,"kdeinit: Debug wait activated.\n"); + fprintf(stderr,"tdeinit: Debug wait activated.\n"); #endif d.debug_wait = true; } @@ -1351,7 +1351,7 @@ static void handle_requests(pid_t waitForPid) if (exit_pid > 0) { #ifndef NDEBUG - fprintf(stderr, "kdeinit: PID %ld terminated.\n", (long) exit_pid); + fprintf(stderr, "tdeinit: PID %ld terminated.\n", (long) exit_pid); #endif if (waitForPid && (exit_pid == waitForPid)) return; @@ -1463,7 +1463,7 @@ static void handle_requests(pid_t waitForPid) } } -static void kdeinit_library_path() +static void tdeinit_library_path() { TQStringList ltdl_library_path = TQStringList::split(':', TQFile::decodeName(getenv("LTDL_LIBRARY_PATH"))); @@ -1513,39 +1513,39 @@ static void kdeinit_library_path() TQCString display = getenv(DISPLAY); if (display.isEmpty()) { - fprintf(stderr, "kdeinit: Aborting. $"DISPLAY" is not set.\n"); + fprintf(stderr, "tdeinit: Aborting. $"DISPLAY" is not set.\n"); exit(255); } int i; if((i = display.findRev('.')) > display.findRev(':') && i >= 0) display.truncate(i); - TQCString socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit-%1").arg(TQString(display)), s_instance)); + TQCString socketName = TQFile::encodeName(locateLocal("socket", TQString("tdeinit-%1").arg(TQString(display)), s_instance)); if (socketName.length() >= MAX_SOCK_FILE) { - fprintf(stderr, "kdeinit: Aborting. Socket name will be too long:\n"); + fprintf(stderr, "tdeinit: Aborting. Socket name will be too long:\n"); fprintf(stderr, " '%s'\n", socketName.data()); exit(255); } strcpy(sock_file_old, socketName.data()); display.replace(":","_"); - socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit_%1").arg(TQString(display)), s_instance)); + socketName = TQFile::encodeName(locateLocal("socket", TQString("tdeinit_%1").arg(TQString(display)), s_instance)); if (socketName.length() >= MAX_SOCK_FILE) { - fprintf(stderr, "kdeinit: Aborting. Socket name will be too long:\n"); + fprintf(stderr, "tdeinit: Aborting. Socket name will be too long:\n"); fprintf(stderr, " '%s'\n", socketName.data()); exit(255); } strcpy(sock_file, socketName.data()); } -int kdeinit_xio_errhandler( Display *disp ) +int tdeinit_xio_errhandler( Display *disp ) { // disp is 0L when KDE shuts down. We don't want those warnings then. if ( disp ) - qWarning( "kdeinit: Fatal IO error: client killed" ); + qWarning( "tdeinit: Fatal IO error: client killed" ); if (sock_file[0]) { @@ -1567,7 +1567,7 @@ int kdeinit_xio_errhandler( Display *disp ) } if ( disp ) - qWarning( "kdeinit: sending SIGHUP to children." ); + qWarning( "tdeinit: sending SIGHUP to children." ); /* this should remove all children we started */ signal(SIGHUP, SIG_IGN); @@ -1576,27 +1576,27 @@ int kdeinit_xio_errhandler( Display *disp ) sleep(2); if ( disp ) - qWarning( "kdeinit: sending SIGTERM to children." ); + qWarning( "tdeinit: sending SIGTERM to children." ); /* and if they don't listen to us, this should work */ signal(SIGTERM, SIG_IGN); kill(0, SIGTERM); if ( disp ) - qWarning( "kdeinit: Exit." ); + qWarning( "tdeinit: Exit." ); exit( 0 ); return 0; } #ifdef Q_WS_X11 -int kdeinit_x_errhandler( Display *dpy, XErrorEvent *err ) +int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err ) { #ifndef NDEBUG char errstr[256]; - // kdeinit almost doesn't use X, and therefore there shouldn't be any X error + // tdeinit almost doesn't use X, and therefore there shouldn't be any X error XGetErrorText( dpy, err->error_code, errstr, 256 ); - fprintf(stderr, "kdeinit: KDE detected X Error: %s %d\n" + fprintf(stderr, "tdeinit: KDE detected X Error: %s %d\n" " Major opcode: %d\n" " Minor opcode: %d\n" " Resource id: 0x%lx\n", @@ -1615,8 +1615,8 @@ int kdeinit_x_errhandler( Display *dpy, XErrorEvent *err ) // another X connection for startup notification purposes static void setupX() { - XSetIOErrorHandler(kdeinit_xio_errhandler); - XSetErrorHandler(kdeinit_x_errhandler); + XSetIOErrorHandler(tdeinit_xio_errhandler); + XSetErrorHandler(tdeinit_x_errhandler); } // Borrowed from kdebase/kaudio/kaudioserver.cpp @@ -1629,15 +1629,15 @@ static int initXconnection() BlackPixelOfScreen(DefaultScreenOfDisplay(X11display)), BlackPixelOfScreen(DefaultScreenOfDisplay(X11display)) ); #ifndef NDEBUG - fprintf(stderr, "kdeinit: opened connection to %s\n", DisplayString(X11display)); + fprintf(stderr, "tdeinit: opened connection to %s\n", DisplayString(X11display)); #endif int fd = XConnectionNumber( X11display ); int on = 1; (void) setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &on, (int) sizeof(on)); return fd; } else - fprintf(stderr, "kdeinit: Can't connect to the X Server.\n" \ - "kdeinit: Might not terminate at end of session.\n"); + fprintf(stderr, "tdeinit: Can't connect to the X Server.\n" \ + "tdeinit: Might not terminate at end of session.\n"); return -1; } @@ -1660,7 +1660,7 @@ static int initXconnection() /* Those 'unknown reasons' are C++ standard forbidding recursive calls to main() or any means that would possibly allow that (e.g. taking address of main()). - The correct solution is not using main() as entry point for kdeinit modules, + The correct solution is not using main() as entry point for tdeinit modules, but only kdemain(). */ extern "C" void _main(void); @@ -1714,7 +1714,7 @@ int main(int argc, char **argv, char **envp) #endif if (strcmp(safe_argv[i], "--help") == 0) { - printf("Usage: kdeinit [options]\n"); + printf("Usage: tdeinit [options]\n"); // printf(" --no-dcop Do not start dcopserver\n"); // printf(" --no-klauncher Do not start klauncher\n"); printf(" --no-kded Do not start kded\n"); @@ -1751,16 +1751,16 @@ int main(int argc, char **argv, char **envp) setsid(); /** Create our instance **/ - s_instance = new KInstance("kdeinit"); + s_instance = new KInstance("tdeinit"); /** Prepare to change process name **/ - kdeinit_initsetproctitle(argc, argv, envp); - kdeinit_library_path(); + tdeinit_initsetproctitle(argc, argv, envp); + tdeinit_library_path(); // Don't make our instance the global instance - // (do it only after kdeinit_library_path, that one indirectly uses KConfig, + // (do it only after tdeinit_library_path, that one indirectly uses KConfig, // which seems to be buggy and always use KGlobal instead of the maching KInstance) KGlobal::_instance = 0L; - // don't change envvars before kdeinit_initsetproctitle() + // don't change envvars before tdeinit_initsetproctitle() unsetenv("LD_BIND_NOW"); unsetenv("DYLD_BIND_AT_LAUNCH"); KApplication::loadedByKdeinit = true; @@ -1781,10 +1781,10 @@ int main(int argc, char **argv, char **envp) if (keep_running) { /* - * Create ~/.kde/tmp-<hostname>/kdeinit-<display> socket for incoming wrapper + * Create ~/.kde/tmp-<hostname>/tdeinit-<display> socket for incoming wrapper * requests. */ - init_kdeinit_socket(); + init_tdeinit_socket(); } if (launch_dcop) @@ -1794,12 +1794,12 @@ int main(int argc, char **argv, char **envp) else pid = launch( 2, "dcopserver", "--nosid" ); #ifndef NDEBUG - fprintf(stderr, "kdeinit: Launched DCOPServer, pid = %ld result = %d\n", (long) pid, d.result); + fprintf(stderr, "tdeinit: Launched DCOPServer, pid = %ld result = %d\n", (long) pid, d.result); #endif WaitPid(pid); if (!WIFEXITED(d.exit_status) || (WEXITSTATUS(d.exit_status) != 0)) { - fprintf(stderr, "kdeinit: DCOPServer could not be started, aborting.\n"); + fprintf(stderr, "tdeinit: DCOPServer could not be started, aborting.\n"); exit(1); } } @@ -1818,7 +1818,7 @@ int main(int argc, char **argv, char **envp) else pid = launch( 1, "klauncher", 0 ); #ifndef NDEBUG - fprintf(stderr, "kdeinit: Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result); + fprintf(stderr, "tdeinit: Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result); #endif handle_requests(pid); // Wait for klauncher to be ready } @@ -1856,7 +1856,7 @@ int main(int argc, char **argv, char **envp) else pid = launch( 1, "kded", 0 ); #ifndef NDEBUG - fprintf(stderr, "kdeinit: Launched KDED, pid = %ld result = %d\n", (long) pid, d.result); + fprintf(stderr, "tdeinit: Launched KDED, pid = %ld result = %d\n", (long) pid, d.result); #endif handle_requests(pid); } @@ -1867,7 +1867,7 @@ int main(int argc, char **argv, char **envp) { pid = launch( 1, safe_argv[i]+1, 0); #ifndef NDEBUG - fprintf(stderr, "kdeinit: Launched '%s', pid = %ld result = %d\n", safe_argv[i]+1, (long) pid, d.result); + fprintf(stderr, "tdeinit: Launched '%s', pid = %ld result = %d\n", safe_argv[i]+1, (long) pid, d.result); #endif handle_requests(pid); } @@ -1883,7 +1883,7 @@ int main(int argc, char **argv, char **envp) { pid = launch( 1, safe_argv[i], 0 ); #ifndef NDEBUG - fprintf(stderr, "kdeinit: Launched '%s', pid = %ld result = %d\n", safe_argv[i], (long) pid, d.result); + fprintf(stderr, "tdeinit: Launched '%s', pid = %ld result = %d\n", safe_argv[i], (long) pid, d.result); #endif } } @@ -1895,7 +1895,7 @@ int main(int argc, char **argv, char **envp) } free (safe_argv); - kdeinit_setproctitle("kdeinit Running..."); + tdeinit_setproctitle("tdeinit Running..."); if (!keep_running) return 0; diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 4f2e12450..47b3b5f42 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -162,11 +162,11 @@ IdleSlave::age(time_t now) return (int) difftime(now, mBirthDate); } -KLauncher::KLauncher(int _kdeinitSocket, bool new_startup) +KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) // : KApplication( false, false ), // No Styles, No GUI : KApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used DCOPObject("klauncher"), - kdeinitSocket(_kdeinitSocket), mAutoStart( new_startup ), + tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ), dontBlockReading(false), newStartup( new_startup ) { #ifdef Q_WS_X11 @@ -200,10 +200,10 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup) connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout())); - kdeinitNotifier = new TQSocketNotifier(kdeinitSocket, TQSocketNotifier::Read); - connect(kdeinitNotifier, TQT_SIGNAL( activated( int )), + tdeinitNotifier = new TQSocketNotifier(tdeinitSocket, TQSocketNotifier::Read); + connect(tdeinitNotifier, TQT_SIGNAL( activated( int )), this, TQT_SLOT( slotKDEInitData( int ))); - kdeinitNotifier->setEnabled( true ); + tdeinitNotifier->setEnabled( true ); lastRequest = 0; bProcessingQueue = false; @@ -221,7 +221,7 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup) klauncher_header request_header; request_header.cmd = LAUNCHER_OK; request_header.arg_length = 0; - write(kdeinitSocket, &request_header, sizeof(request_header)); + write(tdeinitSocket, &request_header, sizeof(request_header)); } KLauncher::~KLauncher() @@ -274,18 +274,18 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data, if ((fun == "start_service_by_name(TQString,TQStringList)") || (fun == "start_service_by_desktop_path(TQString,TQStringList)")|| (fun == "start_service_by_desktop_name(TQString,TQStringList)")|| - (fun == "kdeinit_exec(TQString,TQStringList)") || - (fun == "kdeinit_exec_wait(TQString,TQStringList)") || + (fun == "tdeinit_exec(TQString,TQStringList)") || + (fun == "tdeinit_exec_wait(TQString,TQStringList)") || (fun == "start_service_by_name(TQString,TQStringList,TQValueList<TQCString>,TQCString)") || (fun == "start_service_by_desktop_path(TQString,TQStringList,TQValueList<TQCString>,TQCString)")|| (fun == "start_service_by_desktop_name(TQString,TQStringList,TQValueList<TQCString>,TQCString)") || (fun == "start_service_by_name(TQString,TQStringList,TQValueList<TQCString>,TQCString,bool)") || (fun == "start_service_by_desktop_path(TQString,TQStringList,TQValueList<TQCString>,TQCString,bool)")|| (fun == "start_service_by_desktop_name(TQString,TQStringList,TQValueList<TQCString>,TQCString,bool)") || - (fun == "kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)") || - (fun == "kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>)") || - (fun == "kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)") || - (fun == "kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)")) + (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)") || + (fun == "tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>)") || + (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)") || + (fun == "tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)")) { TQDataStream stream(data, IO_ReadOnly); bool bNoWait = false; @@ -306,11 +306,11 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data, (fun == "start_service_by_desktop_path(TQString,TQStringList,TQValueList<TQCString>,TQCString)")|| (fun == "start_service_by_desktop_name(TQString,TQStringList,TQValueList<TQCString>,TQCString)")) stream >> envs >> startup_id; - else if ((fun == "kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)") || - (fun == "kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>)")) + else if ((fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)") || + (fun == "tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>)")) stream >> envs; - else if ((fun == "kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)") || - (fun == "kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)")) + else if ((fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)") || + (fun == "tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)")) stream >> envs >> startup_id; bool finished; if (strncmp(fun, "start_service_by_name(", 22) == 0) @@ -328,17 +328,17 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data, kdDebug(7016) << "KLauncher: Got start_service_by_desktop_name('" << serviceName << "', ...)" << endl; finished = start_service_by_desktop_name(serviceName, urls, envs, startup_id, bNoWait ); } - else if ((fun == "kdeinit_exec(TQString,TQStringList)") - || (fun == "kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)") - || (fun == "kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)")) + else if ((fun == "tdeinit_exec(TQString,TQStringList)") + || (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)") + || (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)")) { - kdDebug(7016) << "KLauncher: Got kdeinit_exec('" << serviceName << "', ...)" << endl; - finished = kdeinit_exec(serviceName, urls, envs, startup_id, false); + kdDebug(7016) << "KLauncher: Got tdeinit_exec('" << serviceName << "', ...)" << endl; + finished = tdeinit_exec(serviceName, urls, envs, startup_id, false); } else { - kdDebug(7016) << "KLauncher: Got kdeinit_exec_wait('" << serviceName << "', ...)" << endl; - finished = kdeinit_exec(serviceName, urls, envs, startup_id, true); + kdDebug(7016) << "KLauncher: Got tdeinit_exec_wait('" << serviceName << "', ...)" << endl; + finished = tdeinit_exec(serviceName, urls, envs, startup_id, true); } if (!finished) { @@ -413,7 +413,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data, klauncher_header request_header; request_header.cmd = LAUNCHER_TERMINATE_KDE; request_header.arg_length = 0; - write(kdeinitSocket, &request_header, sizeof(request_header)); + write(tdeinitSocket, &request_header, sizeof(request_header)); destruct(0); } else if (fun == "autoStart()") @@ -459,16 +459,16 @@ KLauncher::functions() funcs << "serviceResult start_service_by_name(TQString,TQStringList)"; funcs << "serviceResult start_service_by_desktop_path(TQString,TQStringList)"; funcs << "serviceResult start_service_by_desktop_name(TQString,TQStringList)"; - funcs << "serviceResult kdeinit_exec(TQString,TQStringList)"; - funcs << "serviceResult kdeinit_exec_wait(TQString,TQStringList)"; + funcs << "serviceResult tdeinit_exec(TQString,TQStringList)"; + funcs << "serviceResult tdeinit_exec_wait(TQString,TQStringList)"; funcs << "serviceResult start_service_by_name(TQString,TQStringList,TQValueList<TQCString>,TQCString)"; funcs << "serviceResult start_service_by_desktop_path(TQString,TQStringList,TQValueList<TQCString>,TQCString)"; funcs << "serviceResult start_service_by_desktop_name(TQString,TQStringList,TQValueList<TQCString>,TQCString)"; funcs << "serviceResult start_service_by_name(TQString,TQStringList,TQValueList<TQCString>,TQCString,bool)"; funcs << "serviceResult start_service_by_desktop_path(TQString,TQStringList,TQValueList<TQCString>,TQCString,bool)"; funcs << "serviceResult start_service_by_desktop_name(TQString,TQStringList,TQValueList<TQCString>,TQCString,bool)"; - funcs << "serviceResult kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)"; - funcs << "serviceResult kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>)"; + funcs << "serviceResult tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)"; + funcs << "serviceResult tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>)"; funcs << "TQString requestSlave(TQString,TQString,TQString)"; funcs << "pid_t requestHoldSlave(KURL,TQString)"; funcs << "void waitForSlave(pid_t)"; @@ -491,8 +491,8 @@ void KLauncher::setLaunchEnv(const TQCString &name, const TQCString &_value) memcpy(requestData.data()+name.length()+1, value.data(), value.length()+1); request_header.cmd = LAUNCHER_SETENV; request_header.arg_length = requestData.size(); - write(kdeinitSocket, &request_header, sizeof(request_header)); - write(kdeinitSocket, requestData.data(), request_header.arg_length); + write(tdeinitSocket, &request_header, sizeof(request_header)); + write(tdeinitSocket, requestData.data(), request_header.arg_length); } /* @@ -529,19 +529,19 @@ KLauncher::slotKDEInitData(int) if( dontBlockReading ) { // in case we get a request to start an application and data arrive - // to kdeinitSocket at the same time, requestStart() will already + // to tdeinitSocket at the same time, requestStart() will already // call slotKDEInitData(), so we must check there's still something // to read, otherwise this would block fd_set in; timeval tm = { 0, 0 }; FD_ZERO ( &in ); - FD_SET( kdeinitSocket, &in ); - select( kdeinitSocket + 1, &in, 0, 0, &tm ); - if( !FD_ISSET( kdeinitSocket, &in )) + FD_SET( tdeinitSocket, &in ); + select( tdeinitSocket + 1, &in, 0, 0, &tm ); + if( !FD_ISSET( tdeinitSocket, &in )) return; } dontBlockReading = false; - int result = read_socket(kdeinitSocket, (char *) &request_header, + int result = read_socket(tdeinitSocket, (char *) &request_header, sizeof( request_header)); if (result == -1) { @@ -551,7 +551,7 @@ KLauncher::slotKDEInitData(int) destruct(255); // Exit! } requestData.resize(request_header.arg_length); - result = read_socket(kdeinitSocket, (char *) requestData.data(), + result = read_socket(tdeinitSocket, (char *) requestData.data(), request_header.arg_length); if (request_header.cmd == LAUNCHER_DIED) @@ -791,7 +791,7 @@ void KLauncher::requestStart(KLaunchRequest *request) { requestList.append( request ); - // Send request to kdeinit. + // Send request to tdeinit. klauncher_header request_header; TQByteArray requestData; int length = 0; @@ -865,14 +865,14 @@ KLauncher::requestStart(KLaunchRequest *request) request_header.cmd = LAUNCHER_EXEC_NEW; #endif request_header.arg_length = length; - write(kdeinitSocket, &request_header, sizeof(request_header)); - write(kdeinitSocket, requestData.data(), request_header.arg_length); + write(tdeinitSocket, &request_header, sizeof(request_header)); + write(tdeinitSocket, requestData.data(), request_header.arg_length); // Wait for pid to return. lastRequest = request; dontBlockReading = false; do { - slotKDEInitData( kdeinitSocket ); + slotKDEInitData( tdeinitSocket ); } while (lastRequest != 0); dontBlockReading = true; @@ -1090,7 +1090,7 @@ KLauncher::send_service_startup_info( KLaunchRequest *request, KService::Ptr ser data.setWMClass( wmclass ); if( silent ) data.setSilent( KStartupInfoData::Yes ); - // the rest will be sent by kdeinit + // the rest will be sent by tdeinit KStartupInfo::sendStartupX( dpy, id, data ); if( mCached_dpy != dpy && mCached_dpy != NULL ) XCloseDisplay( mCached_dpy ); @@ -1136,7 +1136,7 @@ KLauncher::cancel_service_startup_info( KLaunchRequest* request, const TQCString } bool -KLauncher::kdeinit_exec(const TQString &app, const TQStringList &args, +KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args, const TQValueList<TQCString> &envs, TQCString startup_id, bool wait) { KLaunchRequest *request = new KLaunchRequest; @@ -1298,7 +1298,7 @@ KLauncher::requestSlave(const TQString &protocol, klauncher_header request_header; request_header.cmd = LAUNCHER_DEBUG_WAIT; request_header.arg_length = 0; - write(kdeinitSocket, &request_header, sizeof(request_header)); + write(tdeinitSocket, &request_header, sizeof(request_header)); } if (mSlaveValgrind == arg1) { diff --git a/kinit/klauncher.h b/kinit/klauncher.h index 5ff5b66c3..763d20e53 100644 --- a/kinit/klauncher.h +++ b/kinit/klauncher.h @@ -110,7 +110,7 @@ class KLauncher : public KApplication, public DCOPObject Q_OBJECT public: - KLauncher(int _kdeinitSocket, bool new_startup); + KLauncher(int _tdeinitSocket, bool new_startup); ~KLauncher(); @@ -141,7 +141,7 @@ protected: const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind); bool start_service_by_desktop_name(const TQString &serviceName, const TQStringList &urls, const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind); - bool kdeinit_exec(const TQString &app, const TQStringList &args, + bool tdeinit_exec(const TQString &app, const TQStringList &args, const TQValueList<TQCString> &envs, TQCString startup_id, bool wait); void waitForSlave(pid_t pid); @@ -176,8 +176,8 @@ public slots: protected: TQPtrList<KLaunchRequest> requestList; // Requests being handled TQPtrList<KLaunchRequest> requestQueue; // Requests waiting to being handled - int kdeinitSocket; - TQSocketNotifier *kdeinitNotifier; + int tdeinitSocket; + TQSocketNotifier *tdeinitNotifier; serviceResult DCOPresult; KLaunchRequest *lastRequest; TQPtrList<SlaveWaitRequest> mSlaveWaitRequest; diff --git a/kinit/klauncher_cmds.h b/kinit/klauncher_cmds.h index ff2993ad0..11105907b 100644 --- a/kinit/klauncher_cmds.h +++ b/kinit/klauncher_cmds.h @@ -44,7 +44,7 @@ typedef struct /* * LAUNCHER_SETENV * - * Change environment of future processes launched via kdeinit. + * Change environment of future processes launched via tdeinit. * DON'T use this if you want to change environment only for one * application you're going to start. * @@ -56,7 +56,7 @@ typedef struct /* * LAUNCHER_DIED * - * Notification A child of kdeinit died. + * Notification A child of tdeinit died. * * long pid; * long exit_code; @@ -94,7 +94,7 @@ typedef struct * char *envs: environment strings. * int avoid_loops : avoid using the first path in $PATH where * this process binary is found in order to avoid - * infinite loop by binary->kdeinit_wrapper link in $PATH + * infinite loop by binary->tdeinit_wrapper link in $PATH * char* startup_id: app startup notification id, "0" for none, * "" ( empty string ) is the default */ @@ -132,7 +132,7 @@ typedef struct * char *envs: environment strings. * int avoid_loops : avoid using the first path in $PATH where * this process binary is found in order to avoid - * infinite loop by binary->kdeinit_wrapper link in $PATH + * infinite loop by binary->tdeinit_wrapper link in $PATH * char* startup_id: app startup notification id, "0" for none, * "" ( empty string ) is the default * @@ -154,7 +154,7 @@ typedef struct * char *tty: tty to redirect stdout/stderr to. * int avoid_loops : avoid using the first path in $PATH where * this process binary is found in order to avoid - * infinite loop by binary->kdeinit_wrapper link in $PATH + * infinite loop by binary->tdeinit_wrapper link in $PATH * char* startup_id: app startup notification id, "0" for none, * "" ( empty string ) is the default */ @@ -174,12 +174,12 @@ typedef struct * char *envs: environment strings. * int avoid_loops : avoid using the first path in $PATH where * this process binary is found in order to avoid - * infinite loop by binary->kdeinit_wrapper link in $PATH + * infinite loop by binary->tdeinit_wrapper link in $PATH */ #define LAUNCHER_FD 42 /* - * File descriptor to use for communication with kdeinit. + * File descriptor to use for communication with tdeinit. */ #endif diff --git a/kinit/klauncher_main.cpp b/kinit/klauncher_main.cpp index 80b96980c..632c82a8c 100644 --- a/kinit/klauncher_main.cpp +++ b/kinit/klauncher_main.cpp @@ -52,11 +52,11 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) { - // Started via kdeinit. + // Started via tdeinit. if (fcntl(LAUNCHER_FD, F_GETFD) == -1) { fprintf(stderr, "%s", i18n("klauncher: This program is not supposed to be started manually.\n" - "klauncher: It is started automatically by kdeinit.\n").local8Bit().data()); + "klauncher: It is started automatically by tdeinit.\n").local8Bit().data()); return 1; } diff --git a/kinit/setproctitle.cpp b/kinit/setproctitle.cpp index a326ef291..e6c85561c 100644 --- a/kinit/setproctitle.cpp +++ b/kinit/setproctitle.cpp @@ -134,7 +134,7 @@ char **Argv = NULL; /* pointer to argument vector */ char *LastArgv = NULL; /* end of argv */ void -kdeinit_initsetproctitle(int argc, char **argv, char **envp) +tdeinit_initsetproctitle(int argc, char **argv, char **envp) { register int i, envpsize = 0; #if !defined(HAVE_NSGETENVIRON) || !defined(HAVE_CRT_EXTERNS_H) @@ -287,7 +287,7 @@ setproctitle(const char *fmt, ...) /*VARARGS2*/ void -kdeinit_setproctitle(const char *fmt, ...) +tdeinit_setproctitle(const char *fmt, ...) { char buf[SPT_BUFSIZE]; diff --git a/kinit/setproctitle.h b/kinit/setproctitle.h index df400f4cb..7a134e73e 100644 --- a/kinit/setproctitle.h +++ b/kinit/setproctitle.h @@ -145,8 +145,8 @@ #endif -extern void kdeinit_initsetproctitle(int, char **, char **); -extern void kdeinit_setproctitle(const char *, ...) +extern void tdeinit_initsetproctitle(int, char **, char **); +extern void tdeinit_setproctitle(const char *, ...) #ifdef __GNUC__ __attribute__ (( format ( printf, 1, 2 ) ) ) #endif diff --git a/kinit/start_kdeinit.c b/kinit/start_kdeinit.c index a86b366e5..9d2626057 100644 --- a/kinit/start_kdeinit.c +++ b/kinit/start_kdeinit.c @@ -32,9 +32,9 @@ /* Prevent getting killed by bad heuristic in Linux OOM-killer. This wrapper decreases the chance OOM killer kills it (or its children, - namely kdeinit), opens a pipe and forks. Child drops privileges - and launches kdeinit. Since processes started by kdeinit should - not have this protection, kdeinit will after forking send the new + namely tdeinit), opens a pipe and forks. Child drops privileges + and launches tdeinit. Since processes started by tdeinit should + not have this protection, tdeinit will after forking send the new PID using the pipe and wait for a signal. This parent will reset the protection and SIGUSR1 the process to continue. returns 1 if pid is valid @@ -113,7 +113,7 @@ int main(int argc, char **argv) return 1; } close( pipes[ 0 ] ); - /* read original environment passed by start_kdeinit_wrapper */ + /* read original environment passed by start_tdeinit_wrapper */ if( read( 0, header, 7 ) == 7 && strncmp( header, "environ", 7 ) == 0 ) { unsigned count; if( read( 0, &count, sizeof( unsigned )) == sizeof( unsigned ) diff --git a/kinit/start_kdeinit_wrapper.c b/kinit/start_kdeinit_wrapper.c index bc6d0e31f..eb26b0387 100644 --- a/kinit/start_kdeinit_wrapper.c +++ b/kinit/start_kdeinit_wrapper.c @@ -26,11 +26,11 @@ #ifdef KDEINIT_OOM_PROTECT /* - The start_kdeinit wrapper is setuid, which means some shell variables like LD_LIBRARY_PATH - get unset before it's launched. However kdeinit is used to launch most of KDE, so such variables + The start_tdeinit wrapper is setuid, which means some shell variables like LD_LIBRARY_PATH + get unset before it's launched. However tdeinit is used to launch most of KDE, so such variables should not be dropped. Therefore this wrapper for the setuid wrapper read the environment - and writes it to start_kdeinit's stdin, which after dropping priviledges reads it and uses it - for launching the real kdeinit. + and writes it to start_tdeinit's stdin, which after dropping priviledges reads it and uses it + for launching the real tdeinit. */ int main(int argc, char **argv) { @@ -50,9 +50,9 @@ int main(int argc, char **argv) close( 0 ); /* stdin */ dup2( pipes[ 0 ], 0 ); close( pipes[ 0 ] ); - argv[ 0 ] = (char*)"start_kdeinit"; - execvp("start_kdeinit", argv); - perror("start_kdeinit"); + argv[ 0 ] = (char*)"start_tdeinit"; + execvp("start_tdeinit", argv); + perror("start_tdeinit"); return 1; case 0: { /* child, pass env and exit */ extern char** environ; @@ -84,9 +84,9 @@ int main(int argc, char **argv) { if(argc == 0) return 1; - argv[0] = "start_kdeinit"; - execvp("start_kdeinit",argv); - perror("start_kdeinit"); + argv[0] = "start_tdeinit"; + execvp("start_tdeinit",argv); + perror("start_tdeinit"); return 1; } #endif diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp index ff1ae0fd1..46a4e5635 100644 --- a/kinit/tests/klaunchertest.cpp +++ b/kinit/tests/klaunchertest.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) { - KApplication::kdeinitExec("konsole"); + KApplication::tdeinitExec("konsole"); KApplication k(argc, argv, "klaunchertest"); diff --git a/kinit/wrapper.c b/kinit/wrapper.c index 15aa2bbf6..55577793b 100644 --- a/kinit/wrapper.c +++ b/kinit/wrapper.c @@ -181,13 +181,13 @@ static int openSocket() return -1; } - if (strlen(sock_file)+strlen(display)+strlen("/kdeinit_")+2 > MAX_SOCK_FILE) + if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE) { fprintf(stderr, "[trinity kinit] Warning: Socket name will be too long.\n"); free (display); return -1; } - strcat(sock_file, "/kdeinit_"); + strcat(sock_file, "/tdeinit_"); strcat(sock_file, display); free(display); @@ -330,24 +330,24 @@ int main(int argc, char **argv) p++; start = p; - if (strcmp(start, "kdeinit_wrapper") == 0) + if (strcmp(start, "tdeinit_wrapper") == 0) wrapper = 1; else if (strcmp(start, "kshell") == 0) ext_wrapper = 1; else if (strcmp(start, "kwrapper") == 0) kwrapper = 1; - else if (strcmp(start, "kdeinit_shutdown") == 0) + else if (strcmp(start, "tdeinit_shutdown") == 0) { if( argc > 1) { fprintf(stderr, "[trinity kinit] Usage: %s\n\n", start); - fprintf(stderr, "[trinity kinit] Shuts down kdeinit master process and terminates all processes spawned from it.\n"); + fprintf(stderr, "[trinity kinit] Shuts down tdeinit master process and terminates all processes spawned from it.\n"); exit( 255 ); } sock = openSocket(); if( sock < 0 ) { - fprintf( stderr, "[trinity kinit] Error: Can't contact kdeinit!\n" ); + fprintf( stderr, "[trinity kinit] Error: Can't contact tdeinit!\n" ); exit( 255 ); } header.cmd = LAUNCHER_TERMINATE_KDE; @@ -370,7 +370,7 @@ int main(int argc, char **argv) } sock = openSocket(); - if( sock < 0 ) /* couldn't contact kdeinit, start argv[ 0 ] directly */ + if( sock < 0 ) /* couldn't contact tdeinit, start argv[ 0 ] directly */ { execvp( argv[ 0 ], argv ); fprintf( stderr, "[trinity kinit] Error: Can't run %s !\n", argv[ 0 ] ); diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 4b0b4eca3..b18bfef33 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -60,6 +60,6 @@ tde_add_library( ${target} SHARED SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp VERSION 4.2.0 EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static - LINK kdeui-shared kdesu-shared kwalletclient-shared + LINK tdeui-shared tdesu-shared kwalletclient-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kio/DESIGN b/kio/DESIGN index 8131573e1..c84bd2182 100644 --- a/kio/DESIGN +++ b/kio/DESIGN @@ -2,7 +2,7 @@ DESIGN: ======= libkio uses kioslaves (separate processes) that handle a given protocol. -Launching those slaves is taken care of by the kdeinit/klauncher tandem, +Launching those slaves is taken care of by the tdeinit/klauncher tandem, which are notified by DCOP. Connection is the most low-level class, the one that encapsulates the pipe. diff --git a/kio/Makefile.am b/kio/Makefile.am index a0573f340..c2792330a 100644 --- a/kio/Makefile.am +++ b/kio/Makefile.am @@ -30,7 +30,7 @@ libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \ $(KDE_MT_LDFLAGS) libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \ kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \ - ../kdeui/libtdeui.la ../kdesu/libtdesu.la \ + ../tdeui/libtdeui.la ../tdesu/libtdesu.la \ ../kwallet/client/libkwalletclient.la \ $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) @@ -62,6 +62,6 @@ messages: $(XGETTEXT) `find . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot rm -f rc.cpp -DOXYGEN_REFERENCES = kdecore kdefx kjs dcop kdeui kio/kio kio/kfile +DOXYGEN_REFERENCES = tdecore tdefx kjs dcop tdeui kio/kio kio/kfile DOXYGEN_EXCLUDE = kssl/kssl include ../admin/Doxyfile.am diff --git a/kio/bookmarks/CMakeLists.txt b/kio/bookmarks/CMakeLists.txt index 9aac8b591..7c2fd72c6 100644 --- a/kio/bookmarks/CMakeLists.txt +++ b/kio/bookmarks/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kio/bookmarks/Makefile.am b/kio/bookmarks/Makefile.am index 2a41efd98..63b535e13 100644 --- a/kio/bookmarks/Makefile.am +++ b/kio/bookmarks/Makefile.am @@ -17,7 +17,7 @@ # Boston, MA 02110-1301, USA. -INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/kdefx -I$(top_builddir)/kio/kio $(all_includes) +INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx -I$(top_builddir)/kio/kio $(all_includes) noinst_LTLIBRARIES = libkbookmarks.la diff --git a/kio/httpfilter/CMakeLists.txt b/kio/httpfilter/CMakeLists.txt index 802e45b89..eec4e78a7 100644 --- a/kio/httpfilter/CMakeLists.txt +++ b/kio/httpfilter/CMakeLists.txt @@ -13,8 +13,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ) diff --git a/kio/kfile/CMakeLists.txt b/kio/kfile/CMakeLists.txt index e9e7540b7..3444fa0da 100644 --- a/kio/kfile/CMakeLists.txt +++ b/kio/kfile/CMakeLists.txt @@ -14,12 +14,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/bookmarks diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog index bb43f16da..ac05c86d0 100644 --- a/kio/kfile/ChangeLog +++ b/kio/kfile/ChangeLog @@ -643,7 +643,7 @@ Thu Mar 12 00:36:05 1998 Stephan Kulow <coolo@kde.org> Sun Feb 15 23:13:47 1998 Richard Moore <rich@kde.org> * More work on the bookmarks - they should work properly now, you - must create the directory ~/.kde/share/apps/kdeui to store the + must create the directory ~/.kde/share/apps/tdeui to store the bookmarks in. * Regenerated docs diff --git a/kio/kfile/Makefile.am b/kio/kfile/Makefile.am index a63306189..1951f30c0 100644 --- a/kio/kfile/Makefile.am +++ b/kio/kfile/Makefile.am @@ -17,7 +17,7 @@ # Boston, MA 02110-1301, USA. -INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/kdefx \ +INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx \ -I$(top_builddir)/kio/kio -I$(top_srcdir)/kio/bookmarks $(all_includes) $(LIBART_CFLAGS) noinst_LTLIBRARIES = libkfile.la diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index c396a1b58..bdf101339 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -237,7 +237,7 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() if (d->m_configProc) return; d->m_configProc = new KProcess(this); - (*d->m_configProc) << KStandardDirs::findExe("kdesu") << locate("exe", "kcmshell") << "fileshare"; + (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; if (!d->m_configProc->start( KProcess::NotifyOnExit )) { delete d->m_configProc; diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt index f337175c3..f9976a6d2 100644 --- a/kio/kio/CMakeLists.txt +++ b/kio/kio/CMakeLists.txt @@ -15,12 +15,12 @@ include_directories( ${CMAKE_BINARY_DIR}/kio/kssl ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/network - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/network + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/interfaces diff --git a/kio/kio/Makefile.am b/kio/kio/Makefile.am index 374fb0ab1..2034a33b6 100644 --- a/kio/kio/Makefile.am +++ b/kio/kio/Makefile.am @@ -18,7 +18,7 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -INCLUDES= -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/kdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces $(all_includes) $(SSL_INCLUDES) +INCLUDES= -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces $(all_includes) $(SSL_INCLUDES) noinst_LTLIBRARIES = libkiocore.la libksycoca.la @@ -63,7 +63,7 @@ include_HEADERS += kacl.h #endif #libkiocore_la_LDFLAGS = $(all_libraries) -#libkiocore_la_LIBADD = ../../kdeui/libtdeui.la ../../kdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT) +#libkiocore_la_LIBADD = ../../tdeui/libtdeui.la ../../tdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT) libkiocore_la_SOURCES = authinfo.cpp \ kshred.cpp \ diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index f62a7d2a8..719107223 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -900,7 +900,7 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & ) args << url.path(); int pid; - if ( !KApplication::kdeinitExec("kfmclient", args, 0, &pid) ) + if ( !KApplication::tdeinitExec("kfmclient", args, 0, &pid) ) return pid; KProcess p; diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp index 01e3e6c18..73a960ea0 100644 --- a/kio/kio/kprotocolinfo.cpp +++ b/kio/kio/kprotocolinfo.cpp @@ -26,7 +26,7 @@ #include "kprotocolinfofactory.h" #include "kprotocolmanager.h" -// Most of this class is implemented in kdecore/kprotocolinfo_kdecore.cpp +// Most of this class is implemented in tdecore/kprotocolinfo_tdecore.cpp // This file only contains a few static class-functions that depend on // KProtocolManager diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h index dba4694db..1dad7915f 100644 --- a/kio/kio/kprotocolinfo.h +++ b/kio/kio/kprotocolinfo.h @@ -669,11 +669,11 @@ protected: TQString m_config; int m_maxSlaves; - bool canRenameFromFile() const; // for kprotocolinfo_kdecore - bool canRenameToFile() const; // for kprotocolinfo_kdecore - bool canDeleteRecursive() const; // for kprotocolinfo_kdecore - FileNameUsedForCopying fileNameUsedForCopying() const; // for kprotocolinfo_kdecore - static KProtocolInfo* findProtocol(const KURL &url); // for kprotocolinfo_kdecore + bool canRenameFromFile() const; // for kprotocolinfo_tdecore + bool canRenameToFile() const; // for kprotocolinfo_tdecore + bool canDeleteRecursive() const; // for kprotocolinfo_tdecore + FileNameUsedForCopying fileNameUsedForCopying() const; // for kprotocolinfo_tdecore + static KProtocolInfo* findProtocol(const KURL &url); // for kprotocolinfo_tdecore protected: virtual void virtual_hook( int id, void* data ); diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 133c686b9..43bdb9f50 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -456,8 +456,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List 2 << split(term) << "-e" << split(cmd) 3 << split(term) << "-e" << "sh" << "-c" << cmd - 4 << "kdesu" << "-u" << user << "-c" << cmd - 5 << "kdesu" << "-u" << user << "-c" << ("sh -c " + quote(cmd)) + 4 << "tdesu" << "-u" << user << "-c" << cmd + 5 << "tdesu" << "-u" << user << "-c" << ("sh -c " + quote(cmd)) 6 << split(term) << "-e" << "su" << user << "-c" << cmd 7 << split(term) << "-e" << "su" << user << "-c" << ("sh -c " + quote(cmd)) @@ -466,8 +466,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List a << term << "-e" << cmd b << term << "-e" << ("sh -c " + quote(cmd)) - c << "kdesu" << "-u" << user << "-c" << quote(cmd) - d << "kdesu" << "-u" << user << "-c" << quote("sh -c " + quote(cmd)) + c << "tdesu" << "-u" << user << "-c" << quote(cmd) + d << "tdesu" << "-u" << user << "-c" << quote("sh -c " + quote(cmd)) e << term << "-e" << "su" << user << "-c" << quote(cmd) f << term << "-e" << "su" << user << "-c" << quote("sh -c " + quote(cmd)) @@ -499,7 +499,7 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List if (_service.terminal()) result << "su"; else - result << "kdesu" << "-u"; + result << "tdesu" << "-u"; result << _service.username() << "-c"; KShell::splitArgs(exec, KShell::AbortOnMeta | KShell::TildeExpand, &err); if (err == KShell::FoundMeta) { diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 020bc62dd..5bda16786 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -33,7 +33,7 @@ #include <kprotocolinfo.h> #include <assert.h> #include <kstaticdeleter.h> -#include <kdesu/client.h> +#include <tdesu/client.h> // Slaves may be idle for MAX_SLAVE_IDLE time before they are being returned diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index c94fe3b40..937d6aa51 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -30,7 +30,7 @@ #include <kprotocolmanager.h> #include <kstandarddirs.h> -#include <kdesu/client.h> +#include <tdesu/client.h> #include <kio/slaveconfig.h> #include <kio/http_slave_defaults.h> @@ -82,14 +82,14 @@ public: private: #ifdef Q_OS_UNIX - KDEsuClient * m_kdesuClient; + KDEsuClient * m_tdesuClient; #endif }; SessionData::AuthDataList::AuthDataList() { #ifdef Q_OS_UNIX - m_kdesuClient = new KDEsuClient; + m_tdesuClient = new KDEsuClient; #endif setAutoDelete(true); } @@ -98,8 +98,8 @@ SessionData::AuthDataList::~AuthDataList() { purgeCachedData(); #ifdef Q_OS_UNIX - delete m_kdesuClient; - m_kdesuClient = 0; + delete m_tdesuClient; + m_tdesuClient = 0; #endif } @@ -131,12 +131,12 @@ void SessionData::AuthDataList::removeData( const TQCString& gkey ) bool SessionData::AuthDataList::pingCacheDaemon() { #ifdef Q_OS_UNIX - Q_ASSERT(m_kdesuClient); + Q_ASSERT(m_tdesuClient); - int success = m_kdesuClient->ping(); + int success = m_tdesuClient->ping(); if( success == -1 ) { - success = m_kdesuClient->startServer(); + success = m_tdesuClient->startServer(); if( success == -1 ) return false; } @@ -154,15 +154,15 @@ void SessionData::AuthDataList::registerAuthData( SessionData::AuthData* d ) #ifdef Q_OS_UNIX bool ok; TQCString ref_key = d->key + "-refcount"; - int count = m_kdesuClient->getVar(ref_key).toInt( &ok ); + int count = m_tdesuClient->getVar(ref_key).toInt( &ok ); if( ok ) { TQCString val; val.setNum( count+1 ); - m_kdesuClient->setVar( ref_key, val, 0, d->group ); + m_tdesuClient->setVar( ref_key, val, 0, d->group ); } else - m_kdesuClient->setVar( ref_key, "1", 0, d->group ); + m_tdesuClient->setVar( ref_key, "1", 0, d->group ); #endif } @@ -176,18 +176,18 @@ void SessionData::AuthDataList::unregisterAuthData( SessionData::AuthData* d ) TQCString ref_key = d->key + "-refcount"; #ifdef Q_OS_UNIX - count = m_kdesuClient->getVar( ref_key ).toInt( &ok ); + count = m_tdesuClient->getVar( ref_key ).toInt( &ok ); if ( ok ) { if ( count > 1 ) { TQCString val; val.setNum(count-1); - m_kdesuClient->setVar( ref_key, val, 0, d->group ); + m_tdesuClient->setVar( ref_key, val, 0, d->group ); } else { - m_kdesuClient->delVars(d->key); + m_tdesuClient->delVars(d->key); } } #endif diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index 13e7c636f..04d977009 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -47,7 +47,7 @@ #include <kapplication.h> #include <ksock.h> #include <kcrash.h> -#include <kdesu/client.h> +#include <tdesu/client.h> #include <klocale.h> #include <ksocks.h> diff --git a/kio/kioexec/CMakeLists.txt b/kio/kioexec/CMakeLists.txt index d903f1f3a..0ab606643 100644 --- a/kio/kioexec/CMakeLists.txt +++ b/kio/kioexec/CMakeLists.txt @@ -13,9 +13,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am index e0bd75491..98fc1987d 100644 --- a/kio/kioexec/Makefile.am +++ b/kio/kioexec/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes) bin_PROGRAMS = kioexec kioexec_SOURCES = main.cpp -kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kioexec_LDADD = $(LIB_KIO) noinst_HEADERS = main.h diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt index 5ed92bf17..a02d3b50a 100644 --- a/kio/kpasswdserver/CMakeLists.txt +++ b/kio/kpasswdserver/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kwallet/client ${CMAKE_SOURCE_DIR}/kio ) @@ -37,7 +37,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kio/kssl/CMakeLists.txt b/kio/kssl/CMakeLists.txt index c6a383adb..377cd9d01 100644 --- a/kio/kssl/CMakeLists.txt +++ b/kio/kssl/CMakeLists.txt @@ -16,11 +16,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/network - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/network + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kwallet/client ) diff --git a/kio/kssl/Makefile.am b/kio/kssl/Makefile.am index 49a448db1..54f2fc6f5 100644 --- a/kio/kssl/Makefile.am +++ b/kio/kssl/Makefile.am @@ -3,7 +3,7 @@ # somewhere else. Another option for the future (needs testing) would be to # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h> # instead of #include <openssl/foo.h> -INCLUDES=-I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES) +INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES) noinst_LTLIBRARIES = libkssl.la KSSLVERSION= 3.0.0 diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt index d6bc0cb16..52aa2207a 100644 --- a/kio/misc/CMakeLists.txt +++ b/kio/misc/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory( ksendbugmail ) add_subdirectory( kpac ) -add_subdirectory( kdesasl ) +add_subdirectory( tdesasl ) add_subdirectory( kssld ) add_subdirectory( kfile ) add_subdirectory( kwalletd ) @@ -24,15 +24,15 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/kio ${CMAKE_BINARY_DIR}/kio/kio ${CMAKE_BINARY_DIR}/kio/kssl ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kssl @@ -69,7 +69,7 @@ set( ${target}_SRCS uiserver.cpp uiserver.skel ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared DEPENDENCIES dcopidl @@ -82,7 +82,7 @@ set( target kmailservice ) tde_add_executable( ${target} SOURCES ${target}.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -93,7 +93,7 @@ set( target ktelnetservice ) tde_add_executable( ${target} SOURCES ${target}.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am index 203d79878..3d05c0003 100644 --- a/kio/misc/Makefile.am +++ b/kio/misc/Makefile.am @@ -20,10 +20,10 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES) -SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile kwalletd kntlm +SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kio_uiserver.la +tdeinit_LTLIBRARIES = kio_uiserver.la bin_PROGRAMS = kmailservice ktelnetservice observer_DIR = $(top_srcdir)/kio/kio @@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop kmailservice_SOURCES = kmailservice.cpp kmailservice_LDADD = $(LIB_KDECORE) -kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktelnetservice_SOURCES = ktelnetservice.cpp ktelnetservice_LDADD = $(LIB_KDEUI) -ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \ mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol diff --git a/kio/misc/kdesasl/CMakeLists.txt b/kio/misc/kdesasl/CMakeLists.txt index 081d64799..27cacfbb9 100644 --- a/kio/misc/kdesasl/CMakeLists.txt +++ b/kio/misc/kdesasl/CMakeLists.txt @@ -12,8 +12,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -23,20 +23,20 @@ link_directories( ##### headers ################################### -install(FILES kdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) +install(FILES tdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) -##### kdesasl ################################### +##### tdesasl ################################### -set( target kdesasl ) +set( target tdesasl ) set( ${target}_SRCS - kdesasl.cpp + tdesasl.cpp ) tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kio/misc/kdesasl/Makefile.am b/kio/misc/kdesasl/Makefile.am index 0160cdb67..d308e6770 100644 --- a/kio/misc/kdesasl/Makefile.am +++ b/kio/misc/kdesasl/Makefile.am @@ -3,10 +3,10 @@ INCLUDES=$(all_includes) lib_LTLIBRARIES = libtdesasl.la METASOURCES = AUTO -kdesaslincludedir = $(includedir)/kio -kdesaslinclude_HEADERS = kdesasl.h +tdesaslincludedir = $(includedir)/kio +tdesaslinclude_HEADERS = tdesasl.h -libtdesasl_la_SOURCES = kdesasl.cpp +libtdesasl_la_SOURCES = tdesasl.cpp libtdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined libtdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp index b547f7e6b..37195faf3 100644 --- a/kio/misc/kdesasl/kdesasl.cpp +++ b/kio/misc/kdesasl/kdesasl.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include "kdesasl.h" +#include "tdesasl.h" #include <kmdcodec.h> #include <kurl.h> diff --git a/kio/misc/kfile/CMakeLists.txt b/kio/misc/kfile/CMakeLists.txt index 4a00ae286..07c2725b2 100644 --- a/kio/misc/kfile/CMakeLists.txt +++ b/kio/misc/kfile/CMakeLists.txt @@ -11,9 +11,9 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am index c02f9eb97..c0ede6f62 100644 --- a/kio/misc/kfile/Makefile.am +++ b/kio/misc/kfile/Makefile.am @@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes) bin_PROGRAMS = kfile kfile_SOURCES = fileprops.cpp -kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kfile_LDADD = $(LIB_KIO) diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt index 9b4b916bc..0952f4535 100644 --- a/kio/misc/kntlm/CMakeLists.txt +++ b/kio/misc/kntlm/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -38,6 +38,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kio/misc/kpac/CMakeLists.txt b/kio/misc/kpac/CMakeLists.txt index c3fc418c3..00ce2d357 100644 --- a/kio/misc/kpac/CMakeLists.txt +++ b/kio/misc/kpac/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/kjs ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/network + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/network ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kded @@ -49,7 +49,7 @@ set( ${target}_SKELS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared kjs-shared ${RESOLV_LIBRARIES} + LINK tdeinit_kded-shared kjs-shared ${RESOLV_LIBRARIES} DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kio/misc/kpac/Makefile.am b/kio/misc/kpac/Makefile.am index 796a9771c..65047f343 100644 --- a/kio/misc/kpac/Makefile.am +++ b/kio/misc/kpac/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_proxyscout.la bin_PROGRAMS = kpac_dhcp_helper INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kded -I$(top_builddir)/kjs \ - -I$(top_srcdir)/kdecore/network $(all_includes) + -I$(top_srcdir)/tdecore/network $(all_includes) METASOURCES = AUTO KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/kio/misc/ksendbugmail/CMakeLists.txt b/kio/misc/ksendbugmail/CMakeLists.txt index 133049129..f0e1b99b0 100644 --- a/kio/misc/ksendbugmail/CMakeLists.txt +++ b/kio/misc/ksendbugmail/CMakeLists.txt @@ -12,8 +12,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am index 2a9b8f3cc..a9b461159 100644 --- a/kio/misc/ksendbugmail/Makefile.am +++ b/kio/misc/ksendbugmail/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail INCLUDES= -I$(srcdir)/.. $(all_includes) ksendbugmail_SOURCES = main.cpp smtp.cpp -ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksendbugmail_LDADD = ../../libkio.la METASOURCES = AUTO diff --git a/kio/misc/kssld/CMakeLists.txt b/kio/misc/kssld/CMakeLists.txt index ca9438817..14d2de1ac 100644 --- a/kio/misc/kssld/CMakeLists.txt +++ b/kio/misc/kssld/CMakeLists.txt @@ -14,10 +14,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kio/kssl - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio/kssl ) @@ -41,7 +41,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp index 9c8238f74..aa7b3b226 100644 --- a/kio/misc/ktelnetservice.cpp +++ b/kio/misc/ktelnetservice.cpp @@ -104,7 +104,7 @@ int main(int argc, char **argv) cmd << TQString::number(url.port()); } - app.kdeinitExec(terminal, cmd); + app.tdeinitExec(terminal, cmd); return 0; } diff --git a/kio/misc/kwalletd/CMakeLists.txt b/kio/misc/kwalletd/CMakeLists.txt index eb02085f5..db4f56cb1 100644 --- a/kio/misc/kwalletd/CMakeLists.txt +++ b/kio/misc/kwalletd/CMakeLists.txt @@ -12,11 +12,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kwallet/client ${CMAKE_SOURCE_DIR}/kwallet/backend ${CMAKE_SOURCE_DIR}/kio/kio @@ -43,7 +43,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared kwalletbackend-shared + LINK tdeinit_kded-shared kwalletbackend-shared DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index bf8b606dc..55da183ee 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -37,7 +37,7 @@ #include <kstatusbar.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kdesu/client.h> +#include <tdesu/client.h> #include <kwin.h> #include <kdialog.h> #include <ksystemtray.h> diff --git a/kio/tests/CMakeLists.txt b/kio/tests/CMakeLists.txt index 9c4fb7427..54378f5c8 100644 --- a/kio/tests/CMakeLists.txt +++ b/kio/tests/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kio/tests/Makefile.am b/kio/tests/Makefile.am index ee81b822c..34acd24f6 100644 --- a/kio/tests/Makefile.am +++ b/kio/tests/Makefile.am @@ -18,7 +18,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes) LDADD = $(LIB_KIO) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\ kioslavetest kdirwatchtest kshredtest speed kurifiltertest \ diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp index 10dbc9b71..0febcbc26 100644 --- a/kio/tests/kruntest.cpp +++ b/kio/tests/kruntest.cpp @@ -146,16 +146,16 @@ int main(int argc, char **argv) "'/bin/sh' '-c' 'echo $PWD '", // 1 "'x-term' '-T' ' - just_a_test' '-e' 'date' '-u'", // 2 "'x-term' '-T' ' - just_a_test' '-e' '/bin/sh' '-c' 'echo $PWD '", // 3 -"'kdesu' '-u' 'sprallo' '-c' 'date -u '", // 4 -"'kdesu' '-u' 'sprallo' '-c' '/bin/sh -c '\\''echo $PWD '\\'''", // 5 +"'tdesu' '-u' 'sprallo' '-c' 'date -u '", // 4 +"'tdesu' '-u' 'sprallo' '-c' '/bin/sh -c '\\''echo $PWD '\\'''", // 5 "'x-term' '-T' ' - just_a_test' '-e' 'su' 'sprallo' '-c' 'date -u '", // 6 "'x-term' '-T' ' - just_a_test' '-e' 'su' 'sprallo' '-c' '/bin/sh -c '\\''echo $PWD '\\'''", // 7 "'date -u '", // 8 "'echo $PWD '", // 9 "'x-term -T \" - just_a_test\"' '-e' 'date -u '", // a "'x-term -T \" - just_a_test\"' '-e' '/bin/sh -c '\\''echo $PWD '\\'''", // b -"'kdesu' '-u' 'sprallo' '-c' ''\\''date -u '\\'''", // c -"'kdesu' '-u' 'sprallo' '-c' ''\\''/bin/sh -c '\\''\\'\\'''\\''echo $PWD '\\''\\'\\'''\\'''\\'''", // d +"'tdesu' '-u' 'sprallo' '-c' ''\\''date -u '\\'''", // c +"'tdesu' '-u' 'sprallo' '-c' ''\\''/bin/sh -c '\\''\\'\\'''\\''echo $PWD '\\''\\'\\'''\\'''\\'''", // d "'x-term -T \" - just_a_test\"' '-e' 'su' 'sprallo' '-c' ''\\''date -u '\\'''", // e "'x-term -T \" - just_a_test\"' '-e' 'su' 'sprallo' '-c' ''\\''/bin/sh -c '\\''\\'\\'''\\''echo $PWD '\\''\\'\\'''\\'''\\'''", // f }; diff --git a/kioslave/bzip2/CMakeLists.txt b/kioslave/bzip2/CMakeLists.txt index 054d87fdf..a2354d6b0 100644 --- a/kioslave/bzip2/CMakeLists.txt +++ b/kioslave/bzip2/CMakeLists.txt @@ -12,8 +12,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kioslave/file/CMakeLists.txt b/kioslave/file/CMakeLists.txt index fef6c2224..2cf415745 100644 --- a/kioslave/file/CMakeLists.txt +++ b/kioslave/file/CMakeLists.txt @@ -17,9 +17,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kioslave/ftp/CMakeLists.txt b/kioslave/ftp/CMakeLists.txt index 0220acd40..e0287639b 100644 --- a/kioslave/ftp/CMakeLists.txt +++ b/kioslave/ftp/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/network + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/network ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kioslave/gzip/CMakeLists.txt b/kioslave/gzip/CMakeLists.txt index 3426fef09..e71908c31 100644 --- a/kioslave/gzip/CMakeLists.txt +++ b/kioslave/gzip/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kioslave/gzip/Makefile.am b/kioslave/gzip/Makefile.am index e8cda96ef..578ec1b17 100644 --- a/kioslave/gzip/Makefile.am +++ b/kioslave/gzip/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/kio $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kgzipfilter.la diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt index a043a8a8d..51bcfe092 100644 --- a/kioslave/http/CMakeLists.txt +++ b/kioslave/http/CMakeLists.txt @@ -15,10 +15,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/network + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/network ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio @@ -46,7 +46,7 @@ set( ${target}_SRCS http_cache_cleaner.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared ) diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am index 3a185f356..117867715 100644 --- a/kioslave/http/Makefile.am +++ b/kioslave/http/Makefile.am @@ -3,14 +3,14 @@ SUBDIRS = kcookiejar -INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/kdecore/network $(all_includes) $(GSSAPI_INCS) +INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdecore/network $(all_includes) $(GSSAPI_INCS) AM_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) ####### Files bin_PROGRAMS= lib_LTLIBRARIES= -kdeinit_LTLIBRARIES = kio_http_cache_cleaner.la +tdeinit_LTLIBRARIES = kio_http_cache_cleaner.la kde_module_LTLIBRARIES = kio_http.la kio_http_la_SOURCES = http.cc diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index 3d957aaef..a37fe27ca 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -5082,7 +5082,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy ) ((m_iProxyAuthCount > 0) && (f < ProxyAuthentication))) { // Since I purposefully made the Proxy-Authentication settings - // persistent to reduce the number of round-trips to kdesud we + // persistent to reduce the number of round-trips to tdesud we // have to take special care when an unknown/unsupported auth- // scheme is received. This check accomplishes just that... if ( m_iProxyAuthCount == 0) diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt index 9ae76c0d4..eef5e9654 100644 --- a/kioslave/http/kcookiejar/CMakeLists.txt +++ b/kioslave/http/kcookiejar/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -40,9 +40,9 @@ set( ${target}_SRCS main.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdecore-shared + LINK tdecore-shared ) @@ -57,7 +57,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared kdeinit_kded-shared + LINK tdeui-shared tdeinit_kded-shared DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am index 7478e09e3..163d618e1 100644 --- a/kioslave/http/kcookiejar/Makefile.am +++ b/kioslave/http/kcookiejar/Makefile.am @@ -7,7 +7,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kcookiejar.la +tdeinit_LTLIBRARIES = kcookiejar.la kde_module_LTLIBRARIES = kded_kcookiejar.la kcookiejar_la_SOURCES = main.cpp diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am index 32540d3f2..9ac6cb000 100644 --- a/kioslave/http/kcookiejar/tests/Makefile.am +++ b/kioslave/http/kcookiejar/tests/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest kcookiejartest_SOURCES = kcookiejartest.cpp kcookiejartest_LDADD = $(LIB_KIO) -kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor check-local: kcookiejartest ./kcookiejartest $(srcdir)/cookie.test diff --git a/kioslave/iso/CMakeLists.txt b/kioslave/iso/CMakeLists.txt index 2d445b520..da6315b77 100644 --- a/kioslave/iso/CMakeLists.txt +++ b/kioslave/iso/CMakeLists.txt @@ -16,8 +16,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kioslave/metainfo/CMakeLists.txt b/kioslave/metainfo/CMakeLists.txt index 2eb466d9a..9c5fcdf20 100644 --- a/kioslave/metainfo/CMakeLists.txt +++ b/kioslave/metainfo/CMakeLists.txt @@ -11,9 +11,9 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am index dae0b9180..98b5632f6 100644 --- a/kioslave/metainfo/Makefile.am +++ b/kioslave/metainfo/Makefile.am @@ -2,7 +2,7 @@ ## Makefile.am of kdebase/kioslave/metainfo INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kio_metainfo.la diff --git a/kjs/CMakeLists.txt b/kjs/CMakeLists.txt index 953953684..d668b6c08 100644 --- a/kjs/CMakeLists.txt +++ b/kjs/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -59,6 +59,6 @@ tde_add_lut( keywords.table lexer.lut.h lexer.cpp ) tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kjs/Mainpage.dox b/kjs/Mainpage.dox index bad54558e..30a003b2e 100644 --- a/kjs/Mainpage.dox +++ b/kjs/Mainpage.dox @@ -22,7 +22,7 @@ Harri Porten \<porten@kde.org\> */ -// DOXYGEN_REFERENCES = kdecore +// DOXYGEN_REFERENCES = tdecore // DOXYGEN_SET_PROJECT_NAME = KJS // DOXYGEN_SET_EXCLUDE_PATTERNS += */wtf/* // DOXYGEN_SET_EXCLUDE_PATTERNS += */kjs/*.cpp */kjs/*.h diff --git a/kjs/Makefile.am b/kjs/Makefile.am index 59fe7e855..89f937906 100644 --- a/kjs/Makefile.am +++ b/kjs/Makefile.am @@ -101,7 +101,7 @@ check_PROGRAMS = testkjs testkjs_SOURCES = testkjs.cpp testkjs_LDADD = libkjs.la -DOXYGEN_REFERENCES = kdecore +DOXYGEN_REFERENCES = tdecore include ../admin/Doxyfile.am .PHONY: parser diff --git a/kjs/date_object.cpp b/kjs/date_object.cpp index 26635611d..ff5209bb3 100644 --- a/kjs/date_object.cpp +++ b/kjs/date_object.cpp @@ -754,7 +754,7 @@ double KJS::parseDate(const UString &u) return seconds == invalidDate ? NaN : seconds * 1000.0; } -///// Awful duplication from krfcdate.cpp - we don't link to kdecore +///// Awful duplication from krfcdate.cpp - we don't link to tdecore static double ymdhms_to_seconds(int year, int mon, int day, int hour, int minute, int second) { diff --git a/kmdi/CMakeLists.txt b/kmdi/CMakeLists.txt index 1814876a1..ab54cb550 100644 --- a/kmdi/CMakeLists.txt +++ b/kmdi/CMakeLists.txt @@ -16,11 +16,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/res - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/kmdi ) diff --git a/kmdi/kmdi/CMakeLists.txt b/kmdi/kmdi/CMakeLists.txt index 28c8bea78..2314d79ab 100644 --- a/kmdi/kmdi/CMakeLists.txt +++ b/kmdi/kmdi/CMakeLists.txt @@ -14,12 +14,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/kmdi - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kutils ) diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 40e490aa7..6d71032d0 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -37,7 +37,7 @@ #include <kconfig.h> #include <klocale.h> -//TODO: Well, this is already defined in kdeui/kdockwidget.cpp +//TODO: Well, this is already defined in tdeui/kdockwidget.cpp static const char* const kmdi_not_close_xpm[]={ "5 5 2 1", "# c black", diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 65fe98e02..f76850ede 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -36,7 +36,7 @@ #include <kconfig.h> #include <klocale.h> -//TODO: Well, this is already defined in kdeui/kdockwidget.cpp +//TODO: Well, this is already defined in tdeui/kdockwidget.cpp static const char* const kmdi_not_close_xpm[] = { "5 5 2 1", diff --git a/knewstuff/CMakeLists.txt b/knewstuff/CMakeLists.txt index 29bcecc92..50350f29f 100644 --- a/knewstuff/CMakeLists.txt +++ b/knewstuff/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/knewstuff/Mainpage.dox b/knewstuff/Mainpage.dox index f0fd034c1..d44f61804 100644 --- a/knewstuff/Mainpage.dox +++ b/knewstuff/Mainpage.dox @@ -30,6 +30,6 @@ Jeremy Whiting \<jeremy@scitools.com\> */ -// DOXYGEN_REFERENCES = kdecore kdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui kio // DOXYGEN_SET_PROJECT_NAME = KNewStuff // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am index 718246275..e9d178f37 100644 --- a/knewstuff/Makefile.am +++ b/knewstuff/Makefile.am @@ -12,17 +12,17 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \ bin_PROGRAMS = khotnewstuff -khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor khotnewstuff_LDADD = libknewstuff.la khotnewstuff_SOURCES = khotnewstuff.cpp EXTRA_PROGRAMS = testnewstuff ghns -testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testnewstuff_LDADD = libknewstuff.la testnewstuff_SOURCES = testnewstuff.cpp -ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ghns_LDADD = libknewstuff.la ghns_SOURCES = ghns.cpp diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt index 982ae3c51..aeda0cb81 100644 --- a/kparts/CMakeLists.txt +++ b/kparts/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kparts/Mainpage.dox b/kparts/Mainpage.dox index 1a84ee131..994503d44 100644 --- a/kparts/Mainpage.dox +++ b/kparts/Mainpage.dox @@ -37,6 +37,6 @@ Michael Koch \<koch@kde.org\> */ -// DOXYGEN_REFERENCES = kdecore kdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui kio // DOXYGEN_SET_PROJECT_NAME = KParts // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kparts/Makefile.am b/kparts/Makefile.am index 2acbcbcd1..3eaaa82ab 100644 --- a/kparts/Makefile.am +++ b/kparts/Makefile.am @@ -28,5 +28,5 @@ libkparts_la_METASOURCES = AUTO servicetype_DATA = kpart.desktop krop.desktop krwp.desktop browserview.desktop servicetypedir = $(kde_servicetypesdir) -DOXYGEN_REFERENCES = kdecore kdeui kdefx kio +DOXYGEN_REFERENCES = tdecore tdeui tdefx kio include ../admin/Doxyfile.am diff --git a/krandr/CMakeLists.txt b/krandr/CMakeLists.txt index 31ab2a067..4a6d1803d 100644 --- a/krandr/CMakeLists.txt +++ b/krandr/CMakeLists.txt @@ -13,10 +13,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${XRANDR_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -43,6 +43,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.95 - LINK kdeui-shared ${XRANDR_LIBRARIES} Xext + LINK tdeui-shared ${XRANDR_LIBRARIES} Xext DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/krandr/Mainpage.dox b/krandr/Mainpage.dox index bb81d5756..c173d52aa 100644 --- a/krandr/Mainpage.dox +++ b/krandr/Mainpage.dox @@ -13,6 +13,6 @@ Timothy Pearson \<kb9vqf@pearsoncomputing.net\> */ -// DOXYGEN_REFERENCES = kdecore kdeui +// DOXYGEN_REFERENCES = tdecore tdeui // DOXYGEN_SET_PROJECT_NAME = KRandr // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/krandr/Makefile.am b/krandr/Makefile.am index 3d21c6dc2..e95e80f21 100644 --- a/krandr/Makefile.am +++ b/krandr/Makefile.am @@ -13,7 +13,7 @@ libkrandr_la_SOURCES = randr.cpp lowlevel_randr.c ktimerdialog.cpp libkrandr.cc METASOURCES = AUTO libkrandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined -libkrandr_la_LIBADD = $(LIBASOUND) ../kdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR) +libkrandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR) -DOXYGEN_REFERENCES = kdecore +DOXYGEN_REFERENCES = tdecore include ../admin/Doxyfile.am diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt index 3e79d13e7..f6932baaa 100644 --- a/kresources/CMakeLists.txt +++ b/kresources/CMakeLists.txt @@ -12,11 +12,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kresources/Makefile.am b/kresources/Makefile.am index 18fccb095..ca3113b6a 100644 --- a/kresources/Makefile.am +++ b/kresources/Makefile.am @@ -37,7 +37,7 @@ kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE check_PROGRAMS = testresources -testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testresources_LDADD = libkresources.la testresources_SOURCES = testresources.cpp diff --git a/kresources/README.design b/kresources/README.design index 563d0aeed..2a34ca8b2 100644 --- a/kresources/README.design +++ b/kresources/README.design @@ -88,7 +88,7 @@ iterate over all available resources to harvest all events. EXAMPLES -------- -For examples, check the following files in kdepim/libkcal: +For examples, check the following files in tdepim/libkcal: - resourcecalendar.{h,cpp} Defines the base class of the calendar resource family - kcmcalendars.{h,cpp} @@ -112,7 +112,7 @@ with libkcal: The "exchange" calendar resource is compiled in a separate library, dynamically loaded by the resource manager if resources of this type are used. This resource is in -kdepim/kresources/exchange: +tdepim/kresources/exchange: - resourceexchange.{h,cpp} Defines the exchange resource - resourceexchangeconfig.{h,cpp} diff --git a/krsync/CMakeLists.txt b/krsync/CMakeLists.txt index 1552e2a1e..365429946 100644 --- a/krsync/CMakeLists.txt +++ b/krsync/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) @@ -45,6 +45,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.1 - LINK kdeui-shared kio-shared + LINK tdeui-shared kio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kspell2/CMakeLists.txt b/kspell2/CMakeLists.txt index e854b7634..a6acda11f 100644 --- a/kspell2/CMakeLists.txt +++ b/kspell2/CMakeLists.txt @@ -16,10 +16,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio diff --git a/kspell2/plugins/aspell/CMakeLists.txt b/kspell2/plugins/aspell/CMakeLists.txt index 94928963c..6d1e1ac9b 100644 --- a/kspell2/plugins/aspell/CMakeLists.txt +++ b/kspell2/plugins/aspell/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kspell2 - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${ASPELL_INCLUDE_DIRS} ) diff --git a/kspell2/plugins/hspell/CMakeLists.txt b/kspell2/plugins/hspell/CMakeLists.txt index 0fd8d0fa5..188e92c84 100644 --- a/kspell2/plugins/hspell/CMakeLists.txt +++ b/kspell2/plugins/hspell/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kspell2 - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${HSPELL_INCLUDE_DIRS} ) diff --git a/kspell2/plugins/ispell/CMakeLists.txt b/kspell2/plugins/ispell/CMakeLists.txt index 0cd7d74a0..f3179ed8a 100644 --- a/kspell2/plugins/ispell/CMakeLists.txt +++ b/kspell2/plugins/ispell/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kspell2 - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( diff --git a/kspell2/ui/CMakeLists.txt b/kspell2/ui/CMakeLists.txt index 2a7718c7d..65ea158ba 100644 --- a/kspell2/ui/CMakeLists.txt +++ b/kspell2/ui/CMakeLists.txt @@ -17,10 +17,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kspell2 - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( diff --git a/kstyles/asteroid/CMakeLists.txt b/kstyles/asteroid/CMakeLists.txt index 264a16085..d198efdef 100644 --- a/kstyles/asteroid/CMakeLists.txt +++ b/kstyles/asteroid/CMakeLists.txt @@ -16,9 +16,9 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -41,6 +41,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK tdefx-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/asteroid/Makefile.am b/kstyles/asteroid/Makefile.am index 3011909e3..2b8735e08 100644 --- a/kstyles/asteroid/Makefile.am +++ b/kstyles/asteroid/Makefile.am @@ -11,7 +11,7 @@ noinst_HEADERS = asteroid.h kde_style_LTLIBRARIES = asteroid.la asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -asteroid_la_LIBADD = -lkdefx -lkutils +asteroid_la_LIBADD = -ltdefx -lkutils asteroid_la_SOURCES = asteroid.cpp themercdir = $(kde_datadir)/kstyle/themes diff --git a/kstyles/highcolor/CMakeLists.txt b/kstyles/highcolor/CMakeLists.txt index fb923ce51..8b601d6ac 100644 --- a/kstyles/highcolor/CMakeLists.txt +++ b/kstyles/highcolor/CMakeLists.txt @@ -16,9 +16,9 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK tdefx-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/highcolor/Makefile.am b/kstyles/highcolor/Makefile.am index 635a37353..5b2880215 100644 --- a/kstyles/highcolor/Makefile.am +++ b/kstyles/highcolor/Makefile.am @@ -20,10 +20,10 @@ AM_CPPFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefx $(all_includes) noinst_HEADERS = highcolor.h bitmaps.h kde_style_LTLIBRARIES = highcolor.la highcolor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -highcolor_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT) +highcolor_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT) highcolor_la_SOURCES = highcolor.cpp highcolor_la_METASOURCES = AUTO diff --git a/kstyles/highcontrast/CMakeLists.txt b/kstyles/highcontrast/CMakeLists.txt index d3dc224bb..ec948a719 100644 --- a/kstyles/highcontrast/CMakeLists.txt +++ b/kstyles/highcontrast/CMakeLists.txt @@ -19,9 +19,9 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -44,6 +44,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK tdefx-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/highcontrast/Makefile.am b/kstyles/highcontrast/Makefile.am index 9a6f38cd7..dade3965a 100644 --- a/kstyles/highcontrast/Makefile.am +++ b/kstyles/highcontrast/Makefile.am @@ -35,7 +35,7 @@ noinst_HEADERS = highcontrast.h kde_style_LTLIBRARIES = highcontrast.la highcontrast_la_SOURCES = highcontrast.cpp highcontrast_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -highcontrast_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT) +highcontrast_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT) highcontrast_la_METASOURCES = AUTO DISTCLEANFILES = $(highcontrast_la_METASOURCES) diff --git a/kstyles/highcontrast/config/CMakeLists.txt b/kstyles/highcontrast/config/CMakeLists.txt index cd575ff3e..07b378372 100644 --- a/kstyles/highcontrast/config/CMakeLists.txt +++ b/kstyles/highcontrast/config/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -32,6 +32,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kstyles/keramik/CMakeLists.txt b/kstyles/keramik/CMakeLists.txt index 5862a8653..8ee7c9730 100644 --- a/kstyles/keramik/CMakeLists.txt +++ b/kstyles/keramik/CMakeLists.txt @@ -19,9 +19,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK tdefx-shared ) @@ -65,6 +65,6 @@ set_source_files_properties( pixmaploader.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_ tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared Xext + LINK tdefx-shared Xext DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am index 5931485be..87e68132b 100644 --- a/kstyles/keramik/Makefile.am +++ b/kstyles/keramik/Makefile.am @@ -1,12 +1,12 @@ AM_CPPFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefx $(all_includes) # qembed's output needs that... KDE_CXXFLAGS = -UQT_NO_ASCII_CAST noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h kde_style_LTLIBRARIES = keramik.la keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -keramik_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT) $(LIB_XEXT) +keramik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT) $(LIB_XEXT) keramik_la_SOURCES = keramik.cpp pixmaploader.cpp gradients.cpp colorutil.cpp keramik_la_COMPILE_FIRST = keramikrc.h keramik_la_METASOURCES = AUTO @@ -14,8 +14,8 @@ keramik_la_METASOURCES = AUTO noinst_PROGRAMS = genembed genembed_SOURCES = genembed.cpp -genembed_LDADD = ../../kdefx/libtdefx.la -genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +genembed_LDADD = ../../tdefx/libtdefx.la +genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\ pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\ diff --git a/kstyles/kthemestyle/CMakeLists.txt b/kstyles/kthemestyle/CMakeLists.txt index 45bdb0b68..ee6995f2d 100644 --- a/kstyles/kthemestyle/CMakeLists.txt +++ b/kstyles/kthemestyle/CMakeLists.txt @@ -16,9 +16,9 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared kdecore-shared dl + LINK tdefx-shared tdecore-shared dl DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/kthemestyle/Makefile.am b/kstyles/kthemestyle/Makefile.am index b2c3be33f..407ac1b2a 100644 --- a/kstyles/kthemestyle/Makefile.am +++ b/kstyles/kthemestyle/Makefile.am @@ -20,10 +20,10 @@ AM_CPPFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefx $(all_includes) noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h kde_style_LTLIBRARIES = kthemestyle.la kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kthemestyle_la_LIBADD = ../../kdefx/libtdefx.la ../../kdecore/libtdecore.la -ldl $(LIB_QT) +kthemestyle_la_LIBADD = ../../tdefx/libtdefx.la ../../tdecore/libtdecore.la -ldl $(LIB_QT) kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp kthemestyle_la_METASOURCES = AUTO diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index ffd2ffda8..d986b0147 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -115,7 +115,7 @@ public: { #ifdef __GLIBC__ dlopen("kthemestyle.so",RTLD_LAZY); - //####### Keep reference count up so kdecore w. fast-malloc doesn't get unloaded + //####### Keep reference count up so tdecore w. fast-malloc doesn't get unloaded //####### (Fixes exit crashes with qt-only apps that occur on Linux) //####### This should be rethought after 3.0, //####### as it relies on the implementation-specific behavior diff --git a/kstyles/light/CMakeLists.txt b/kstyles/light/CMakeLists.txt index 7a0ee6610..af512b94f 100644 --- a/kstyles/light/CMakeLists.txt +++ b/kstyles/light/CMakeLists.txt @@ -16,9 +16,9 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK tdefx-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/light/Makefile.am b/kstyles/light/Makefile.am index 8e2ebf301..8233d22df 100644 --- a/kstyles/light/Makefile.am +++ b/kstyles/light/Makefile.am @@ -20,10 +20,10 @@ AM_CPPFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefx $(all_includes) noinst_HEADERS = lightstyle-v2.h lightstyle-v3.h kde_style_LTLIBRARIES = light.la light_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -light_la_LIBADD = $(LIB_QT) ../../kdefx/libtdefx.la +light_la_LIBADD = $(LIB_QT) ../../tdefx/libtdefx.la light_la_SOURCES = light.cpp lightstyle-v2.cpp lightstyle-v3.cpp light_la_METASOURCES = AUTO diff --git a/kstyles/plastik/CMakeLists.txt b/kstyles/plastik/CMakeLists.txt index a57af7c1f..9459f3615 100644 --- a/kstyles/plastik/CMakeLists.txt +++ b/kstyles/plastik/CMakeLists.txt @@ -18,9 +18,9 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -43,6 +43,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK tdefx-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/plastik/Makefile.am b/kstyles/plastik/Makefile.am index 477e7f68c..70d6377e2 100644 --- a/kstyles/plastik/Makefile.am +++ b/kstyles/plastik/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = plastik.h misc.h kde_style_LTLIBRARIES = plastik.la plastik_la_SOURCES = plastik.cpp misc.cpp plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -plastik_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT) +plastik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT) plastik_la_METASOURCES = AUTO DISTCLEANFILES = $(plastik_la_METASOURCES) diff --git a/kstyles/plastik/config/CMakeLists.txt b/kstyles/plastik/config/CMakeLists.txt index 13eb35234..b8534cea7 100644 --- a/kstyles/plastik/config/CMakeLists.txt +++ b/kstyles/plastik/config/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -32,6 +32,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kstyles/utils/installtheme/CMakeLists.txt b/kstyles/utils/installtheme/CMakeLists.txt index 8becda904..da9b81b9a 100644 --- a/kstyles/utils/installtheme/CMakeLists.txt +++ b/kstyles/utils/installtheme/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -29,6 +29,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am index 52073666f..f2f88dbbc 100644 --- a/kstyles/utils/installtheme/Makefile.am +++ b/kstyles/utils/installtheme/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = kinstalltheme kinstalltheme_SOURCES = main.cpp # the library search path. -kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kunittest/CMakeLists.txt b/kunittest/CMakeLists.txt index a2ee3fcab..74ab23e13 100644 --- a/kunittest/CMakeLists.txt +++ b/kunittest/CMakeLists.txt @@ -12,8 +12,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -38,7 +38,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am index c4e89049a..e8702425c 100644 --- a/kunittest/Makefile.am +++ b/kunittest/Makefile.am @@ -10,7 +10,7 @@ libkunittestinclude_HEADERS = runner.h tester.h module.h libkunittestincludedir = $(includedir)/kunittest bin_PROGRAMS = kunittestmodrunner -kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kunittestmodrunner_LDADD = libkunittest.la $(LIB_KDECORE) kunittestmodrunner_SOURCES = modrunner.cpp diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt index f0c2c135e..a033088cd 100644 --- a/kutils/CMakeLists.txt +++ b/kutils/CMakeLists.txt @@ -14,11 +14,11 @@ add_subdirectory( ksettings ) include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor diff --git a/kutils/Mainpage.dox b/kutils/Mainpage.dox index f649fcc3d..935908d1d 100644 --- a/kutils/Mainpage.dox +++ b/kutils/Mainpage.dox @@ -19,6 +19,6 @@ Matthias Hoelzer-Kluepfel \<hoelzer@kde.org\> */ -// DOXYGEN_REFERENCES = kdecore kdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui kio // DOXYGEN_SET_PROJECT_NAME = KUtils // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kutils/Makefile.am b/kutils/Makefile.am index 4ddda0d83..5377b6cf5 100644 --- a/kutils/Makefile.am +++ b/kutils/Makefile.am @@ -25,7 +25,7 @@ kde_servicetypes_DATA = kplugininfo.desktop METASOURCES = AUTO -DOXYGEN_REFERENCES = kdecore kdeui kio +DOXYGEN_REFERENCES = tdecore tdeui kio include ../admin/Doxyfile.am # vim: et diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 9ce81f700..8a7a3eff3 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -125,14 +125,14 @@ class KCModuleProxy::KCModuleProxyPrivate - Two Layout problems in runAsRoot: * lblBusy doesn't show * d->kcm/d->rootInfo doesn't get it right when the user - presses cancel in the kdesu dialog + presses cancel in the tdesu dialog - Resizing horizontally is contrained; minimum size is set somewhere. It appears to be somehow derived from the module's size. - Prettify: set icon in KCMultiDialog. - - Perhaps it's possible to link against kdesu such that + - Perhaps it's possible to link against tdesu such that the dialog is in process? */ @@ -341,11 +341,11 @@ void KCModuleProxy::runAsRoot() /* Prepare the process to run the kcmshell */ TQString cmd = moduleInfo().service()->exec().stripWhiteSpace(); - if (cmd.left(5) == "kdesu") + if (cmd.left(5) == "tdesu") { cmd = TQString(cmd.remove(0,5)).stripWhiteSpace(); - /* Remove all kdesu switches */ + /* Remove all tdesu switches */ while( cmd.length() > 1 && cmd[ 0 ] == '-' ) cmd = TQString(cmd.remove( 0, cmd.find( ' ' ) )).stripWhiteSpace(); } @@ -354,13 +354,13 @@ void KCModuleProxy::runAsRoot() cmd = TQString(cmd.remove(0,8)).stripWhiteSpace(); /* Run the process */ - TQString kdesu = KStandardDirs::findExe("kdesu"); - if (!kdesu.isEmpty()) + TQString tdesu = KStandardDirs::findExe("tdesu"); + if (!tdesu.isEmpty()) { d->rootProcess = new KProcess; - *d->rootProcess << kdesu; + *d->rootProcess << tdesu; *d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon()); *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell")) diff --git a/kutils/ksettings/CMakeLists.txt b/kutils/ksettings/CMakeLists.txt index 1047d6f0e..3e4744bd8 100644 --- a/kutils/ksettings/CMakeLists.txt +++ b/kutils/ksettings/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kutils - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kwallet/backend/CMakeLists.txt b/kwallet/backend/CMakeLists.txt index 8801971da..d8888afce 100644 --- a/kwallet/backend/CMakeLists.txt +++ b/kwallet/backend/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kwallet/client ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kwallet/backend/Makefile.am b/kwallet/backend/Makefile.am index fde36c41d..f07c72df9 100644 --- a/kwallet/backend/Makefile.am +++ b/kwallet/backend/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(srcdir)/../client $(all_includes) lib_LTLIBRARIES = libkwalletbackend.la libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined -libkwalletbackend_la_LIBADD = $(LIB_QT) ../../kdecore/libtdecore.la +libkwalletbackend_la_LIBADD = $(LIB_QT) ../../tdecore/libtdecore.la libkwalletbackend_la_SOURCES = blockcipher.cc \ blowfish.cc \ cbc.cc \ diff --git a/kwallet/client/CMakeLists.txt b/kwallet/client/CMakeLists.txt index 620f52a0b..13056ccc2 100644 --- a/kwallet/client/CMakeLists.txt +++ b/kwallet/client/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -40,7 +40,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.1 - LINK kdecore-shared + LINK tdecore-shared DEPENDENCIES dcopidl DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkmid/CMakeLists.txt b/libkmid/CMakeLists.txt index 801109bf9..d0bc35d84 100644 --- a/libkmid/CMakeLists.txt +++ b/libkmid/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -46,6 +46,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 0.0.95 - LINK kdecore-shared ${ALSA_LIBRARIES} + LINK tdecore-shared ${ALSA_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkmid/Makefile.am b/libkmid/Makefile.am index 4e5a72a2e..507b7381e 100644 --- a/libkmid/Makefile.am +++ b/libkmid/Makefile.am @@ -18,7 +18,7 @@ libkmid_la_SOURCES = midiout.cc player.cc track.cc midimapper.cc \ libkmid.cc libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined -libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libtdecore.la $(LIB_QT) +libkmid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) -DOXYGEN_REFERENCES = kdecore +DOXYGEN_REFERENCES = tdecore include ../admin/Doxyfile.am diff --git a/libkscreensaver/CMakeLists.txt b/libkscreensaver/CMakeLists.txt index cb3a8357d..472f8a834 100644 --- a/libkscreensaver/CMakeLists.txt +++ b/libkscreensaver/CMakeLists.txt @@ -13,8 +13,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) list( REMOVE_ITEM CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) @@ -42,6 +42,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/networkstatus/CMakeLists.txt b/networkstatus/CMakeLists.txt index b784580f5..ede3e2b07 100644 --- a/networkstatus/CMakeLists.txt +++ b/networkstatus/CMakeLists.txt @@ -13,10 +13,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kded ) @@ -46,7 +46,7 @@ set( target networkstatus ) tde_add_library( ${target} SHARED AUTOMOC SOURCES networkstatuscommon.cpp VERSION 0.0.0 - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -80,7 +80,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared networkstatus-shared + LINK tdeinit_kded-shared networkstatus-shared DESTINATION ${PLUGIN_INSTALL_DIR} DEPENDENCIES dcopidl ) diff --git a/networkstatus/clientiface.h b/networkstatus/clientiface.h index 9fcef57a3..b4aa691d5 100644 --- a/networkstatus/clientiface.h +++ b/networkstatus/clientiface.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/clientifaceimpl.cpp b/networkstatus/clientifaceimpl.cpp index f20957e73..eb40a39be 100644 --- a/networkstatus/clientifaceimpl.cpp +++ b/networkstatus/clientifaceimpl.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/clientifaceimpl.h b/networkstatus/clientifaceimpl.h index bdc99a19f..039896935 100644 --- a/networkstatus/clientifaceimpl.h +++ b/networkstatus/clientifaceimpl.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp index 1998bf4ed..7b95e8101 100644 --- a/networkstatus/connectionmanager.cpp +++ b/networkstatus/connectionmanager.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/network.cpp b/networkstatus/network.cpp index fcb4a6f51..d909220e2 100644 --- a/networkstatus/network.cpp +++ b/networkstatus/network.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/network.h b/networkstatus/network.h index dcd2cd339..6eeffe3aa 100644 --- a/networkstatus/network.h +++ b/networkstatus/network.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp index 21e34d978..1031faf7b 100644 --- a/networkstatus/networkstatus.cpp +++ b/networkstatus/networkstatus.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/networkstatus.h b/networkstatus/networkstatus.h index 710afd79a..4ff615ef8 100644 --- a/networkstatus/networkstatus.h +++ b/networkstatus/networkstatus.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/networkstatuscommon.cpp b/networkstatus/networkstatuscommon.cpp index 574862929..409a9e4f2 100644 --- a/networkstatus/networkstatuscommon.cpp +++ b/networkstatus/networkstatuscommon.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/networkstatuscommon.h b/networkstatus/networkstatuscommon.h index 63c388c3f..c7f35c1bb 100644 --- a/networkstatus/networkstatuscommon.h +++ b/networkstatus/networkstatuscommon.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/networkstatusiface.h b/networkstatus/networkstatusiface.h index c35a22db5..83485b83a 100644 --- a/networkstatus/networkstatusiface.h +++ b/networkstatus/networkstatusiface.h @@ -1,4 +1,4 @@ -/* This file is part of kdepim. +/* This file is part of tdepim. Copyright (C) 2005,2007 Will Stephenson <wstephenson@kde.org> This library is free software; you can redistribute it and/or diff --git a/networkstatus/provideriface.h b/networkstatus/provideriface.h index 93f23103d..2a255aabe 100644 --- a/networkstatus/provideriface.h +++ b/networkstatus/provideriface.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/serviceiface.h b/networkstatus/serviceiface.h index 1e6b423ff..efa936b1b 100644 --- a/networkstatus/serviceiface.h +++ b/networkstatus/serviceiface.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/serviceifaceimpl.cpp b/networkstatus/serviceifaceimpl.cpp index cf5c0df99..0710d9564 100644 --- a/networkstatus/serviceifaceimpl.cpp +++ b/networkstatus/serviceifaceimpl.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/serviceifaceimpl.h b/networkstatus/serviceifaceimpl.h index 6ffba3609..049662335 100644 --- a/networkstatus/serviceifaceimpl.h +++ b/networkstatus/serviceifaceimpl.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp index 46b19109f..44211c696 100644 --- a/networkstatus/testservice.cpp +++ b/networkstatus/testservice.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/networkstatus/testservice.h b/networkstatus/testservice.h index 65febdca9..9a7ef127d 100644 --- a/networkstatus/testservice.h +++ b/networkstatus/testservice.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <lists@stevello.free-online.co.uk> diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index bb0747d1b..3fc3a8474 100644 --- a/pics/CMakeLists.txt +++ b/pics/CMakeLists.txt @@ -20,10 +20,10 @@ if( WITH_LIBART ) include_directories( ${TQT_INCLUDE_DIRS} ${LIBART_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/svgicons + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/svgicons ) link_directories( @@ -46,7 +46,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdesvgicons-static kdecore-shared + LINK kdesvgicons-static tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/pics/Makefile.am b/pics/Makefile.am index 3a7e3d990..db7b3e33b 100644 --- a/pics/Makefile.am +++ b/pics/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . hicolor crystalsvg emoticons -INCLUDES = $(LIBART_CFLAGS) -I$(top_srcdir)/kdecore/svgicons -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = $(LIBART_CFLAGS) -I$(top_srcdir)/tdecore/svgicons -I$(top_srcdir)/tdefx $(all_includes) if include_SVGICONS KSVGTOPNG=ksvgtopng @@ -9,8 +9,8 @@ endif bin_PROGRAMS = $(KSVGTOPNG) ksvgtopng_SOURCES = ksvgtopng.cpp -ksvgtopng_LDADD = $(LIB_KDECORE) $(top_builddir)/kdecore/svgicons/libkdesvgicons.la -ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksvgtopng_LDADD = $(LIB_KDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la +ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor install-data-local: -rm -f $(DESTDIR)$(kde_icondir)/default.kde diff --git a/win/common.pro b/win/common.pro index 2e7837a82..a27fe889e 100644 --- a/win/common.pro +++ b/win/common.pro @@ -81,14 +81,14 @@ contains( TEMPLATE, app ) { # !contains(CONFIG,debug) { # DESTDIR = $$KDEBINDESTDIR\release-bin # } - !contains(CONFIG,nokdecore) { - LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX + !contains(CONFIG,notdecore) { + LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX } - !contains(CONFIG,nokdeui) { - LIBS += $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX + !contains(CONFIG,notdeui) { + LIBS += $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX } - !contains(CONFIG,nokdefx) { - LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX + !contains(CONFIG,notdefx) { + LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX } } # default template is "lib" diff --git a/win/dirent.h b/win/dirent.h index 2a4edf4c8..19af3be3c 100644 --- a/win/dirent.h +++ b/win/dirent.h @@ -22,7 +22,7 @@ #ifndef _SYS_DIRENT_H #define _SYS_DIRENT_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #include <sys/types.h> #include <io.h> diff --git a/win/fcntl.h b/win/fcntl.h index ba098c3ab..4c495863a 100644 --- a/win/fcntl.h +++ b/win/fcntl.h @@ -20,7 +20,7 @@ #ifndef _FCNTL_H #define _FCNTL_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #ifdef __cplusplus extern "C" { diff --git a/win/kde_file_win.h b/win/kde_file_win.h index ada37eec8..1c9e22304 100644 --- a/win/kde_file_win.h +++ b/win/kde_file_win.h @@ -27,7 +27,7 @@ #include <fcntl.h> #include <ctype.h> -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #ifdef __cplusplus extern "C" { diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro index 4df64db5b..cb732b012 100644 --- a/win/pro_files/dcop/client/client.pro +++ b/win/pro_files/dcop/client/client.pro @@ -13,6 +13,6 @@ TARGET = dcopclient #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES = dcopclient.c diff --git a/win/pro_files/dcop/client/dcop/dcop.pro b/win/pro_files/dcop/client/dcop/dcop.pro index 99911eedb..946a128c4 100644 --- a/win/pro_files/dcop/client/dcop/dcop.pro +++ b/win/pro_files/dcop/client/dcop/dcop.pro @@ -13,6 +13,6 @@ TARGET = dcop #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../dcop.cpp diff --git a/win/pro_files/dcop/client/dcopfind/dcopfind.pro b/win/pro_files/dcop/client/dcopfind/dcopfind.pro index 315dcf5a2..6c643bb14 100644 --- a/win/pro_files/dcop/client/dcopfind/dcopfind.pro +++ b/win/pro_files/dcop/client/dcopfind/dcopfind.pro @@ -13,6 +13,6 @@ TARGET = dcopfind #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../dcopfind.cpp diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro index 13370884c..65ba00a9d 100644 --- a/win/pro_files/dcop/client/dcopref/dcopref.pro +++ b/win/pro_files/dcop/client/dcopref/dcopref.pro @@ -13,6 +13,6 @@ TARGET = dcopref #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../dcopref.c diff --git a/win/pro_files/dcop/dcopidl/dcopidl.pro b/win/pro_files/dcop/dcopidl/dcopidl.pro index 017bfa5c8..2febfaa2c 100644 --- a/win/pro_files/dcop/dcopidl/dcopidl.pro +++ b/win/pro_files/dcop/dcopidl/dcopidl.pro @@ -6,8 +6,8 @@ include( $(KDELIBS)/win/common.pro ) LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX -LIBS -= $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX +LIBS -= $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX TARGET = dcopidl diff --git a/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro b/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro index af8cef771..1794fa5c6 100644 --- a/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro +++ b/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro @@ -2,8 +2,8 @@ TEMPLATE = app include( $(KDELIBS)/win/common.pro ) -LIBS -= $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX +LIBS -= $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX TARGET = dcopidl2cpp diff --git a/win/pro_files/dcop/dcopserver/dcopserver.pro b/win/pro_files/dcop/dcopserver/dcopserver.pro index 46c7b31e9..bba419cdf 100644 --- a/win/pro_files/dcop/dcopserver/dcopserver.pro +++ b/win/pro_files/dcop/dcopserver/dcopserver.pro @@ -2,7 +2,7 @@ TEMPLATE = app # needed to export library classes: -CONFIG += nokdecore nokdefx nokdeui +CONFIG += notdecore notdefx notdeui include( $(KDELIBS)/win/common.pro ) DEFINES += MAKE_DCOP_LIB diff --git a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro index c08d3c192..98b6893f4 100644 --- a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro +++ b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += nokdecore nokdefx nokdeui +CONFIG += notdecore notdefx notdeui include( $(KDELIBS)/win/common.pro ) # needed to export library classes: diff --git a/win/pro_files/dcop/iceauth/iceauth.pro b/win/pro_files/dcop/iceauth/iceauth.pro index b5c2bdf3b..6b243ba5e 100644 --- a/win/pro_files/dcop/iceauth/iceauth.pro +++ b/win/pro_files/dcop/iceauth/iceauth.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += nokdecore nokdefx nokdeui +CONFIG += notdecore notdefx notdeui include( $(KDELIBS)/win/common.pro ) # needed to export library classes: diff --git a/win/pro_files/dcop/testdcop/testdcop.pro b/win/pro_files/dcop/testdcop/testdcop.pro index 9876e2815..9e190c396 100644 --- a/win/pro_files/dcop/testdcop/testdcop.pro +++ b/win/pro_files/dcop/testdcop/testdcop.pro @@ -9,6 +9,6 @@ system( bash kmoc .. ) INCLUDEPATH += ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES = ../testdcop.cpp diff --git a/win/pro_files/dcop/tests/dcop_test.pro b/win/pro_files/dcop/tests/dcop_test.pro index 4b390dd1d..1fe241467 100644 --- a/win/pro_files/dcop/tests/dcop_test.pro +++ b/win/pro_files/dcop/tests/dcop_test.pro @@ -10,6 +10,6 @@ system( bash kdcopidl ) INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += test.cpp test_skel.cpp test_stub.cpp diff --git a/win/pro_files/dcop/tests/driver.pro b/win/pro_files/dcop/tests/driver.pro index 215a8596e..f7d5e5e3a 100644 --- a/win/pro_files/dcop/tests/driver.pro +++ b/win/pro_files/dcop/tests/driver.pro @@ -10,6 +10,6 @@ system( bash kdcopidl ) INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += driver.cpp test_stub.cpp diff --git a/win/pro_files/dcop/tests/tests.pro b/win/pro_files/dcop/tests/tests.pro index fd5d7cab5..ad27c8471 100644 --- a/win/pro_files/dcop/tests/tests.pro +++ b/win/pro_files/dcop/tests/tests.pro @@ -11,7 +11,7 @@ system( bash kmoc .. ) INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../testdcop.cpp diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro index 45678e6ff..192530e70 100644 --- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro +++ b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro @@ -3,8 +3,8 @@ DEFINES += MAKE_KTEXTEDITOR_LIB include( $(KDELIBS)/win/common.pro ) -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro index d7826b319..95f08b747 100644 --- a/win/pro_files/kabc/kabc.pro +++ b/win/pro_files/kabc/kabc.pro @@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KABC_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kresources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro index 7ccf215bc..8dedc015e 100644 --- a/win/pro_files/kabc/vcard/vcard.pro +++ b/win/pro_files/kabc/vcard/vcard.pro @@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KVCARD_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \ $(KDELIBS)/kabc/vcardparser diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro index e327fed37..22a1527fe 100644 --- a/win/pro_files/kate/interfaces/interfaces.pro +++ b/win/pro_files/kate/interfaces/interfaces.pro @@ -7,7 +7,7 @@ DEFINES += MAKE_KATEPARTINTERFACES_LIB TARGET = katepartinterfaces$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro index 46edc6508..69bfed0be 100644 --- a/win/pro_files/kate/part/part.pro +++ b/win/pro_files/kate/part/part.pro @@ -9,13 +9,13 @@ DEFINES += MAKE_KATEPART_LIB TARGET = katepart$$KDELIBDEBUG LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \ - $(KDELIBS)/kutils $(KDELIBS)/kdeprint + $(KDELIBS)/kutils $(KDELIBS)/tdeprint system( bash kmoc ) system( bash kdcopidl ) diff --git a/win/pro_files/kdecore/kdecore.pro b/win/pro_files/kdecore/kdecore.pro index 183835a43..c4579a5cf 100644 --- a/win/pro_files/kdecore/kdecore.pro +++ b/win/pro_files/kdecore/kdecore.pro @@ -7,12 +7,12 @@ include( $(KDELIBS)/win/zlib.pro ) # needed to export library classes: DEFINES += MAKE_KDECORE_LIB -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ -lqassistantclient -TARGET = kdecore$$KDEBUG +TARGET = tdecore$$KDEBUG -INCLUDEPATH += $(KDELIBS)/libltdl $(KDELIBS)/kdecore/network +INCLUDEPATH += $(KDELIBS)/libltdl $(KDELIBS)/tdecore/network system( bash kmoc ) system( bash kdcopidl ) @@ -95,7 +95,7 @@ ksockaddr.cpp \ kmdcodec.cpp \ kdcoppropertyproxy.cpp \ klibloader.cpp \ -kprotocolinfo_kdecore.cpp \ +kprotocolinfo_tdecore.cpp \ ../kio/kio/kprotocolinfo.cpp \ kprotocolinfofactory.cpp \ kmountpoint.cpp \ @@ -136,8 +136,8 @@ kdebugdcopiface_stub.cpp \ kdebugdcopiface_skel.cpp -exists( custom_kdecore.pro ) { - include( custom_kdecore.pro ) +exists( custom_tdecore.pro ) { + include( custom_tdecore.pro ) } HEADERS = diff --git a/win/pro_files/kdefx/kdefx.pro b/win/pro_files/kdefx/kdefx.pro index 6c9ba4a22..eab9ea7d9 100644 --- a/win/pro_files/kdefx/kdefx.pro +++ b/win/pro_files/kdefx/kdefx.pro @@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KDEFX_LIB -TARGET = kdefx$$KDEBUG +TARGET = tdefx$$KDEBUG system( bash kmoc ) diff --git a/win/pro_files/kdefx/kdefx_rel.pro b/win/pro_files/kdefx/kdefx_rel.pro index 177836f03..66ae8f1a4 100644 --- a/win/pro_files/kdefx/kdefx_rel.pro +++ b/win/pro_files/kdefx/kdefx_rel.pro @@ -24,4 +24,4 @@ kcpuinfo.cpp HEADERS = -TARGET = kdefx +TARGET = tdefx diff --git a/win/pro_files/kdeprint/kdeprint.pro b/win/pro_files/kdeprint/kdeprint.pro index c541548ae..eb1bfff69 100644 --- a/win/pro_files/kdeprint/kdeprint.pro +++ b/win/pro_files/kdeprint/kdeprint.pro @@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KDEPRINT_LIB -TARGET = kdeprint$$KDEBUG +TARGET = tdeprint$$KDEBUG SOURCES = \ kprinter.cpp \ diff --git a/win/pro_files/kdeui/kdeui.pro b/win/pro_files/kdeui/kdeui.pro index 13404b3a8..20f8c26ee 100644 --- a/win/pro_files/kdeui/kdeui.pro +++ b/win/pro_files/kdeui/kdeui.pro @@ -6,13 +6,13 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KDEUI_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX system( bash kmoc ) system( bash kdcopidl ) -TARGET = kdeui$$KDEBUG +TARGET = tdeui$$KDEBUG SOURCES = \ kaboutapplication.cpp \ diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro index e56eaba06..f3c5cd1f8 100644 --- a/win/pro_files/kdewidgets/kdewidgets.pro +++ b/win/pro_files/kdewidgets/kdewidgets.pro @@ -11,8 +11,8 @@ TARGET = kdewidgets DESTDIR = $$KDELIBDESTDIR/trinity/plugins/designer -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kresources$$KDELIB_SUFFIX diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro index 8bf29bf90..448cec678 100644 --- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro +++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro @@ -11,7 +11,7 @@ kdebase_release:QMAKE_MAKEFILE = Makefile.release TARGET = kfiletreeviewtest -LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro index 9e3144856..a6b567661 100644 --- a/win/pro_files/kio/kio.pro +++ b/win/pro_files/kio/kio.pro @@ -6,14 +6,14 @@ include( $(KDELIBS)/win/zlib.pro ) # needed to export library classes: DEFINES += MAKE_KIO_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX system( bash kmoc kio kfile misc bookmarks kssl ) TARGET = kio$$KDEBUG -INCLUDEPATH += $(KDELIBS)/kdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/bookmarks \ +INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/bookmarks \ $(KDELIBS)/kio/kssl \ $(KDELIBS)/libltdl $(KDELIBS)/interfaces \ $(KDELIBS)/kio/kio/moc $(KDELIBS)/kio/misc/moc $(KDELIBS)/kio/kfile/moc \ @@ -179,7 +179,7 @@ kssl/ksmimecrypto.cc #removed kio/kautomount.cpp \ SOURCES += \ -../kdecore/kprotocolinfo_kdecore.cpp +../tdecore/kprotocolinfo_tdecore.cpp # js 2004-08-05 ^^^^^ a hack because msvc cannot split a class between two libraries! diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/kioslave/common.pro index 35fbaf5d9..e1a63c761 100644 --- a/win/pro_files/kioslave/common.pro +++ b/win/pro_files/kioslave/common.pro @@ -4,5 +4,5 @@ CONFIG += trinitylib #this is a dynamic kde library include( $(KDELIBS)/win/common.pro ) -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro index 1f425b465..2bcc97053 100644 --- a/win/pro_files/kmdi/kmdi.pro +++ b/win/pro_files/kmdi/kmdi.pro @@ -8,10 +8,10 @@ DEFINES += MAKE_KMDI_LIB TARGET = kmdi$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX -INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/kdeui +INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/tdeui system( bash kmoc ) diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/kmdi/test/test.pro index 85216ebb0..d400e29f5 100644 --- a/win/pro_files/kmdi/test/test.pro +++ b/win/pro_files/kmdi/test/test.pro @@ -10,7 +10,7 @@ CONFIG += debug CONFIG += console unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT -unix:LIBS += -lkmdi -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP -lkparts +unix:LIBS += -lkmdi -L$(KDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts unix:INCLUDEPATH += . .. $(KDEDIR)/include LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/kparts/kparts.pro index 19b68a16b..aabdc4d37 100644 --- a/win/pro_files/kparts/kparts.pro +++ b/win/pro_files/kparts/kparts.pro @@ -8,7 +8,7 @@ DEFINES += MAKE_KPARTS_LIB TARGET = kparts$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/kio/kfile diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/kresources/kresources.pro index d729b82ed..a485b2fba 100644 --- a/win/pro_files/kresources/kresources.pro +++ b/win/pro_files/kresources/kresources.pro @@ -8,7 +8,7 @@ DEFINES += MAKE_KRESOURCES_LIB INCLUDEPATH += $(KDELIBS)/ab -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX system( bash kmoc ) diff --git a/win/pro_files/kstyles/common.pro b/win/pro_files/kstyles/common.pro index d76111c37..6cc40111c 100644 --- a/win/pro_files/kstyles/common.pro +++ b/win/pro_files/kstyles/common.pro @@ -8,5 +8,5 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KSTYLE_LIB -LIBS += $$KDELIBDESTDIR\kdefx$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/kstyles/kthemestyle/themestyle.pro index 773030b6b..fa55f19e3 100644 --- a/win/pro_files/kstyles/kthemestyle/themestyle.pro +++ b/win/pro_files/kstyles/kthemestyle/themestyle.pro @@ -1,6 +1,6 @@ include( ../common.pro ) -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX TARGET = kthemestyle$$KDEBUG diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro index 37e637ed7..0424eb476 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro @@ -3,7 +3,7 @@ TEMPLATE = app include( $(KDELIBS)/win/common.pro ) -unix:LIBS += -lkdefx +unix:LIBS += -ltdefx win32 { CONFIG +=console diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro index 66346be7d..549e2344f 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro @@ -1,4 +1,4 @@ -# release version with compiled-in kdefx classes +# release version with compiled-in tdefx classes # this is used eg. for QT-only apps like Installer TEMPLATE = lib @@ -35,15 +35,15 @@ gradients.cpp \ thinkeramik.cpp \ pixmaploader.cpp -#compile in kdefx +#compile in tdefx SOURCES += \ -../../../kdefx/kstyle.cpp \ -../../../kdefx/kimageeffect.cpp \ -../../../kdefx/kpixmapeffect.cpp \ -../../../kdefx/kpixmap.cpp +../../../tdefx/kstyle.cpp \ +../../../tdefx/kimageeffect.cpp \ +../../../tdefx/kpixmapeffect.cpp \ +../../../tdefx/kpixmap.cpp system( moc thinkeramik.h -o moc/thinkeramik.moc ) -system( moc ../../../kdefx/kstyle.h -o moc/kstyle.moc ) +system( moc ../../../tdefx/kstyle.h -o moc/kstyle.moc ) system( bash ./genemb.sh ) diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/kutils/kutils.pro index 5f07d4673..ce4d7fe79 100644 --- a/win/pro_files/kutils/kutils.pro +++ b/win/pro_files/kutils/kutils.pro @@ -8,7 +8,7 @@ DEFINES += MAKE_KUTILS_LIB TARGET = kutils$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor @@ -35,7 +35,7 @@ #ifndef _PWD_H_ -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #include <sys/types.h> diff --git a/win/signal.h b/win/signal.h index 32ca1663b..fc59997f5 100644 --- a/win/signal.h +++ b/win/signal.h @@ -20,7 +20,7 @@ #ifndef SIGNAL_H #define SIGNAL_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #ifdef __cplusplus extern "C" { diff --git a/win/stdlib.h b/win/stdlib.h index 576f72ad4..1f5c01f89 100644 --- a/win/stdlib.h +++ b/win/stdlib.h @@ -21,7 +21,7 @@ * Definitions for common types, variables, and functions. */ -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #ifdef _MSC_VER # include <msvc/stdlib.h> diff --git a/win/string.h b/win/string.h index 47895aa12..14127b6e8 100644 --- a/win/string.h +++ b/win/string.h @@ -20,7 +20,7 @@ #ifndef KDEWIN_STRING_H #define KDEWIN_STRING_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #define strncasecmp strnicmp #define strcasecmp stricmp diff --git a/win/sys/mman.h b/win/sys/mman.h index d28bcba88..6ec8abcbe 100644 --- a/win/sys/mman.h +++ b/win/sys/mman.h @@ -23,7 +23,7 @@ #ifndef _MMAP_H #define _MMAP_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #include <sys/types.h> diff --git a/win/sys/resource.h b/win/sys/resource.h index a505f2838..d49a21f4b 100644 --- a/win/sys/resource.h +++ b/win/sys/resource.h @@ -20,7 +20,7 @@ #ifndef _SYS_RESOURCE_H_ #define _SYS_RESOURCE_H_ -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #include <sys/time.h> #ifdef __cplusplus diff --git a/win/sys/stat.h b/win/sys/stat.h index 2b22558bc..f65a56e0c 100644 --- a/win/sys/stat.h +++ b/win/sys/stat.h @@ -20,7 +20,7 @@ #ifndef _SYS_STAT_H #define _SYS_STAT_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> /* regular sys/stat.h */ #ifdef _MSC_VER diff --git a/win/sys/time.h b/win/sys/time.h index 0f0ca08a6..ebb5144be 100644 --- a/win/sys/time.h +++ b/win/sys/time.h @@ -20,7 +20,7 @@ #ifndef _SYS_TIME_H_ #define _SYS_TIME_H_ -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> //??#if !defined(_INC_TIME) diff --git a/win/sys/times.h b/win/sys/times.h index e555e4888..6ee6d652a 100644 --- a/win/sys/times.h +++ b/win/sys/times.h @@ -20,7 +20,7 @@ #ifndef _SYS_TIMES_H #define _SYS_TIMES_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> //#include <_ansi.h> #include <machine/types.h> diff --git a/win/sys/utsname.h b/win/sys/utsname.h index 1560e0e6b..55f0b3237 100644 --- a/win/sys/utsname.h +++ b/win/sys/utsname.h @@ -20,7 +20,7 @@ #ifndef _SYS_UTSNAME_H #define _SYS_UTSNAME_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #ifdef __cplusplus extern "C" { diff --git a/win/syslog.h b/win/syslog.h index d5d7ea27a..38398fcbf 100644 --- a/win/syslog.h +++ b/win/syslog.h @@ -24,7 +24,7 @@ #ifndef _SYS_LOG_H #define _SYS_LOG_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #define LOG_EMERG 0 #define LOG_ALERT 1 diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg index ca46d6865..9af5cc9b2 100644 --- a/win/tools/build_kdelibs_dbg +++ b/win/tools/build_kdelibs_dbg @@ -42,10 +42,10 @@ dcop/dcopidl2cpp \ dcop/dcopserver \ dcop/dcopserver_shutdown \ dcop/iceauth \ -kdefx \ +tdefx \ $additional \ -kdecore \ -kdeui \ +tdecore \ +tdeui \ kio \ kresources \ kabc/vcard \ diff --git a/win/tools/build_kdelibs_rel b/win/tools/build_kdelibs_rel index 54221f333..f8c9ba410 100644 --- a/win/tools/build_kdelibs_rel +++ b/win/tools/build_kdelibs_rel @@ -42,9 +42,9 @@ dcop/dcopidl2cpp \ dcop/dcopserver \ dcop/dcopserver_shutdown \ dcop/iceauth \ -kdefx \ -kdecore \ -kdeui \ +tdefx \ +tdecore \ +tdeui \ kstyles/thinkeramik/widget-engine \ kio \ kresources \ diff --git a/win/tools/kde_env b/win/tools/kde_env index 5920eae99..287fef1bb 100755 --- a/win/tools/kde_env +++ b/win/tools/kde_env @@ -14,7 +14,7 @@ fi # Generic settings export KDELIBS=$KDEWIN\\kdelibs # KDElibs/win32 source directory -export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\kdecore;$KDELIBS\\kdefx;$KDELIBS\\kdeprint;$KDELIBS\\kdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE" +export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE" # Version information for binaries # We're changing this from time to time diff --git a/win/unistd.h b/win/unistd.h index 21fe8955e..297d69933 100644 --- a/win/unistd.h +++ b/win/unistd.h @@ -20,7 +20,7 @@ #ifndef _KDEWIN_UNISTD_H #define _KDEWIN_UNISTD_H -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #include <io.h> /* access(), etc.*/ #include <process.h> /* getpid(), etc.*/ diff --git a/win/win.pro b/win/win.pro index d61d2c053..94ca2d541 100644 --- a/win/win.pro +++ b/win/win.pro @@ -5,8 +5,8 @@ include( $(KDELIBS)/win/common.pro ) TARGET = kdewin32$$KDEBUG -QMAKE_CXXFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h -QMAKE_CFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h +QMAKE_CXXFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h +QMAKE_CFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h system( moc qeventloopex.h -o moc/qeventloopex.moc ) diff --git a/win/win32_utils.h b/win/win32_utils.h index ca3459427..e42864ccb 100644 --- a/win/win32_utils.h +++ b/win/win32_utils.h @@ -22,7 +22,7 @@ #include <windows.h> -#include <kdecore/kdelibs_export.h> +#include <tdecore/kdelibs_export.h> #ifdef __cplusplus #include <tqstring.h> |