Additional kde to tde renaming

pull/16/head
Timothy Pearson 13 years ago
parent d3b5575f31
commit 0ae5679aa1

@ -412,7 +412,7 @@ if( WITH_SUDO_KDESU_BACKEND )
if( __PATH_SUDO ) if( __PATH_SUDO )
set( DEFAULT_SUPER_USER_COMMAND ${__PATH_SUDO} ) set( DEFAULT_SUPER_USER_COMMAND ${__PATH_SUDO} )
else( __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( __PATH_SUDO )
endif( WITH_SUDO_KDESU_BACKEND ) endif( WITH_SUDO_KDESU_BACKEND )
@ -740,7 +740,7 @@ endif( WITH_HSPELL )
configure_file( config.h.cmake config.h ) configure_file( config.h.cmake config.h )
configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.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( kjs/global.h.in kjs/global.h )
configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h ) configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) 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_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp ) set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc ) 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 ################## ##### global compiler settings ##################
@ -777,11 +777,11 @@ install( FILES
add_subdirectory( dcop ) add_subdirectory( dcop )
add_subdirectory( libltdl ) add_subdirectory( libltdl )
add_subdirectory( kglib ) add_subdirectory( kglib )
add_subdirectory( kdefx ) add_subdirectory( tdefx )
add_subdirectory( kdecore ) add_subdirectory( tdecore )
add_subdirectory( kunittest ) add_subdirectory( kunittest )
add_subdirectory( kdeui ) add_subdirectory( tdeui )
add_subdirectory( kdesu ) add_subdirectory( tdesu )
add_subdirectory( kjs ) add_subdirectory( kjs )
add_subdirectory( kwallet ) add_subdirectory( kwallet )
add_subdirectory( kio ) add_subdirectory( kio )
@ -797,7 +797,7 @@ add_subdirectory( kutils )
add_subdirectory( kspell2 ) add_subdirectory( kspell2 )
add_subdirectory( kmdi ) add_subdirectory( kmdi )
add_subdirectory( kinit ) add_subdirectory( kinit )
add_subdirectory( kdeprint ) add_subdirectory( tdeprint )
add_subdirectory( kab ) add_subdirectory( kab )
add_subdirectory( kresources ) add_subdirectory( kresources )
add_subdirectory( kabc ) 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: you will get an error like:
Making all in management 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]: *** 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]: *** [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]: *** [all-recursive] Error 1
make[1]: Leaving directory /home/gregturp/KDE/kdelibs' make[1]: Leaving directory /home/gregturp/KDE/kdelibs'
make: *** [all-recursive-am] Error 2 make: *** [all-recursive-am] Error 2

@ -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="#launching">Starting other programs</A></LI>
<LI><A HREF="#khtmlw">khtmlw</A></LI> <LI><A HREF="#khtmlw">khtmlw</A></LI>
<LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</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="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI>
<LI><A HREF="#libkfm">libkfm</A></LI> <LI><A HREF="#libkfm">libkfm</A></LI>
<LI><A HREF="#KDialog">KDialog</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 certain option was specified on the command line and your application
now automatically supports --help and --version. It aborts with a now automatically supports --help and --version. It aborts with a
useful error message when the command line contains a syntax error. 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> <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 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 access to a help menu in a class that is not derived from
KMainWindow then allocate an instance of the new class KHelpMenu. 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 &lt;<A HREF="mailto:espen@kde.org">espen@kde.org</A>&gt;<P> Espen Sand &lt;<A HREF="mailto:espen@kde.org">espen@kde.org</A>&gt;<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <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> <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> 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 Much more extensive documentation on the KConfig and friends API can
be found in the kdoc generated documentation from the header files, 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 To use the new iterator, you will probably want to do something like
this:<P> 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>-&gt; "(void) new KRun (url)" (kdelibs/kio/krun.h)</TD></TR> <TR><TD>KFM::exec </TD><TD>-&gt; "(void) new KRun (url)" (kdelibs/kio/krun.h)</TD></TR>
<TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR> <TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR>
or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR> or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
<TR><TD>DlgLocation </TD><TD>-&gt; Use KLineEditDlg (kdeui/klineeditdlg.h) instead</TD></TR> <TR><TD>DlgLocation </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
</TABLE> </TABLE>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

@ -17,8 +17,8 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
<UL> <UL>
<LI><A HREF="#gettingstarted">Getting Started</A></LI> <LI><A HREF="#gettingstarted">Getting Started</A></LI>
<LI><A HREF="#kab">Changes in kab</A></LI> <LI><A HREF="#kab">Changes in kab</A></LI>
<LI><A HREF="#kdecore">Changes in kdecore</A></LI> <LI><A HREF="#tdecore">Changes in tdecore</A></LI>
<LI><A HREF="#kdeui">Changes in kdeui</A></LI> <LI><A HREF="#tdeui">Changes in tdeui</A></LI>
<LI><A HREF="#kio">Changes in kio</A></LI> <LI><A HREF="#kio">Changes in kio</A></LI>
<LI><A HREF="#kparts">Changes in kparts</A></LI> <LI><A HREF="#kparts">Changes in kparts</A></LI>
<LI><A HREF="#kspell">Changes in kspell</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> <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> <H4>KDesktopWidget</H4>
KDesktopWidget is obsolete. Include &lt;tqdesktopwidget.h&gt; and use QDesktopWidget KDesktopWidget is obsolete. Include &lt;tqdesktopwidget.h&gt; 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. The old name will still work unless KDE_NO_COMPAT is defined.
<H4>KPixmapSplitter</H4> <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> <H4>KStringHandler</H4>
The <i>matchFilename( const TQString& filename, const TQString& pattern )</i> method has been 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 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 primitive elements and a simple popupMenu transparency engine. All KStyles can
now style Qt apps like designer and assistant automatically. KStyle is no longer 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 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 kdecore/kdeui. use KDE's styles without having the styles linked to tdecore/tdeui.
<H4>KURL</H4> <H4>KURL</H4>
The <i>filename( bool _ignore_trailing_slash_in_path = true )</i> method has been 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> <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> <H4>KAccelMenu</H4>
This class has been removed, Qt offers the same functionality. 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. KTextEdit instead.
<H4>KImageEffect</H4> <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> <H4>KMessageBox</H4>
KMessageBox now does automatic line-breaking. When using plain-text, you should 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. for more informations on this new extension.
<H4>KPixmapEffect</H4> <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> <H4>KProgress</H4>
KProgress is now based on TQProgressBar. 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> <H4>KThemeBase, KThemeStyle</H4>
KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API 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. as its use is basically limited to KThemeStyle.
<H4>KAction, KToolBar, KToolBarButton and icons</H4> <H4>KAction, KToolBar, KToolBarButton and icons</H4>

@ -8,11 +8,11 @@
* can subscribe or read the mailing lists for any additions and/or * can subscribe or read the mailing lists for any additions and/or
* modifications to the API. * modifications to the API.
* *
* - <a target="_top" href="kdecore/html/index.html"><b>kdecore</b></a> * - <a target="_top" href="tdecore/html/index.html"><b>tdecore</b></a>
* (<a target="_top" href="kdecore/html/classes.html">classes</a>)\n * (<a target="_top" href="tdecore/html/classes.html">classes</a>)\n
* <i>Core Trinity classes that are not related to the user interface.</i> * <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="tdeui/html/index.html"><b>tdeui</b></a>
* (<a target="_top" href="kdeui/html/classes.html">classes</a>)\n * (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n
* <i>Trinity User interface classes such as widgets.</i> * <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/index.html"><b>khtml</b></a>
* (<a target="_top" href="khtml/html/classes.html">classes</a>)\n * (<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/index.html"><b>dcop</b></a>
* (<a target="_top" href="dcop/html/classes.html">classes</a>)\n * (<a target="_top" href="dcop/html/classes.html">classes</a>)\n
* <i>The DCOP communications library.</i> * <i>The DCOP communications library.</i>
* - <a target="_top" href="kdefx/html/index.html"><b>kdefx</b></a> * - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a>
* (<a target="_top" href="kdefx/html/classes.html">classes</a>)\n * (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n
* <i>A library with pixmap effects.</i> * <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/index.html"><b>kmdi</b></a>
* (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n * (<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/index.html"><b>libkmid</b></a>
* (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n * (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n
* <i>Midi library.</i> * <i>Midi library.</i>
* - <a target="_top" href="kdeprint/html/index.html"><b>kdeprint</b></a> * - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
* (<a target="_top" href="kdeprint/html/classes.html">classes</a>)\n * (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
* <i>High level printer control functionality.</i> * <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/index.html"><b>krandr</b></a>
* (<a target="_top" href="krandr/html/classes.html">classes</a>)\n * (<a target="_top" href="krandr/html/classes.html">classes</a>)\n

@ -18,10 +18,10 @@
# Boston, MA 02110-1301, USA. # 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_BEFORE_doc = kdoctools
COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml krandr COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
COMPILE_AFTER_kdeprint = kate khtml COMPILE_AFTER_tdeprint = kate khtml
COMPILE_BEFORE_khtml = kutils COMPILE_BEFORE_khtml = kutils
COMPILE_BEFORE_kabc = kab kresources COMPILE_BEFORE_kabc = kab kresources
COMPILE_BEFORE_kate = interfaces kutils COMPILE_BEFORE_kate = interfaces kutils
@ -53,7 +53,7 @@ messages:
find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\ find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
find $$dirs -maxdepth 1 -name "*.h" -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; \ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
: > kde.pot ;\ : > kde.pot ;\
$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.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 KDEInit Loadable Modules
======================== ========================
Name: <appname>.la Name: <appname>.la
Definition: kdeinit_LTLIBRARIES = <appname>.la Definition: tdeinit_LTLIBRARIES = <appname>.la
LDFLAGS: -module $(KDE_PLUGIN) LDFLAGS: -module $(KDE_PLUGIN)

@ -45,23 +45,23 @@ Here is an alphabetical list:
* kconf_update * kconf_update
Auto-Updater for config files. Auto-Updater for config files.
* kdecore * tdecore
This is the core collection of KDE stuff. Non GUI classes reside here. This is the core collection of KDE stuff. Non GUI classes reside here.
* kded * kded
The KDE daemon checks for newly installed software, update files The KDE daemon checks for newly installed software, update files
or hostname changes and takes according actions. or hostname changes and takes according actions.
* kdefx * tdefx
Library with pixmap effects. Library with pixmap effects.
* kdeprint * tdeprint
The very versatile printing subsystem of KDE. The very versatile printing subsystem of KDE.
* kdesu * tdesu
Library for password entering and handling Library for password entering and handling
* kdeui * tdeui
The main collection of misc. user interface classes (widgets). The main collection of misc. user interface classes (widgets).
KSpell and related classes are a frontend to ispell for use within a KSpell and related classes are a frontend to ispell for use within a
GUI app. 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), - Solve need for casting when using bitfield enums (e.g. KProcess::Communication),
if Simon's solution works. 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, - 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 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 - Get rid of KXMLClient::conserveMemory() and the conserveMemory argument in createGUI. It created
too many problems in the past. Not worth the trouble. 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) and KProtocolInfo in kio (with the methods taking a KURL, which need KProtocolManager)
- Rename KDirNotify_stub and update API (no need for '*' arguments anymore) - 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 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. 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 - 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 have all of its jobs associated in some way (a unique key of sorts). Will

@ -4,6 +4,6 @@ else
SUBDIRS = knotify SUBDIRS = knotify
endif endif
DOXYGEN_REFERENCES = kio kdecore kdeui DOXYGEN_REFERENCES = kio tdecore tdeui
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -15,9 +15,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
) )

@ -77,7 +77,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
X11CommConfig.sync(); X11CommConfig.sync();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data(); proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
if(rt) if(rt)
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data(); 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. // We could have a race-condition here.
// The correct way to do it is to make artsd fork-and-exit // The correct way to do it is to make artsd fork-and-exit
// after starting to listen to connections (and running artsd // 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. // than nothing.
int time = 0; int time = 0;
do do

@ -3,7 +3,7 @@ INCLUDES= -I$(includedir)/arts -I$(top_srcdir)/arts/kde $(all_includes)
bin_PROGRAMS= bin_PROGRAMS=
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kmcop.la tdeinit_LTLIBRARIES = kmcop.la
kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel
kmcop_la_LIBADD = ../libartskde.la kmcop_la_LIBADD = ../libartskde.la

@ -14,11 +14,11 @@ include_directories(
${ARTS_INCLUDE_DIRS} ${ARTS_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/arts/kde ${CMAKE_SOURCE_DIR}/arts/kde
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
) )
link_directories( link_directories(
@ -43,7 +43,7 @@ set( ${target}_SRCS
if( ARTS_FOUND ) if( ARTS_FOUND )
set( LIBS artskde-shared ) set( LIBS artskde-shared )
else( ARTS_FOUND ) else( ARTS_FOUND )
set( LIBS kdeui-shared ) set( LIBS tdeui-shared )
endif( ARTS_FOUND ) endif( ARTS_FOUND )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC

@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
check_PROGRAMS = knotifytest check_PROGRAMS = knotifytest
knotifytest_SOURCES = knotifytest.cpp knotifytest_SOURCES = knotifytest.cpp
knotifytest_LDADD = $(LIB_KDECORE) 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 noinst_HEADERS = knotify.h

@ -11,9 +11,9 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
) )
link_directories( link_directories(
@ -31,6 +31,6 @@ set( ${target}_SRCS
tde_add_executable( ${target} tde_add_executable( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -4,5 +4,5 @@ bin_PROGRAMS = artsmessage
artsmessage_SOURCES = artsmessage.cc artsmessage_SOURCES = artsmessage.cc
artsmessage_LDADD = ../../kdeui/libtdeui.la artsmessage_LDADD = ../../tdeui/libtdeui.la
artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS) artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS)

@ -692,10 +692,10 @@
/* Enable prevention against poor Linux OOM-killer */ /* Enable prevention against poor Linux OOM-killer */
#cmakedefine KDEINIT_OOM_PROTECT 1 #cmakedefine KDEINIT_OOM_PROTECT 1
/* Use FontConfig in kdeinit */ /* Use FontConfig in tdeinit */
#cmakedefine KDEINIT_USE_FONTCONFIG 1 #cmakedefine KDEINIT_USE_FONTCONFIG 1
/* Use Xft preinitialization in kdeinit */ /* Use Xft preinitialization in tdeinit */
#cmakedefine KDEINIT_USE_XFT 1 #cmakedefine KDEINIT_USE_XFT 1
/* Suffix for lib directories */ /* Suffix for lib directories */

@ -52,7 +52,7 @@ if test -z "$LIBXML_CFLAGS"; then
echo "so if you want helpfiles you should consider installing it." 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 "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform." 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 "" echo ""
all_tests=bad all_tests=bad
fi fi
@ -64,7 +64,7 @@ if test -z "$LIBXSLT_CFLAGS"; then
echo "so if you want helpfiles you should consider installing it." 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 "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform." 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 "" echo ""
all_tests=bad all_tests=bad
fi fi

@ -250,13 +250,13 @@ AC_SUBST(LIBICE)
AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la') AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la') AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
AC_SUBST(LIB_KDECORE, '$(top_builddir)/kdecore/libtdecore.la') AC_SUBST(LIB_KDECORE, '$(top_builddir)/tdecore/libtdecore.la')
AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libtdeui.la') AC_SUBST(LIB_KDEUI, '$(top_builddir)/tdeui/libtdeui.la')
AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la') AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KFILE, '$(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_KSYCOCA, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.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_KPARTS, '$(top_builddir)/kparts/libkparts.la')
AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la') AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.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(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp') AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets') 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" ac_save_LIBS="$LIBS"
LIBS="$LIBS $X_LDFLAGS -lICE" LIBS="$LIBS $X_LDFLAGS -lICE"

@ -1,7 +1,7 @@
dnl put here things which have to be done after all usual autoconf macros dnl put here things which have to be done after all usual autoconf macros
dnl have been run, but before the Makefiles are created 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) AC_SUBST(all_includes)
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"

@ -20,8 +20,8 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(
@ -53,7 +53,7 @@ tde_add_library( ${target} SHARED AUTOMOC
) )
#### dcopserver (kdeinit) ####################### #### dcopserver (tdeinit) #######################
set( target dcopserver ) set( target dcopserver )
@ -61,7 +61,7 @@ set( ${target}_SRCS
dcopserver.cpp dcopsignals.cpp dcopserver.cpp dcopsignals.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kICE-static DCOP-shared LINK kICE-static DCOP-shared
) )

@ -464,7 +464,7 @@ Sometimes it might be interesting to use DCOP between processes
belonging to different users, e.g. a frontend process running belonging to different users, e.g. a frontend process running
with the user's id, and a backend process running as root. 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 then forward the address of the DCOP server as well as the authentication
information to the new user. 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. 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. talking to the user's dcop server.
@ -503,7 +503,7 @@ int main(int argc, char **argv)
Compiled with: 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: on Linux yields the following memory use statistics:

@ -377,15 +377,15 @@ second process where to find the authentication information.
(Note that this implies that the second process is able to (Note that this implies that the second process is able to
read the authentication file, so it will probably only work read the authentication file, so it will probably only work
if the second process runs as root. If it should run as another 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 be taken. In fact, it would be a very good idea to add DCOP
support to kdesu!) support to tdesu!)
For example 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. to the user's dcop server.

@ -33,7 +33,7 @@ lib_LTLIBRARIES = libDCOP.la
libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) 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_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck 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 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 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 # dcopstub needs to go first for --enable-final to work
libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp 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_LDFLAGS = -module -avoid-version $(all_libraries)
dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
dcopserver_la_LIBADD = libDCOP.la $(LIB_QT) dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
dcopserver_shutdown_SOURCES = dcopserver_shutdown.c 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_SOURCES = testdcop.cpp
testdcop_LDADD = libDCOP.la 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_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_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM) testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)
EXTRA_DIST = HOWTO ICE Mainpage.dox EXTRA_DIST = HOWTO ICE Mainpage.dox
DOXYGEN_REFERENCES = kdecore DOXYGEN_REFERENCES = tdecore
DOXYGEN_EXCLUDE = KDE-ICE DOXYGEN_EXCLUDE = KDE-ICE
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -13,8 +13,8 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
) )
link_directories( link_directories(

@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/ ******************************************************************/
#define KDE_QT_ONLY #define KDE_QT_ONLY
#include "../../kdecore/kurl.cpp" #include "../../tdecore/kurl.cpp"
bool mkBool( const TQString& s ) bool mkBool( const TQString& s )
{ {

@ -13,9 +13,9 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(
@ -44,7 +44,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.0.0 VERSION 1.0.0
LINK kdecore-shared LINK tdecore-shared
DEPENDENCIES kconfig_compiler DEPENDENCIES kconfig_compiler
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -33,8 +33,8 @@ Jakub Stachowski
*/ */
// Trinity5: get rid of kdeui reference when settings.kcfgc is changed // Trinity5: get rid of tdeui reference when settings.kcfgc is changed
// DOXYGEN_REFERENCES = kdecore kdeui // DOXYGEN_REFERENCES = tdecore tdeui
// DOXYGEN_SET_PROJECT_NAME = DNSSD // DOXYGEN_SET_PROJECT_NAME = DNSSD
// DOXYGEN_SET_EXCLUDE_PATTERNS += */dnssd/avahi* */dnssd/mdnsd* // DOXYGEN_SET_EXCLUDE_PATTERNS += */dnssd/avahi* */dnssd/mdnsd*
// vim:ts=4:sw=4:expandtab:filetype=doxygen // vim:ts=4:sw=4:expandtab:filetype=doxygen

@ -14,7 +14,7 @@ libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
dnssdincludedir = $(includedir)/dnssd dnssdincludedir = $(includedir)/dnssd
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \ dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.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 libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
#kde_kcfg_DATA = kcm_kdnssd.kcfg #kde_kcfg_DATA = kcm_kdnssd.kcfg

@ -75,14 +75,14 @@ Differences with current dox: <TODO>
# autoconf and configure. Run it in the "top builddir" with one argument, # autoconf and configure. Run it in the "top builddir" with one argument,
# the "top srcdir". Something like this: # the "top srcdir". Something like this:
# #
# cd /mnt/build/kdepim # cd /mnt/build/tdepim
# sh /mnt/src/kdepim/doc/api/doxygen.sh /mnt/src/kdepim # sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim
# #
# You can also build single subdirs (for instance, after updating some # 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 # 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: # 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. # When generating dox for kdelibs, a tag file for Qt is also created.
# The location of Qt is specified indirectly through $QTDOCDIR or, # The location of Qt is specified indirectly through $QTDOCDIR or,

@ -1,5 +1,5 @@
SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech 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 DOXYGEN_SET_RECURSIVE = YES
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -14,10 +14,10 @@ add_subdirectory( icons )
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
) )

@ -16,12 +16,12 @@ endif( ARTS_FOUND )
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
) )
link_directories( link_directories(

@ -13,12 +13,12 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${ARTS_INCLUDE_DIRS} ${ARTS_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile

@ -15,10 +15,10 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
) )

@ -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 = libkscriptloader.la libkscript.la
lib_LTLIBRARIES = libkscript.la lib_LTLIBRARIES = libkscript.la
#libkscriptloader_la_SOURCES = scriptloader.cpp #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) #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
libkscript_la_SOURCES = scriptmanager.cpp libkscript_la_SOURCES = scriptmanager.cpp

@ -12,10 +12,10 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/interfaces/kscript ${CMAKE_SOURCE_DIR}/interfaces/kscript
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(

@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h
# Define DCOP/Text-to-Speech Service Type. # Define DCOP/Text-to-Speech Service Type.
kde_servicetypes_DATA = dcoptexttospeech.desktop kde_servicetypes_DATA = dcoptexttospeech.desktop
DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
include ../../admin/Doxyfile.am include ../../admin/Doxyfile.am

@ -14,12 +14,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kabc ${CMAKE_BINARY_DIR}/kabc
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/kabc
@ -90,7 +90,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 0.0.0 VERSION 0.0.0
LINK kdeui-shared kabc-shared kparts-shared LINK tdeui-shared kabc-shared kparts-shared
DEPENDENCIES dcopidl dcopidl2cpp DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.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) 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 \ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \

@ -12,9 +12,9 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
) )
link_directories( link_directories(

@ -10,6 +10,6 @@ libkab_la_SOURCES = \
qconfigDB.cc qconfigDB.cc
libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
libkab_la_LIBADD = ../kdeui/libtdeui.la libkab_la_LIBADD = ../tdeui/libtdeui.la
libkab_la_METASOURCES = AUTO libkab_la_METASOURCES = AUTO

@ -24,11 +24,11 @@ include_directories(
# external includes # external includes
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kab ${CMAKE_SOURCE_DIR}/kab

@ -52,7 +52,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kab2kabc 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_LDADD = libkabc.la ../kab/libkab.la
kab2kabc_SOURCES = kab2kabc.cpp kab2kabc_SOURCES = kab2kabc.cpp
@ -62,7 +62,7 @@ autostartdir = $(datadir)/autostart
manager_DATA = kabc_manager.desktop manager_DATA = kabc_manager.desktop
managerdir = $(kde_servicesdir)/kresources managerdir = $(kde_servicesdir)/kresources
DOXYGEN_REFERENCES = kdecore kdeui DOXYGEN_REFERENCES = tdecore tdeui
map_DATA = countrytransl.map map_DATA = countrytransl.map
mapdir = $(kde_datadir)/kabc mapdir = $(kde_datadir)/kabc

@ -14,10 +14,10 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
) )

@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile

@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
kabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 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 METASOURCES = AUTO

@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile

@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfiles ${CMAKE_SOURCE_DIR}/kio/kfiles

@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile

@ -11,7 +11,7 @@ libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
kde_module_LTLIBRARIES = kabc_net.la kde_module_LTLIBRARIES = kabc_net.la
kabc_net_la_SOURCES = resourcenetplugin.cpp 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 kabc_net_la_LIBADD = libkabc_net.la
METASOURCES = AUTO METASOURCES = AUTO

@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_sql.la
kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp
kabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 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 METASOURCES = AUTO

@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
testlock_LDFLAGS = $(all_libraries) testlock_LDFLAGS = $(all_libraries)
testlock_SOURCES = testlock.cpp 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 testldapclient_SOURCES = testldapclient.cpp
EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \ EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit 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 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 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 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 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 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 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 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_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigread_SOURCES = bigread.cpp 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_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigwrite_SOURCES = bigwrite.cpp 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 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 kabcargl_SOURCES = kabcargl.cpp

@ -15,8 +15,8 @@ include_directories(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/generated ${CMAKE_CURRENT_SOURCE_DIR}/include/generated
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(
@ -35,6 +35,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 0.0.0 VERSION 0.0.0
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
check_PROGRAMS = testwrite testread 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_LDADD = libvcard.la
testwrite_SOURCES = testwrite.cpp 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_LDADD = libvcard.la
testread_SOURCES = testread.cpp testread_SOURCES = testread.cpp

@ -11,8 +11,8 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(

@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2 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_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread_SOURCES = testread.cpp 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_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread2_SOURCES = testread2.cpp testutils.cpp 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_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testwrite_SOURCES = testwrite.cpp testwrite_SOURCES = testwrite.cpp

@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
@lgpl @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 // DOXYGEN_SET_PROJECT_NAME = Kate
// vim:ts=4:sw=4:expandtab:filetype=doxygen // vim:ts=4:sw=4:expandtab:filetype=doxygen

@ -6,6 +6,6 @@ messages:
$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp $(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot $(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 include ../admin/Doxyfile.am

@ -12,10 +12,10 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
) )

@ -15,18 +15,18 @@ include_directories(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kjs ${CMAKE_BINARY_DIR}/kjs
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdefx ${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kjs ${CMAKE_SOURCE_DIR}/kjs
${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/kutils
${CMAKE_SOURCE_DIR}/kdeprint ${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
${LUA_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS}
@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_kpart( ${target} tde_add_kpart( ${target}
SOURCES dummy.cpp SOURCES dummy.cpp
EMBED kate-static 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} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -20,7 +20,7 @@ libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_
libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) 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 METASOURCES = AUTO

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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> * Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk>
* Copyright (c) 2002, 2003 Anders Lund <anders@alweb.dk> * Copyright (c) 2002, 2003 Anders Lund <anders@alweb.dk>
* *

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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> * Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -12,10 +12,10 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile

@ -12,10 +12,10 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
) )

@ -12,11 +12,11 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdefx ${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces

@ -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 METASOURCES = AUTO
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory

@ -12,10 +12,10 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
) )

@ -13,11 +13,11 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kio/kssl ${CMAKE_BINARY_DIR}/kio/kssl
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile

@ -12,10 +12,10 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/kutils
@ -34,7 +34,7 @@ set( ${target}_SRCS
main.cpp main.skel main.cpp main.skel
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kutils-shared LINK kutils-shared
DEPENDENCIES dcopidl DEPENDENCIES dcopidl

@ -23,7 +23,7 @@ METASOURCES = AUTO
lib_LTLIBRARIES = lib_LTLIBRARIES =
bin_PROGRAMS = bin_PROGRAMS =
kdeinit_LTLIBRARIES = kcmshell.la tdeinit_LTLIBRARIES = kcmshell.la
kcmshell_la_SOURCES = main.cpp main.skel 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) kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)

@ -11,8 +11,8 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(
@ -28,7 +28,7 @@ set( ${target}_SRCS
kconf_update.cpp kconf_update.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdecore-shared LINK tdecore-shared
) )

@ -20,7 +20,7 @@ INCLUDES= -I../kded $(all_includes)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kconf_update.la tdeinit_LTLIBRARIES = kconf_update.la
kconf_update_la_SOURCES = kconf_update.cpp kconf_update_la_SOURCES = kconf_update.cpp
kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)

@ -27,8 +27,8 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/network ${CMAKE_CURRENT_SOURCE_DIR}/network
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/libltdl ${CMAKE_SOURCE_DIR}/libltdl
${CMAKE_SOURCE_DIR}/kdefx ${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${LIBART_INCLUDE_DIRS} ${LIBART_INCLUDE_DIRS}
${LIBIDN_INCLUDE_DIRS} ${LIBIDN_INCLUDE_DIRS}
@ -90,7 +90,7 @@ install( FILES eventsrc
##### libtdecore ################################ ##### libtdecore ################################
set( target kdecore ) set( target tdecore )
set( ${target}_SRCS set( ${target}_SRCS
libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
@ -120,7 +120,7 @@ set( ${target}_SRCS
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.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 kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
kqiodevicegzip_p.cpp ktimezones.cpp kqiodevicegzip_p.cpp ktimezones.cpp
) )
@ -128,16 +128,16 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 4.2.0 VERSION 4.2.0
EMBED kdecorenetwork-static EMBED tdecorenetwork-static
LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
DEPENDENCIES dcopidl dcopidl2cpp DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
##### kdefakes_nonpic ########################### ##### tdefakes_nonpic ###########################
set( target kdefakes_nonpic ) set( target tdefakes_nonpic )
set( ${target}_SRCS set( ${target}_SRCS
fakes.c vsnprintf.c fakes.c vsnprintf.c
@ -148,9 +148,9 @@ tde_add_library( ${target} STATIC
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
##### kdefakes_pic ############################## ##### tdefakes_pic ##############################
set( target kdefakes_pic ) set( target tdefakes_pic )
set( ${target}_SRCS set( ${target}_SRCS
fakes.c vsnprintf.c fakes.c vsnprintf.c
@ -164,7 +164,7 @@ tde_add_library( ${target} STATIC_PIC
##### libtdefakes ############################### ##### libtdefakes ###############################
set( target kdefakes ) set( target tdefakes )
set( ${target}_SRCS set( ${target}_SRCS
fakes.c vsnprintf.c fakes.c vsnprintf.c
@ -185,7 +185,7 @@ configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY )
tde_add_executable( kde-config tde_add_executable( kde-config
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -204,6 +204,6 @@ tde_add_executable(kgrantpty SETUID
tde_add_executable( kdetcompmgr tde_add_executable( kdetcompmgr
SOURCES kdetcompmgr.cpp SOURCES kdetcompmgr.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -104,7 +104,7 @@ klockfile.cpp Waldo Bastian <bastian@kde.org> (copyright)
kmacroexpander.cpp kmacroexpander.cpp
kmanagerselection.cpp Lubos Lunak <l.lunak@kde.org> (copyright) kmanagerselection.cpp Lubos Lunak <l.lunak@kde.org> (copyright)
kmountpoint.cpp Waldo Bastian <bastian@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 Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Waldo Bastian <bastian@kde.org> (copyright) kprotocolinfofactory.cpp Waldo Bastian <bastian@kde.org> (copyright)
kpty.cpp kpty.cpp

@ -5,7 +5,7 @@ as the configuration system, IPC, internationalization and locale
support, site-independent access to the filesystem and a large number support, site-independent access to the filesystem and a large number
of other (but no less important) things. of other (but no less important) things.
<p> <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 KApplication derived class instead of TQApplication is almost
mandatory if you expect your application to behave nicely within the mandatory if you expect your application to behave nicely within the
Trinity environment. Trinity environment.

@ -20,7 +20,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA. # 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 if include_SVGICONS
SVGICONS=svgicons SVGICONS=svgicons
@ -117,20 +117,20 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \ kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \ kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.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 \ kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
kqiodevicegzip_p.cpp ktimezones.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_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 \ 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_NMCHECK = $(srcdir)/libtdecore.nmcheck
libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.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 libtdecore_la_METASOURCES = AUTO
SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/tdecore
kdebugdir = $(kde_confdir) kdebugdir = $(kde_confdir)
kdebug_DATA = kdebug.areas kdebugrc language.codes kdebug_DATA = kdebug.areas kdebugrc language.codes
@ -154,7 +154,7 @@ install-data-local:
uninstall-local: uninstall-local:
-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h -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 colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
colorsdir = $(kde_confdir)/colors colorsdir = $(kde_confdir)/colors
@ -188,7 +188,7 @@ install-exec-hook:
DISTCLEANFILES = kde-config.cpp DISTCLEANFILES = kde-config.cpp
DOXYGEN_REFERENCES = dcop kdeui kparts kio DOXYGEN_REFERENCES = dcop tdeui kparts kio
DOXYGEN_EXCLUDE = malloc kde_file.h DOXYGEN_EXCLUDE = malloc kde_file.h
DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES

@ -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. interface functionality.

@ -88,7 +88,7 @@ The KStartupInfo classes :
-------------------------- --------------------------
In some cases, or if you are interested in getting the ASN information, you 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 : Receiving the application startup notification information :
------------------------------------------------------------ ------------------------------------------------------------

@ -1,7 +1,7 @@
dnl Compile in the exec prefix to help kstddirs in finding dynamic libs 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]) 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 if test "$exec_prefix" = "NONE"; then
bindir_str="\"$prefix/bin\"" bindir_str="\"$prefix/bin\""
else else
@ -167,9 +167,9 @@ AC_TRY_LINK(dnl
AC_CHECK_HEADERS(sys/mount.h) 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= SVGICONS=

@ -523,7 +523,7 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
const TQString& KAccel::configGroup() const const TQString& KAccel::configGroup() const
{ return d->configGroup(); } { return d->configGroup(); }
// for kdegames/ksirtet // for tdegames/ksirtet
void KAccel::setConfigGroup( const TQString& s ) void KAccel::setConfigGroup( const TQString& s )
{ d->setConfigGroup( s ); } { d->setConfigGroup( s ); }

@ -46,7 +46,7 @@
#include "kaccelmanager_private.h" #include "kaccelmanager_private.h"
#include "../kdeui/kstdaction_p.h" #include "../tdeui/kstdaction_p.h"
#include "../kutils/kmultitabbar.h" #include "../kutils/kmultitabbar.h"

@ -1440,18 +1440,18 @@ bool KApplication::sessionSaving() const
void KApplication::startKdeinit() void KApplication::startKdeinit()
{ {
#ifndef Q_WS_WIN //TODO #ifndef Q_WS_WIN //TODO
KInstance inst( "startkdeinitlock" ); KInstance inst( "starttdeinitlock" );
KLockFile lock( locateLocal( "tmp", "startkdeinitlock", &inst )); KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) { if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
lock.lock(); lock.lock();
DCOPClient cl; DCOPClient cl;
if( cl.attach()) if( cl.attach())
return; // whoever held the lock has already started dcopserver return; // whoever held the lock has already started dcopserver
} }
// Try to launch kdeinit. // Try to launch tdeinit.
TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit")); TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"));
if (srv.isEmpty()) 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()) if (srv.isEmpty())
return; return;
if (kapp && (Tty != kapp->type())) if (kapp && (Tty != kapp->type()))
@ -2884,7 +2884,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
TQString error; TQString error;
// TODO this should check if cmd has a .desktop file, and use data from it, together // TODO this should check if cmd has a .desktop file, and use data from it, together
// with sending more ASN data // 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()) if (Tty != kapp->type())
TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"), TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK")); 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 // make sure there is id, so that user timestamp exists
stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id ); stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id );
#endif #endif
if( function.left( 12 ) != "kdeinit_exec" ) if( function.left( 12 ) != "tdeinit_exec" )
stream << noWait; stream << noWait;
if (!dcopClient->call(_launcher, _launcher, if (!dcopClient->call(_launcher, _launcher,
@ -3100,32 +3100,32 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi
} }
int int
KApplication::kdeinitExec( const TQString& name, const TQStringList &args, KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid ) TQString *error, int *pid )
{ {
return kdeinitExec( name, args, error, pid, "" ); return tdeinitExec( name, args, error, pid, "" );
} }
int 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 ) 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); name, args, error, 0, pid, startup_id, false);
} }
int int
KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args, KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid ) TQString *error, int *pid )
{ {
return kdeinitExecWait( name, args, error, pid, "" ); return tdeinitExecWait( name, args, error, pid, "" );
} }
int 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 ) 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); name, args, error, 0, pid, startup_id, false);
} }

@ -814,10 +814,10 @@ public:
TQString *error=0, TQCString *dcopService=0, int *pid = 0, const TQCString &startup_id = "", bool noWait = false ); 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 * 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 name Name of the program to start
* @param args Arguments to pass to the program * @param args Arguments to pass to the program
@ -830,16 +830,16 @@ public:
* "" ( empty string ) is the default * "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0). * @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 ); TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with 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 ); 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. * As such it behaves similar to the system(...) function.
* *
* @param name Name of the program to start * @param name Name of the program to start
@ -853,10 +853,10 @@ public:
* "" ( empty string ) is the default * "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0). * @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 ); TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with 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 ); TQString *error=0, int *pid = 0 );
/** /**

@ -294,7 +294,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
{ {
TQStringList args; TQStringList args;
args << "--check" << updateFile; args << "--check" << updateFile;
KApplication::kdeinitExecWait("kconf_update", args); KApplication::tdeinitExecWait("kconf_update", args);
reparseConfiguration(); reparseConfiguration();
} }
setGroup(oldGroup); setGroup(oldGroup);

@ -11,8 +11,8 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(
@ -24,6 +24,6 @@ link_directories(
tde_add_executable( kconfig_compiler tde_add_executable( kconfig_compiler
SOURCES kconfig_compiler.cpp SOURCES kconfig_compiler.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -1,10 +1,10 @@
SUBDIRS = example tests 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 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_LDADD = $(LIB_KDECORE)
kconfig_compiler_SOURCES = kconfig_compiler.cpp kconfig_compiler_SOURCES = kconfig_compiler.cpp
@ -13,6 +13,6 @@ TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
check-local: check-local:
for i in $(TESTFILES); \ for i in $(TESTFILES); \
do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \ do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
perl $(top_srcdir)/kdecore/kconfig_compiler/checkkcfg.pl \ perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \
$(top_srcdir)/kdecore/kconfig_compiler/tests/$$i; done $(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done

@ -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 check_PROGRAMS = example # autoexample
EXTRA_PROGRAMS = 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_LDADD = $(LIB_KDECORE)
example_SOURCES = example.cpp exampleprefs_base.cpp 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_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \ autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
autoexample.cpp autoexample.cpp

@ -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 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 \ test_dpointer.cpp test_dpointer.h \
md5sums 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_LDADD = $(LIB_KDECORE)
test1_SOURCES = test1main.cpp test1.cpp 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_LDADD = $(LIB_KDECORE)
test2_SOURCES = test2main.cpp test2.cpp 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_LDADD = $(LIB_KDECORE)
test3_SOURCES = test3main.cpp test3.cpp 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_LDADD = $(LIB_KDECORE)
test4_SOURCES = test4main.cpp test4.cpp 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_LDADD = $(LIB_KDECORE)
test5_SOURCES = test5main.cpp test5.cpp 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_LDADD = $(LIB_KDECORE)
test6_SOURCES = test6main.cpp test6.cpp 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_LDADD = $(LIB_KDECORE)
test7_SOURCES = test7main.cpp test7.cpp 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_LDADD = $(LIB_KDECORE)
test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp 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_LDADD = $(LIB_KDECORE)
test9_SOURCES = test9main.cpp test9.cpp 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_LDADD = $(LIB_KDECORE)
test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp

@ -177,7 +177,7 @@ KCrash::defaultCrashHandler (int sig)
argv[i++] = "--appname"; argv[i++] = "--appname";
argv[i++] = appName; argv[i++] = appName;
if (KApplication::loadedByKdeinit) if (KApplication::loadedByKdeinit)
argv[i++] = "--kdeinit"; argv[i++] = "--tdeinit";
// only add apppath if it's not NULL // only add apppath if it's not NULL
if (appPath) { 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 ) 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(); pid_t pid = fork();
if (pid <= 0) if (pid <= 0)
{ {
@ -483,13 +483,13 @@ static int openSocket()
return -1; 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"); fprintf(stderr, "Warning: Socket name will be too long.\n");
free(display); free(display);
return -1; return -1;
} }
strcat(sock_file, "/kdeinit_"); strcat(sock_file, "/tdeinit_");
strcat(sock_file, display); strcat(sock_file, display);
free(display); free(display);

@ -5,48 +5,48 @@
# #
#Format : number<tab>description #Format : number<tab>description
125 kdecore (KAccel) 125 tdecore (KAccel)
126 kdecore (KURL) 126 tdecore (KURL)
127 kio (KProtocolInfo) 127 kio (KProtocolInfo)
128 kdecore (KRegExp) 128 tdecore (KRegExp)
129 kdecore (KAction) 129 tdecore (KAction)
130 kio (KPasswdServer) 130 kio (KPasswdServer)
131 kdecore (KAcceleratorManager) 131 tdecore (KAcceleratorManager)
150 kdecore (KLibLoader) 150 tdecore (KLibLoader)
160 kdecore (KNotifyClient) 160 tdecore (KNotifyClient)
170 kdecore (KNetwork socket) 170 tdecore (KNetwork socket)
171 kdecore (KSocks) 171 tdecore (KSocks)
172 kdecore (KStartupInfo) 172 tdecore (KStartupInfo)
173 kdecore (KLocale) 173 tdecore (KLocale)
174 kdecore (KProcIO) 174 tdecore (KProcIO)
175 kdecore (KProcess) 175 tdecore (KProcess)
176 kdecore (KWin) 176 tdecore (KWin)
177 kdecore (KConfigSkeleton) 177 tdecore (KConfigSkeleton)
178 kdecore (KConfigDialogManager) 178 tdecore (KConfigDialogManager)
179 kdecore (KNetwork resolver) 179 tdecore (KNetwork resolver)
180 kdecore (kdelibs) 180 tdecore (kdelibs)
200 kdeui (KMainWindow) 200 tdeui (KMainWindow)
220 kdeui (KToolBar) 220 tdeui (KToolBar)
230 kdeui (KCommand) 230 tdeui (KCommand)
240 kdeui (kdelibs) 240 tdeui (kdelibs)
250 kfile (kdelibs) 250 kfile (kdelibs)
264 kdecore (KIconLoader) 264 tdecore (KIconLoader)
265 kdecore (KIconEffect) 265 tdecore (KIconEffect)
270 kdeui (KRootPixmap) 270 tdeui (KRootPixmap)
280 kdeui (KSharedPixmap) 280 tdeui (KSharedPixmap)
281 kdeui (KCModule) 281 tdeui (KCModule)
282 kdeui (KDockWidget) 282 tdeui (KDockWidget)
290 kdeui (KPixmapIO) 290 tdeui (KPixmapIO)
291 kdeui (KAboutDialog) 291 tdeui (KAboutDialog)
292 kdeui (KComboBox) 292 tdeui (KComboBox)
293 kdeui (KLineEdit) 293 tdeui (KLineEdit)
294 kdeui (KEdit) 294 tdeui (KEdit)
295 kdeui (KMenuBar) 295 tdeui (KMenuBar)
296 kdeui (KPopupMenu) 296 tdeui (KPopupMenu)
298 kdeui (KDatePicker) 298 tdeui (KDatePicker)
399 kimgio 399 kimgio
400 artskde 400 artskde
500 kdeprint 500 tdeprint
700 kutils (KSettings::Dialog) 700 kutils (KSettings::Dialog)
701 kutils (KSettings::Dispatcher) 701 kutils (KSettings::Dispatcher)
702 kutils (KPluginSelector) 702 kutils (KPluginSelector)
@ -61,7 +61,7 @@
780 kcmshell (kdelibs) 780 kcmshell (kdelibs)
790 kimproxy (kdelibs) 790 kimproxy (kdelibs)
800 kabapi (kdelibs) 800 kabapi (kdelibs)
900 kdesu (kdelibs) 900 tdesu (kdelibs)
912 ksmartcard (kdelibs) 912 ksmartcard (kdelibs)
@ -74,8 +74,8 @@
1202 konqueror 1202 konqueror
1203 libkonq 1203 libkonq
1204 kdesktop 1204 kdesktop
1205 kdesud 1205 tdesud
1206 kdesu 1206 tdesu
1207 kdesktop (Minicli) 1207 kdesktop (Minicli)
1208 kcontrol 1208 kcontrol
1210 kicker 1210 kicker
@ -151,7 +151,7 @@
5150 libkleopatra 5150 libkleopatra
# kdepim # tdepim
5200 kitchensync 5200 kitchensync
5201 kitchensync (Konnector) 5201 kitchensync (Konnector)
5202 kitchensync (OpieKonnector) 5202 kitchensync (OpieKonnector)

@ -289,7 +289,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
} }
case 1: // Message Box 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 // TQMessageBox instead
if ( !kDebug_data->aAreaName.isEmpty() ) if ( !kDebug_data->aAreaName.isEmpty() )
aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) ); aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) );

@ -67,7 +67,7 @@
#endif /*_KDELIBS_EXPORT_H*/ #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>: */ between 'class' keyword and <classname>: */
#ifdef KDE_DEPRECATED #ifdef KDE_DEPRECATED
# ifndef KDECORE_EXPORT_DEPRECATED # ifndef KDECORE_EXPORT_DEPRECATED

@ -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 * support, site-independent access to the filesystem and a large number
* of other (but no less important) things. * 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 * KApplication derived class instead of TQApplication is almost
* mandatory if you expect your application to behave nicely within the * mandatory if you expect your application to behave nicely within the
* KDE environment. * KDE environment.

@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* $Id$ * $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> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* with minor additions and based on ideas from * with minor additions and based on ideas from
* Torsten Rahn <torsten@kde.org> * Torsten Rahn <torsten@kde.org>
@ -279,7 +279,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value,
return result; 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. // as this code is not too big, it doesn't seem much of a problem to me.
void KIconEffect::toGray(TQImage &img, float value) void KIconEffect::toGray(TQImage &img, float value)

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* 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> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* with minor additions and based on ideas from * with minor additions and based on ideas from
* Torsten Rahn <torsten@kde.org> * Torsten Rahn <torsten@kde.org>

@ -2,7 +2,7 @@
* *
* $Id$ * $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> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org> * Antonio Larrosa <larrosa@kde.org>
* *

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* 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> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org> * Antonio Larrosa <larrosa@kde.org>
* *

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* 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> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org> * Antonio Larrosa <larrosa@kde.org>
* *

@ -2,7 +2,7 @@
* *
* $Id$ * $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> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org> * Antonio Larrosa <larrosa@kde.org>
* *

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* 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> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org> * Antonio Larrosa <larrosa@kde.org>
* *

@ -362,7 +362,7 @@ TQString KLibLoader::findLibrary( const char * name, const KInstance * instance
{ {
libfile = instance->dirs()->findResource( "lib", libname ); libfile = instance->dirs()->findResource( "lib", libname );
#ifndef NDEBUG #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; kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl;
#endif #endif
} }

@ -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 #if 0
#define KSTARTUPINFO_ALL_DEBUG #define KSTARTUPINFO_ALL_DEBUG
#warning Extra KStartupInfo debug messages enabled. #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_MSG = "_NET_STARTUP_INFO";
static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID"; static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID";
// DESKTOP_STARTUP_ID is used also in kinit/wrapper.c , // 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 const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID";
static bool auto_app_started_sending = true; static bool auto_app_started_sending = true;

@ -49,7 +49,7 @@ class KStartupInfoPrivate;
* *
* This class can be used to send information about started application, * This class can be used to send information about started application,
* change the information and receive this information. For detailed * 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 * You usually don't need to use this class for sending the notification
* information, as KDE libraries should do this when an application is * information, as KDE libraries should do this when an application is

@ -98,7 +98,7 @@ KSycoca::KSycoca()
} }
// We register with DCOP _before_ we try to open the database. // We register with DCOP _before_ we try to open the database.
// This way we can be relative sure that the KDE framework is // 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. // that the database is up to date.
openDatabase(); openDatabase();
_self = this; _self = this;
@ -332,7 +332,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id)
if (!triedLaunchingKdeinit) // try only once if (!triedLaunchingKdeinit) // try only once
{ {
triedLaunchingKdeinit = true; triedLaunchingKdeinit = true;
kdDebug(7011) << "findFactory: we have no database.... launching kdeinit" << endl; kdDebug(7011) << "findFactory: we have no database.... launching tdeinit" << endl;
KApplication::startKdeinit(); KApplication::startKdeinit();
// Ok, the new database should be here now, open it. // Ok, the new database should be here now, open it.
} }

@ -164,7 +164,7 @@ KUniqueApplication::start()
::exit(255); ::exit(255);
} }
// Try to launch kdeinit. // Try to launch tdeinit.
startKdeinit(); startKdeinit();
regName = dc->registerAs(appName, false); regName = dc->registerAs(appName, false);
if (regName.isEmpty()) if (regName.isEmpty())

@ -1,6 +1,6 @@
# KDE namespace check file # KDE namespace check file
# kdecore classes # tdecore classes
K*::* K*::*
# these should preferably go in some namespace in KDE4 # these should preferably go in some namespace in KDE4
@ -48,7 +48,7 @@ kasciistricmp
# from libtldl # from libtldl
lt_dl* lt_dl*
# from kdefakes # from tdefakes
setenv setenv
unsetenv unsetenv
usleep usleep

@ -13,8 +13,8 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
) )
@ -35,9 +35,9 @@ install( FILES
install( FILES ipv6blacklist DESTINATION ${CONFIG_INSTALL_DIR} ) install( FILES ipv6blacklist DESTINATION ${CONFIG_INSTALL_DIR} )
##### kdecorenetwork ############################ ##### tdecorenetwork ############################
set( target kdecorenetwork ) set( target tdecorenetwork )
set( ${target}_SRCS set( ${target}_SRCS
kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp

@ -11,8 +11,8 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${LIBART_INCLUDE_DIRS} ${LIBART_INCLUDE_DIRS}
) )

@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA. # 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) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)

@ -5,7 +5,7 @@
g++ -g -Wall -o testqtargs testqtargs.cpp -I/usr/X11R6/include \ 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 \ -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 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 --bg is aliased to --background but If you try it with --background or
-background, you get the same thing. -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 by the static method Kapplication::addCmdLineOptions to add the Qt options
but its' entries look like this: but its' entries look like this:

@ -14,10 +14,10 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
) )
@ -47,9 +47,9 @@ set( ${target}_SRCS
kded.cpp kdedmodule.cpp 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 # modules need this library
tde_add_kdeinit_executable( ${target} AUTOMOC EXPORT tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kio-shared LINK kio-shared
) )
@ -66,7 +66,7 @@ set( ${target}_SRCS
kctimefactory.cpp vfolder_menu.cpp kctimefactory.cpp vfolder_menu.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kio-shared LINK kio-shared
) )
@ -82,7 +82,7 @@ set( ${target}_SRCS
tde_add_executable( ${target} tde_add_executable( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -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. of these tasks are built in, others are started on demand.
<p> <p>
The chances are you are looking here because you want to write a 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 <a href="http://websvn.kde.org/trunk/Trinity/kdelibs/kded/README.kded?view=markup">TrinityD
README</a>. 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 // DOXYGEN_SET_PROJECT_NAME = TrinityD
// vim:ts=4:sw=4:expandtab:filetype=doxygen // vim:ts=4:sw=4:expandtab:filetype=doxygen

@ -20,7 +20,7 @@
INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kded.la kbuildsycoca.la tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
kded_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) 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 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_LDADD = $(LIB_KDECORE)
kdontchangethehostname_SOURCES = khostname.cpp 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_LDADD = ../kio/libkio.la
kmimelist_SOURCES = kmimelist.cpp 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_LDADD = $(LIB_KIO)
kde_menu_SOURCES = kde-menu.cpp kde_menu_SOURCES = kde-menu.cpp

@ -148,7 +148,7 @@ int main(int argc, char **argv)
args.append("--checkstamps"); args.append("--checkstamps");
TQString command = "kbuildsycoca"; TQString command = "kbuildsycoca";
TQCString _launcher = KApplication::launcher(); 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!"); qWarning("Can't talk to klauncher!");
command = KGlobal::dirs()->findExe(command); command = KGlobal::dirs()->findExe(command);

@ -75,17 +75,17 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
dataStream << TQString("kbuildsycoca") << args; dataStream << TQString("kbuildsycoca") << args;
TQCString _launcher = KApplication::launcher(); 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 else
{ {
KApplication::kdeinitExecWait( "kbuildsycoca", args ); KApplication::tdeinitExecWait( "kbuildsycoca", args );
} }
} }
static void runKonfUpdate() 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) static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName)
@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
TQStringList args; TQStringList args;
args.append(TQFile::decodeName(oldName)); args.append(TQFile::decodeName(oldName));
args.append(TQFile::decodeName(newName)); args.append(TQFile::decodeName(newName));
KApplication::kdeinitExecWait( "kdontchangethehostname", args ); KApplication::tdeinitExecWait( "kdontchangethehostname", args );
} }
Kded::Kded(bool checkUpdates, bool new_startup) Kded::Kded(bool checkUpdates, bool new_startup)

@ -14,8 +14,8 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
link_directories( link_directories(
@ -33,7 +33,7 @@ install( FILES
##### libtdefx ################################## ##### libtdefx ##################################
set( target kdefx ) set( target tdefx )
set( ${target}_SRCS set( ${target}_SRCS
kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp

@ -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_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_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11)
libtdefx_la_NMCHECK = $(srcdir)/libtdefx.nmcheck libtdefx_la_NMCHECK = $(srcdir)/libtdefx.nmcheck
libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \ libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck \
$(top_srcdir)/kdecore/standard_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck
include_HEADERS = kpixmap.h kpixmapsplitter.h \ include_HEADERS = kpixmap.h kpixmapsplitter.h \
kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
@ -40,6 +40,6 @@ METASOURCES = AUTO
EXTRA_DIST = Mainpage.dox EXTRA_DIST = Mainpage.dox
DOXYGEN_REFERENCES = kdecore DOXYGEN_REFERENCES = tdecore
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -1,6 +1,6 @@
# KDE namespace check file # KDE namespace check file
# kdefx classes # tdefx classes
K*::* K*::*
# these should preferably go in some namespace in KDE4 # these should preferably go in some namespace in KDE4

@ -26,12 +26,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdefx ${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile
@ -53,16 +53,16 @@ install( FILES
kprintdialogpage.h kpreloadobject.h kmmanager.h kprintdialogpage.h kpreloadobject.h kmmanager.h
kmprinter.h kmobject.h kprintdialog.h driver.h kmprinter.h kmobject.h kprintdialog.h driver.h
kmjobmanager.h kmjob.h kmjobmanager.h kmjob.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint )
##### other data ################################ ##### other data ################################
install( FILES kprintpreviewui.rc DESTINATION ${CONFIG_INSTALL_DIR}/ui ) install( FILES kprintpreviewui.rc DESTINATION ${CONFIG_INSTALL_DIR}/ui )
install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
install( FILES kdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) install( FILES tdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
install( FILES kdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} ) install( FILES tdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} )
install( FILES kdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES tdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
##### driverparse ############################### ##### 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 set( ${target}_SRCS
kdeprintd.cpp kprintprocess.cpp kdeprintd.skel tdeprintd.cpp kprintprocess.cpp tdeprintd.skel
) )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kio-shared kdeinit_kded-shared LINK kio-shared tdeinit_kded-shared
DEPENDENCIES dcopidl dcopidl2cpp DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
#### kdeprint ################################### #### tdeprint ###################################
set( target kdeprint ) set( target tdeprint )
set( ${target}_SRCS set( ${target}_SRCS
kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
@ -103,7 +103,7 @@ set( ${target}_SRCS
kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp
kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp
kpipeprocess.cpp kpfilterpage.cpp kmspecialmanager.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 kfilelist.cpp kprintaction.cpp kpfileselectpage.cpp
treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp
marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp

@ -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 * 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, 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. 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 each output format is supported as an input by the next filter
* possibility to specify input file from the print dialog in StandAlone * possibility to specify input file from the print dialog in StandAlone
mode (like XPP) 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 * print dialog: possibility to select the files to print in standalone
mode (like XPP). 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 * implementation of "Schedule" tab in print dialog for the CUPS plugin
(job-hold-until attribute). (job-hold-until attribute).
* Printer aliases are now handled gracefully in the LPR plugin (they * 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-isspecial", "1");
setOption("kde-special-command", cmd); 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 * implementation of KPrintAction, which provides a quick access to
a class of printers (special, regular or both). An application just a class of printers (special, regular or both). An application just
needs to create a KPrintAction anc connect to print(KPrinter*). 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 * CUPS plugin: fix crash for Qt3 port, must check if attr->name is NULL
before comparing it with strcmp or strncmp. 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 * 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- * CUPS plugin: fix multiple showing of password dialog for password-
protected printers (timer is now blocked when the password dialog is protected printers (timer is now blocked when the password dialog is
shown) 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 * CUPS plugin: configuration wizard rewritten using the structure of
ESP PrintPro: more consistent, less pages and widgets. Not used as ESP PrintPro: more consistent, less pages and widgets. Not used as
default config wizard yet. default config wizard yet.
* QList -> QPtrList * 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. * CUPS plugin: made the new configuration wizard as default one.
* other QList -> QPtrList fixes (committed to CVS) * other QList -> QPtrList fixes (committed to CVS)
* Avoid to call plugin functions "completePrinter<xxx>" for pseudo * 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 * Wizard: fix buffer overflow when adding a remote LPD queue having
a lot of jobs waiting 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 * CUPS plugin: make use of GET/PUT request to handle configuration
file. Possibility to admin a remote CUPS server (if allowed) file. Possibility to admin a remote CUPS server (if allowed)
* CUPS plugin: added "/jobs" in the available resources list * 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" * CUPS plugin: added 2 missing pages in stand-alone mode, "Image"
and "Text". 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 * CUPS plugin: "HP-GL/2" page added
* General: added a GUI to configure the preview program, into the * General: added a GUI to configure the preview program, into the
config dialog of the print manager 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 * general: added the possibility for a plugin to add new actions
to the toolbar and context menu (main use = export driver in to the toolbar and context menu (main use = export driver in
CUPS). CUPS).
@ -86,16 +86,16 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
through samba. Threaded operation with progress bar to notify through samba. Threaded operation with progress bar to notify
the user. Graphical equivalent to cupsaddsmb from cups-1.1.11. 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 * CUPS plugin: removed the "file" backend as it doesn't seem to
be available since a couple of releases, and added a "Other" be available since a couple of releases, and added a "Other"
page to the wizard for any third-party backend (like pdf). page to the wizard for any third-party backend (like pdf).
18/10/2001 Michael Goffioul <kdeprint@swing.be> 18/10/2001 Michael Goffioul <tdeprint@swing.be>
* kdeprintfax: don't hardcode program path, use the $PATH variable * tdeprintfax: don't hardcode program path, use the $PATH variable
first to find the program. Default to /usr/bin if not found. 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: * CUPS plugin:
. fix for remote printers when there's also a local . fix for remote printers when there's also a local
printer with the same name: the printer-uri-supported 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 as well as detected IPP printers on the network (in
the wizard) the wizard)
05/11/2001 Michael Goffioul <kdeprint@swing.be> 05/11/2001 Michael Goffioul <tdeprint@swing.be>
* kdeprintfax: added possibility to view files being faxed and * tdeprintfax: added possibility to view files being faxed and
file action (remove and view) are enabled only when needed. file action (remove and view) are enabled only when needed.
* KPrinter: when printing to a file, support encoding and spaces * KPrinter: when printing to a file, support encoding and spaces
in file names + system --> KProcess. in file names + system --> KProcess.
07/11/2001 Michael Goffioul <kdeprint@swing.be> 07/11/2001 Michael Goffioul <tdeprint@swing.be>
* kdeprint: fixed some problems: * tdeprint: fixed some problems:
. collate entirely handled by kdeprint, even in the case . collate entirely handled by tdeprint, even in the case
of page selection on application-side. of page selection on application-side.
. set KPrinter object in KPrintDialog before adding other . set KPrinter object in KPrintDialog before adding other
dialog pages (some pages may need it) dialog pages (some pages may need it)
* wizard: changed button layout and added a side graphic. Not * wizard: changed button layout and added a side graphic. Not
committed as the graphic comes from HP driver (copyright). 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: * CUPS plugin:
. complete IPP report for job added . complete IPP report for job added
. implementation of dynamically added plugin menus for . 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 . printer infos are now retrieved from the correct host
for remote printers and classes (idem for IPP report) for remote printers and classes (idem for IPP report)
* general: implementation of a DCOP signal communication to * 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). notified to all other opened apps (via DCOP).
* kicker extension: made extension aware of plugin change in * kicker extension: made extension aware of plugin change in
other apps (using new DCOP signal comm). 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 * CUPS plugin: added the possibility to list jobs on remote
printers. No management is allowed on remote jobs (yet?). 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, * general: use KShellProcess::quote() for any quoting. Normally,
all quoting problem should be fixed now. 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 * CUPS: redesigned the "cups-add-smb" dialog to make it more
user-driendly. 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 * general: implementation of a KActiveLabel class to embed active
links in labels. Clicking on it "exec" the associated URL. links in labels. Clicking on it "exec" the associated URL.
* general: make use of KActiveLabel in the first page of the * 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 correctly when scanning the network (however it should be
avoided as smbspool seems to be unable to handle it). 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 * ioslave: uploaded new templates from Chris (which adds support
for pseudo printers for pseudo printers
* manager: modified RootOnly message for better consistency between * 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 . added hiding mechanism to make the dialog more compact
(show/hide button can probably be improved) (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 * CUPS: drivers are now downloaded from the actual server for remote
printers. This allows to have access to all options set for any printers. This allows to have access to all options set for any
printer (even remote ones). However remote printer's drivers are printer (even remote ones). However remote printer's drivers are
kept read-only. 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 * print dialog: instances are now presented in a tree structure in
the combo box -> cleaner view. the combo box -> cleaner view.
* general: ported the use of a global instance file to 2.2 branch * 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 numerical option and update the corresponding enum one with the
closest value. 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 * 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 doesn't quit the app. To quit, either use menu item (from window
or system tray) or accel when job viewer is visible. 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 it is always centered on its parent now. It also have the dialog
buttons in title bar (no minimize). 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 * job management: the job management has been re-engineered to follow
the paradigm "1 window == 1 queue". There's still the possibility to the paradigm "1 window == 1 queue". There's still the possibility to
view jobs for all printers within a single window. This should enhance view jobs for all printers within a single window. This should enhance
the usability of job management tools (I hope). 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 * job management: job type (active/completed) is now handled on a
printer basis instead of a global property of the manager. This allows printer basis instead of a global property of the manager. This allows
different windows to show different job type, and also ease the 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 This new mechanism should also be applied to print management dynamic
actions (more consistent). 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 * special printers: added the possibility to have configurable options
in pseudo-printers. Options are described in an additional XML file in pseudo-printers. Options are described in an additional XML file
(like filters) and configured through an "Advanced" tab in the property (like filters) and configured through an "Advanced" tab in the property
dialog. TODO: graphical configuration widget + apply KXmlCommand to dialog. TODO: graphical configuration widget + apply KXmlCommand to
normal filters. 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 * general: fixed sorting of options in driver view. They should be shown
in order of appearance now. in order of appearance now.
* general: make use of the new KXmlCommand class for filters too. * general: make use of the new KXmlCommand class for filters too.
* filters: removed the "Page Size" from the options of enscript filter, * filters: removed the "Page Size" from the options of enscript filter,
this is taken from the KPrinter object now. 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: * general: finalized the new XML command mechanism:
. graphical command builder . graphical command builder
. pseudo-printers and filters are completely based on new XML . 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). previous mechanism are not used).
. KPrintFilter and KMFilterManager are now obsolete and replaced . KPrintFilter and KMFilterManager are now obsolete and replaced
by KXmlCommand and KXmlCommandManager respectively. 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). 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 * general: make use of "Detail" mechanism of KDialogBase in XML command
editor. 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 * instances: for root, instances are saved in global file
/etc/cups/lpoptions. This allows to easily create global instances /etc/cups/lpoptions. This allows to easily create global instances
(just be root and create the instance). (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 file, such that root is able to manage global pseudo printers. Locale
pseudo printers still override global ones if they have the same name. 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 * general: added error messages when the printer list cannot be retrieved
in print manager and print dialog. With CUPS, if the server is not in print manager and print dialog. With CUPS, if the server is not
running, an error message is shown to the user. running, an error message is shown to the user.
* CUPS: disabled all backends if no server is running. * 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 * general: preleminary support for external printer tool. Only escputil
at this moment. at this moment.
03/01/2002 Michael Goffioul <kdeprint@swing.be> 03/01/2002 Michael Goffioul <tdeprint@swing.be>
* general: * general:
. added a "ID name" label to the first dialog for command editing . added a "ID name" label to the first dialog for command editing
. put "View Printer Infos" in front of orientation and view type . 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 . added a WhatsThis help to the "Instances" tab briefly explaining
what's an instance. 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 * general: when filtering, the file type is checked against supported
formats. If the format is not supported, a warning is issued and the 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 user has the possibility to auto-convert the file to a supported
format. Consequence: you can now safely perform page selection on any 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. the file to PS.
* preview dialog: rewrote the code in a cleaner way, avoiding the use * preview dialog: rewrote the code in a cleaner way, avoiding the use
of a non toplevel main window. Preview dialog looks simpler now. New 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 Netscape. If files are given on the command line, this option is
forced unset. forced unset.
. added a "--nodialog" option for quick print. . 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) 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 * general: added (temporary) workaround for drawing problems in fixed
toolbars, until a real fix gets implemented: toolbars, until a real fix gets implemented:
static_cast<QWidget*>(tb)->layout()->setMargin(1); 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 * general: added KPrinter::autoConfigure(), to automatically configure
a KPrinter object without the need for a print dialog. 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 * slave: made case-insensitive for backward compatibility (old URLs may
come from history). Now print:/Classes should work OK. come from history). Now print:/Classes should work OK.
* CUPS: moved the IPP report to an separate dialog and added the * CUPS: moved the IPP report to an separate dialog and added the
possibility to print the result. 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 * started the implementation of a new LPR/LPRng plugin: this implementation
is designed to be modular to provide support for various systems like is designed to be modular to provide support for various systems like
Foomatic, APSFilter, GNUlpr or Printtool(RH). 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 * LPR: first implementation of a job manager. Make use of asynchronous
lpc and lpq processes. Major problem: delay between new state and 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 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. the default basename for output file.
* test: updated to Qt3 and demonstrate the use of the DocFileName feature * 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 * LPR: added basic implementation of a KPrinterImpl object -> plugin is
functional (though far from complete...) functional (though far from complete...)
22/01/2002 Michael Goffioul <kdeprint@swing.be> 22/01/2002 Michael Goffioul <tdeprint@swing.be>
* kdeprintfax: make use of new address book (libkabc) instead of the old * tdeprintfax: make use of new address book (libkabc) instead of the old
one (libkab). 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 * LPR: enhancement of the APSFilter handler. Still missing: setup the
options in the print command line options in the print command line
* wizard: removed the garbage '&' in last page * wizard: removed the garbage '&' in last page
* general: added SMB util functions -> to be used whenever it's * general: added SMB util functions -> to be used whenever it's
possible (CUPS plugin, Foomatic handler => TO BE DONE) 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 * general: use QGuardedPtr to keep KPrinterImpl object in KPrinter, this
should avoid some crashes. should avoid some crashes.
* LPR: * 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 . fix problem with rmote lpd queues: force lp=<empty string> in
printcap entry 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 * job viewer: fix crash when switching the print plugin elsewhere and
there's some jobs shown + fix refresh problem when switching plugin there's some jobs shown + fix refresh problem when switching plugin
* general: fix small bug when removing a filter in "Filters" page * 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 problem with non-docked vertical toolbars. Use plain QPushButton
instead, but this has some drawing problems in HighColor style. 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) * LPR: added support for LPRngTool+IFHP (not complete yet though)
* general: various fixes for crashes, inconsistencies, ... * general: various fixes for crashes, inconsistencies, ...
12/02/2002 Michael Goffioul <kdeprint@swing.be> 12/02/2002 Michael Goffioul <tdeprint@swing.be>
* kdeprintfax: added %email to possible command tags. The e-mail address * tdeprintfax: added %email to possible command tags. The e-mail address
is retrieved from standard settings in KControl module. The tag can is retrieved from standard settings in KControl module. The tag can
also be used in the "Name" field of the options dialog also be used in the "Name" field of the options dialog
* LPR: completion of the LPRngTool handler + implementation of dynamic * 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, * CUPS: configuration tool now handles gracefully unrecognized options,
a warning is issued, and they are restored as-is on file saving. 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 * CUPS: added support for job-billing and page-label, and put them
along with the scredule option into a single "Advanced" tab. along with the scredule option into a single "Advanced" tab.
* CUPS: added job billing info to the job viewer * CUPS: added job billing info to the job viewer
@ -383,23 +383,23 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
dialog dialog
* general: allow multi selection in the file list of print 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 * CUPS: added the possibility to edit job attributes on-the-fly using
a dialog similar to the printer properties dialog. Still the be fixed: a dialog similar to the printer properties dialog. Still the be fixed:
page ranges (problem with option encoding in CUPS). 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 * general: fixed infinite recursion bug in KIconSelectAction
* CUPS: temporarily disabled edition of page-ranges as it seems CUPS is * CUPS: temporarily disabled edition of page-ranges as it seems CUPS is
buggy. I should find a workaround. buggy. I should find a workaround.
* general (CUPS): enable some actions for jobs on remote hosts. It seems * 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. 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 * CUPS: added direct Foomatic driver support (no need the all PPD package
from foomatic anymore, driver are loaded directly from Foomatic) 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: * preview:
. better algorithm to find a preview object . better algorithm to find a preview object
. more comprehensive error report . 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 * general: added the backend stuff for printer filtering, needs GUI
-> allows to only show a selected set of printers -> 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 * general: simple printer filtering mechanism based on printer name
and location regexp. Graphical configuration for 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: * general:
. completion of the printer filtering mechanism (added location . completion of the printer filtering mechanism (added location
string filter) 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 . possibility to open the main option dialog from print dialog
(for example to change the filter or default preview program) (for example to change the filter or default preview program)
. added icon on push buttons when useful . 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 * slave: prevent konqueror to consider a trailing slash as a directory
specification (simply add a config entry in protocol file) specification (simply add a config entry in protocol file)
* general: large UI standardization by making use of KDialogBase along * general: large UI standardization by making use of KDialogBase along
with KGuiItem with KGuiItem
* kicker menu: possibility to open main Options Dialog from the menu * 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 * general: splitted the printer state into enable/disable and start/stop
and modified the GUI to reflect this and modified the GUI to reflect this
* general: removed the KMManager::configure(), obsoleted by the complete * 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 * kicker extension: extension of the menu plugin to allow access to the
server configuration tool as well as the "kprinter" utility. 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 * 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: printer filtering specs are now ORed instead of ANDed
* general: changed "Advanced" to "Driver Settings" * general: changed "Advanced" to "Driver Settings"
* CUPS: fixed RIPCache problem, added support for possible suffixes * 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 * CUPS: workaround to allow special characters in login/password without
breaking security. Possible now to use safely chars like '@' and '/' breaking security. Possible now to use safely chars like '@' and '/'
in login. in login.
* general: added a check box in the config dialog to enable/disable * general: added a check box in the config dialog to enable/disable
font embedding into PS data (compatible with Qt settings). 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 * general: job viewer updated correctly on plugin reload -> additional
columns and "history" action state columns and "history" action state
* general: internal *Settings objects are synchonized on config changes * 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 * general: improved feedback to user when creating driver DB
* CUPS: speed optimization when creating driver DB (simple hack to avoid * CUPS: speed optimization when creating driver DB (simple hack to avoid
to parse the entire PPD file each time => much better) 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 system
* general: various small UI improvements (suggested by Thomas) * 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 * general: modified the driver structure to support dynamic options
as in SuSE as in SuSE
* LPR: more management support for SuSE handler -> drver settings can * 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 * general: needed stuff to provide translations for filters (Coolo will
now extract the strings from XML files for translators) 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 * CUPS: allow any integer value for RIPCache + don't upload the cupsd.conf
with wrong settings with wrong settings
@ -480,7 +480,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* KDE-3 RELEASE * * KDE-3 RELEASE *
***************** *****************
(CeBIT) Michael Goffioul <kdeprint@swing.be> (CeBIT) Michael Goffioul <tdeprint@swing.be>
* Fix various crashes: * Fix various crashes:
. when changing the CUPS server (notify registered object before . when changing the CUPS server (notify registered object before
reloading) reloading)
@ -491,7 +491,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* general: started generealization of a margin widget to configure the * general: started generealization of a margin widget to configure the
margins of the KPrinter object 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 * general: do not use pointers in various views, to avoid dangling
pointers (and crashes) when changing something (plugin, config file, ...). pointers (and crashes) when changing something (plugin, config file, ...).
This makes the aboutToReload functions quite useless, but it has to 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 * 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 are connected to the main help (should probably add an anchor to go
directly to the associated part). directly to the associated part).
* kdeprintfax: more support/sync with standard addressbook: * tdeprintfax: more support/sync with standard addressbook:
. possibility to start the ab editor from kdeprintfax . possibility to start the ab editor from tdeprintfax
. make use of the "Organization" field as enterprise . make use of the "Organization" field as enterprise
. fix problem with empty phone number (ex: no business fax). . fix problem with empty phone number (ex: no business fax).
26/03/2002 Michael Goffioul <kdeprint@swing.be> 26/03/2002 Michael Goffioul <tdeprint@swing.be>
* kdeprintfax: * tdeprintfax:
. added support for Mgetty-sendfax . added support for Mgetty-sendfax
. added support for page size in filters . added support for page size in filters
. make use of the localized page size as default . 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 . bugfix in logview: behaves safely when closed using the title
bar button 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 * general: created a separate "Fonts" section in the KDEPrint settings
dialog and removed the "Embed Fonts" option from the general section dialog and removed the "Embed Fonts" option from the general section
(moved to the new 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. 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 * general: added a user feedback mechanism in the form of a dialog showgin
status messages, including initialization, number of the page currently status messages, including initialization, number of the page currently
generated, filtering and sending to the printer. 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 * general: enhanced the status feedback mechanism
. possibility to have multiple status boxes (one for each app) . possibility to have multiple status boxes (one for each app)
. added an icon (eye-candy) and the document name being printed . 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 current plugin below the plugin combobox (ex: in CUPS, shows the current
server:port). server:port).
02/04/2002 Michael Goffioul <kdeprint@swing.be> 02/04/2002 Michael Goffioul <tdeprint@swing.be>
* general: * general:
. fixed various conflicting shortcuts . fixed various conflicting shortcuts
. made KMVirtualManager inherit from KPReloadObject to force instance . 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 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). 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. * 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 No instance management is possible from the tree view itself. The user
still has to use the "Instances" tab. still has to use the "Instances" tab.
* ioslave: added support for print jobs browsing, per printer or for all * ioslave: added support for print jobs browsing, per printer or for all
printers together (-> print:/jobs) 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 * ioslave: added support to view the driver of a printer in HTML form
(print:/printers/lp1?driver) (print:/printers/lp1?driver)
* CUPS: allows editing of page-ranges for pending jobs, work around * 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) work with gpr (from GNUlpr)
. added support for "bool" directives in Foomatic drivers . 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 * job manager: added the possibility to control the username for jobs
filtering, and the possibility to limit the number of jobs shown. 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 * filters/command: added the possibility to have comments about a specific
command, including clickable URL's. Modified the command selector to use command, including clickable URL's. Modified the command selector to use
those comments. those comments.
@ -589,31 +589,31 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
even on first dialog showing (call slotPrinterSelected after setting even on first dialog showing (call slotPrinterSelected after setting
the output file name). the output file name).
20/08/2002 Michael Goffioul <kdeprint@swing.be> 20/08/2002 Michael Goffioul <tdeprint@swing.be>
* print dialog: * print dialog:
. added a method to disable a page in the main dialog . added a method to disable a page in the main dialog
. make the filename persistent in the SaveFile dialog . make the filename persistent in the SaveFile dialog
. use a rename dialog if the output file already exists . 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) * 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 * print dialog: added graphical interface to the poster XML command
(still to be committed) (still to be committed)
* manager: added a condensed toolbar with actions grouped by topics in * manager: added a condensed toolbar with actions grouped by topics in
sub-menus. 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 * print dialog: enabled preview even in standalone mode, either the
internal PS viewer or any other registered app will be used, internal PS viewer or any other registered app will be used,
according to the user preferences. 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 * commands: make unavailability of a command more visual by showing a
red text, and disabling the OK button of the current dialog (only red text, and disabling the OK button of the current dialog (only
if needed). 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" * CUPS: shows all possible URI detected by CUPS when selecting the "Others"
printer type in the wizard, like the web interface is doing. printer type in the wizard, like the web interface is doing.

@ -6,14 +6,14 @@ endif
SUBDIRS = . management lpdunix $(CUPSSUBDIR) lpr rlpr ext filters pics tools tests 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_tdeprintd_la_SOURCES = tdeprintd.skel tdeprintd.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_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_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_tdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
#kded_kdeprintd_la_METASOURCES = AUTO #kded_tdeprintd_la_METASOURCES = AUTO
lib_LTLIBRARIES = libtdeprint.la 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 \ kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \
kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp \ kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp \
kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.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 \ kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kmfactory.skel kxmlcommand.cpp \
util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp \ util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp \
kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.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 \ kmuimanager.h kmvirtualmanager.h driveritem.h droptionview.h \
driverview.h kprintpreview.h kprinterimpl.h kprintdialog.h \ driverview.h kprintpreview.h kprinterimpl.h kprintdialog.h \
kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.h \ kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.h \
kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h kdeprintd.h \ kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h tdeprintd.h \
kpfilterpage.h kmspecialmanager.h kdeprintcheck.h plugincombobox.h \ kpfilterpage.h kmspecialmanager.h tdeprintcheck.h plugincombobox.h \
kfilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \ kfilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \
util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \ util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \
marginvaluewidget.h kpmarginpage.h messagewindow.h \ marginvaluewidget.h kpmarginpage.h messagewindow.h \
@ -47,9 +47,9 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \
include_HEADERS = kprinter.h kprintaction.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 driver.h kmjobmanager.h kmjob.h
kdeprintdir = $(includedir)/kdeprint tdeprintdir = $(includedir)/tdeprint
EXTRA_DIST = fooparser.y fooscanner.l kprintpreviewui.rc EXTRA_DIST = fooparser.y fooscanner.l kprintpreviewui.rc
@ -61,22 +61,22 @@ uidatadir = $(kde_confdir)/ui
# Test page # Test page
printdata_DATA = testprint.ps specials.desktop printdata_DATA = testprint.ps specials.desktop
printdatadir = $(kde_datadir)/kdeprint printdatadir = $(kde_datadir)/tdeprint
# Services # Services
servicesdir = $(kde_servicesdir)/kded servicesdir = $(kde_servicesdir)/kded
services_DATA = kdeprintd.desktop services_DATA = tdeprintd.desktop
# Config file # Config file
configdir = $(kde_confdir) configdir = $(kde_confdir)
config_DATA = kdeprintrc config_DATA = tdeprintrc
# parser and scanner # parser and scanner
fooparser: fooparser:
rm -f fooparser.cpp.h 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 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 "#ifndef fooparser_cpp_h" > $(srcdir)/fooparser.cpp.hh
echo "#define 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 cat $(srcdir)/fooparser.cpp.h >> $(srcdir)/fooparser.cpp.hh
@ -85,30 +85,30 @@ fooparser:
ppdparser: ppdparser:
rm -f ppdparser.cpp.h 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 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 "#ifndef ppdparser_cpp_h" > $(srcdir)/ppdparser.cpp.hh
echo "#define 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 cat $(srcdir)/ppdparser.cpp.h >> $(srcdir)/ppdparser.cpp.hh
echo "#endif" >> $(srcdir)/ppdparser.cpp.hh echo "#endif" >> $(srcdir)/ppdparser.cpp.hh
mv $(srcdir)/ppdparser.cpp.hh $(srcdir)/ppdparser.cpp.h mv $(srcdir)/ppdparser.cpp.hh $(srcdir)/ppdparser.cpp.h
noinst_DATA = kdeprint noinst_DATA = tdeprint
kdeprint: tdeprint:
$(LN_S) $(srcdir)/management kdeprint $(LN_S) $(srcdir)/management tdeprint
# convenience static library # convenience static library
noinst_LIBRARIES = libdriverparse.a noinst_LIBRARIES = libdriverparse.a
libdriverparse_a_SOURCES = driverparse.c libdriverparse_a_SOURCES = driverparse.c
update_DATA = kdeprintrc.upd update_DATA = tdeprintrc.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/kconf_update
messages: rc.cpp messages: rc.cpp
$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> 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 include ../admin/Doxyfile.am

@ -16,14 +16,14 @@ WISHES
- Possibility to specify a different input slot for first page??? - 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 if this is possible in efax and/or hylafax
- add the possibility to view a printjob file (if possible) - add the possibility to view a printjob file (if possible)
- restarting server: use of "ps" in a subshell to get the pid, possibility - restarting server: use of "ps" in a subshell to get the pid, possibility
of authentification (put this into separate program that would restart 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 - CUPS: a "Printer/Server Debugging Helper" would be nice: you could
vary the LogLevel there, restart the server, provide a viewer vary the LogLevel there, restart the server, provide a viewer

@ -20,17 +20,17 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore/network ${CMAKE_SOURCE_DIR}/tdecore/network
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kdeprint ${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/kdeprint/management ${CMAKE_SOURCE_DIR}/tdeprint/management
) )
link_directories( link_directories(
@ -40,13 +40,13 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins )
install( FILES preview.png preview-mini.png DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) 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 set( ${target}_SRCS
cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp
@ -62,7 +62,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeprint_management-shared ${CUPS_LIBRARIES} LINK tdeprint_management-shared ${CUPS_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -77,7 +77,7 @@ set( ${target}_SRCS
tde_add_executable( ${target} tde_add_executable( ${target}
SOURCES ${${target}_SRCS} 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} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -92,6 +92,6 @@ set( ${target}_SRCS
tde_add_executable( ${target} tde_add_executable( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdefakes-shared ${CUPS_LIBRARIES} LINK tdefakes-shared ${CUPS_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -2,11 +2,11 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE
SUBDIRS = cupsdconf2 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 \ kmcupsmanager.cpp kmcupsuimanager.cpp kmpropbanners.cpp kmwbanners.cpp kmwipp.cpp \
kmwippselect.cpp kcupsprinterimpl.cpp kmcupsconfigwidget.cpp \ kmwippselect.cpp kcupsprinterimpl.cpp kmcupsconfigwidget.cpp \
kmconfigcups.cpp kmconfigcupsdir.cpp kmwippprinter.cpp kmwfax.cpp kmwquota.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 \ imagepreview.cpp imageposition.cpp kpimagepage.cpp \
kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \ kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
kptagspage.cpp kptagspage.cpp
kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined tdeprint_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) tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
kdeprint_cups_la_METASOURCES = AUTO tdeprint_cups_la_METASOURCES = AUTO
noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
kmpropbanners.h kmwbanners.h kmwipp.h kmwippselect.h kcupsprinterimpl.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 bin_PROGRAMS = make_driver_db_cups cupsdoprint
make_driver_db_cups_SOURCES = make_driver_db_cups.c 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) make_driver_db_cups_LDFLAGS = $(all_libraries)
cupsdoprint_SOURCES = cupsdoprint.c 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) cupsdoprint_LDFLAGS = $(all_libraries)
entry_DATA = cups.print entry_DATA = cups.print
entrydir = $(kde_datadir)/kdeprint/plugins entrydir = $(kde_datadir)/tdeprint/plugins
misc_DATA = preview.png preview-mini.png misc_DATA = preview.png preview-mini.png
miscdir = $(kde_datadir)/kdeprint miscdir = $(kde_datadir)/tdeprint
EXTRA_DIST = postscript.ppd.gz EXTRA_DIST = postscript.ppd.gz

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -14,9 +14,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile
@ -31,7 +31,7 @@ link_directories(
install( FILES install( FILES
kde_logo.png cups_logo.png cupsd.conf.template kde_logo.png cups_logo.png cupsd.conf.template
DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
#### cupsdconf ################################## #### cupsdconf ##################################
@ -48,7 +48,7 @@ set( ${target}_SRCS
cups-util.c qdirmultilineedit.cpp sizewidget.cpp main.cpp cups-util.c qdirmultilineedit.cpp sizewidget.cpp main.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kio-shared ${CUPS_LIBRARIES} LINK kio-shared ${CUPS_LIBRARIES}
) )

@ -4,7 +4,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includ
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = cupsdconf.la tdeinit_LTLIBRARIES = cupsdconf.la
# library creation # library creation
cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \ 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 # Data
cupsdconfdata_DATA = kde_logo.png cups_logo.png cupsd.conf.template cupsdconfdata_DATA = kde_logo.png cups_logo.png cupsd.conf.template
cupsdconfdatadir = $(kde_datadir)/kdeprint cupsdconfdatadir = $(kde_datadir)/tdeprint
# Translations # Translations
messages: messages:

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -5,7 +5,7 @@
# in KDEPrint. The predecessors to KDEPrint in former KDE releases # in KDEPrint. The predecessors to KDEPrint in former KDE releases
# were KUPS and QtCUPS; they are deprecated and no longer maintained. # 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/ # Web site: http://printing.kde.org/
# #

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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")); setPageLabel(i18n("Browsing"));
setHeader(i18n("Browsing Settings")); setHeader(i18n("Browsing Settings"));
setPixmap("kdeprint_printer_remote"); setPixmap("tdeprint_printer_remote");
browseinterval_ = new KIntNumInput(this); browseinterval_ = new KIntNumInput(this);
browseport_ = new KIntNumInput(this); browseport_ = new KIntNumInput(this);

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -114,7 +114,7 @@ bool CupsdComment::loadComments()
{ {
comments_.setAutoDelete(true); comments_.setAutoDelete(true);
comments_.clear(); 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)) if (f.exists() && f.open(IO_ReadOnly))
{ {
Comment *comm; Comment *comm;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line)
bool CupsdConf::loadAvailableResources() bool CupsdConf::loadAvailableResources()
{ {
KConfig conf("kdeprintrc"); KConfig conf("tdeprintrc");
conf.setGroup("CUPS"); conf.setGroup("CUPS");
TQString host = conf.readEntry("Host",cupsServer()); TQString host = conf.readEntry("Host",cupsServer());
int port = conf.readNumEntry("Port",ippPort()); int port = conf.readNumEntry("Port",ippPort());
@ -876,9 +876,9 @@ TQString CupsResource::typeToIconName(int type)
case RESOURCE_GLOBAL: case RESOURCE_GLOBAL:
return TQString("folder"); return TQString("folder");
case RESOURCE_PRINTER: case RESOURCE_PRINTER:
return TQString("kdeprint_printer"); return TQString("tdeprint_printer");
case RESOURCE_CLASS: case RESOURCE_CLASS:
return TQString("kdeprint_printer_class"); return TQString("tdeprint_printer_class");
} }
return TQString("folder"); return TQString("folder");
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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) CupsdDialog::CupsdDialog(TQWidget *parent, const char *name)
: KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) : 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"); KGlobal::locale()->insertCatalogue("cupsdconf");
setShowIconsInTreeList(true); setShowIconsInTreeList(true);
@ -208,7 +208,7 @@ bool CupsdDialog::restartServer(TQString& msg)
{ {
bool success = false; bool success = false;
KProcess proc; 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(); success = proc.start( KProcess::Block ) && proc.normalExit();
if( !success ) if( !success )
msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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_); main_->addLayout(sub_);
TQLabel *cupslogo_ = new TQLabel(this); 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_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
cupslogo_->tqsetAlignment(Qt::AlignCenter); cupslogo_->tqsetAlignment(Qt::AlignCenter);
TQLabel *kupslogo_ = new TQLabel(this); 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_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
kupslogo_->tqsetAlignment(Qt::AlignCenter); kupslogo_->tqsetAlignment(Qt::AlignCenter);

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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; char *_user = shell_quote( cupsUser() ), *_passwd = NULL;
FILE *output; 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, _user,
cupsServer(), cupsServer(),
ippPort(), ippPort(),

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -46,7 +46,7 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name)
position_ = Center; position_ = Center;
setMinimumSize(tqsizeHint()); setMinimumSize(tqsizeHint());
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
pix_.load(locate("data", "kdeprint/preview-mini.png")); pix_.load(locate("data", "tdeprint/preview-mini.png"));
} }
ImagePosition::~ImagePosition() ImagePosition::~ImagePosition()

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -154,7 +154,7 @@ void IppRequest::init()
request_ = 0; request_ = 0;
} }
request_ = ippNew(); 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(); TQCString langstr = KGlobal::locale()->language().latin1();
cups_lang_t* lang = cupsLangGet(langstr.data()); cups_lang_t* lang = cupsLangGet(langstr.data());
// default charset to UTF-8 (ugly hack) // default charset to UTF-8 (ugly hack)

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -26,5 +26,5 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products; 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" ) )

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -285,7 +285,7 @@ TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *c
TQValueList<KAction*> list; TQValueList<KAction*> list;
KAction *act(0); 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"); act->setGroup("plugin");
list << (act = new PluginAction(1, i18n("&Increase Priority"), "up", 0, coll, "plugin_prioup")); list << (act = new PluginAction(1, i18n("&Increase Priority"), "up", 0, coll, "plugin_prioup"));
act->setGroup("plugin"); act->setGroup("plugin");

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -846,9 +846,9 @@ TQStringList KMCupsManager::detectLocalPrinters()
void KMCupsManager::createPluginActions(KActionCollection *coll) 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->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"); act->setGroup("plugin");
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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_title = i18n("Users");
m_header = i18n("Users Access Settings"); m_header = i18n("Users Access Settings");
m_pixmap = "kdeprint_printer_users"; m_pixmap = "tdeprint_printer_users";
} }
KMPropUsers::~KMPropUsers() KMPropUsers::~KMPropUsers()

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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->setPaper(tqcolorGroup().background());
m_info->setMinimumHeight(100); m_info->setMinimumHeight(100);
m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>")); 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_ippreport->setEnabled(false);
m_scanner = new NetworkScanner( 631, this ); m_scanner = new NetworkScanner( 631, this );
@ -140,7 +140,7 @@ void KMWIppPrinter::slotScanFinished()
else else
name = it.current()->Name; name = it.current()->Name;
TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); 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"));
} }
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -84,7 +84,7 @@ void KMWIppSelect::initPrinter(KMPrinter *p)
while (attr) while (attr)
{ {
if (attr->name && strcmp(attr->name,"printer-name") == 0) 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; attr = attr->next;
} }
m_list->sort(); m_list->sort();

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -97,7 +97,7 @@ void KMWOther::initPrinter(KMPrinter *p)
if ( cl == "network" ) if ( cl == "network" )
parent->setPixmap( 0, SmallIcon( "network" ) ); parent->setPixmap( 0, SmallIcon( "network" ) );
else if ( cl == "direct" ) else if ( cl == "direct" )
parent->setPixmap( 0, SmallIcon( "kdeprint_computer" ) ); parent->setPixmap( 0, SmallIcon( "tdeprint_computer" ) );
else if ( cl == "serial" ) else if ( cl == "serial" )
parent->setPixmap( 0, SmallIcon( "usb" ) ); parent->setPixmap( 0, SmallIcon( "usb" ) );
else else

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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_hue->setEnabled(useColor);
m_saturation->setEnabled(useColor); m_saturation->setEnabled(useColor);
TQImage img(locate("data", "kdeprint/preview.png")); TQImage img(locate("data", "tdeprint/preview.png"));
m_preview->setImage(img); m_preview->setImage(img);
KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox);

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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) 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)); m_prettypix->setPixmap(UserIcon(iconstr));
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -17,11 +17,11 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kdeprint ${CMAKE_SOURCE_DIR}/tdeprint
) )
link_directories( link_directories(
@ -31,12 +31,12 @@ link_directories(
##### other data ################################ ##### 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 set( ${target}_SRCS
kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp
@ -45,6 +45,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeprint-shared LINK tdeprint-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,15 +1,15 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE 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 tdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined tdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE) tdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
kdeprint_ext_la_METASOURCES = AUTO tdeprint_ext_la_METASOURCES = AUTO
noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
entry_DATA = ext.print entry_DATA = ext.print
entrydir = $(kde_datadir)/kdeprint/plugins entrydir = $(kde_datadir)/tdeprint/plugins

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -24,5 +24,5 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
typedef K_TYPELIST_3( KMExtManager, KMExtUiManager, KExtPrinterImpl ) Products; typedef K_TYPELIST_3( KMExtManager, KMExtUiManager, KExtPrinterImpl ) Products;
K_EXPORT_COMPONENT_FACTORY( kdeprint_ext, KGenericFactory< Products > ) K_EXPORT_COMPONENT_FACTORY( tdeprint_ext, KGenericFactory< Products > )

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -18,6 +18,6 @@ install( FILES
psbook2.xml psbook.desktop psbook.xml psselect.desktop psbook2.xml psbook.desktop psbook.xml psselect.desktop
psselect.xml ps2pdf.desktop ps2pdf.xml pdf2ps.desktop psselect.xml ps2pdf.desktop ps2pdf.xml pdf2ps.desktop
pdf2ps.xml poster.desktop poster.xml 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} ) install( PROGRAMS imagetops DESTINATION ${BIN_INSTALL_DIR} )

@ -1,4 +1,4 @@
filtersdir = $(kde_datadir)/kdeprint/filters filtersdir = $(kde_datadir)/tdeprint/filters
filters_DATA = enscript.desktop enscript.xml\ filters_DATA = enscript.desktop enscript.xml\
psnup.desktop psnup.xml \ psnup.desktop psnup.xml \
imagetops.desktop imagetops.xml \ imagetops.desktop imagetops.xml \

@ -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 \ kmfoomaticmanager.cpp \
kfoomaticprinterimpl.cpp kfoomaticprinterimpl.cpp
kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined tdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la tdeprint_foomatic_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la
kdeprint_foomatic_la_METASOURCES = AUTO tdeprint_foomatic_la_METASOURCES = AUTO
noinst_HEADERS = kmfoomaticmanager.h \ noinst_HEADERS = kmfoomaticmanager.h \
kfoomaticprinterimpl.h kfoomaticprinterimpl.h
@ -17,4 +17,4 @@ bin_PROGRAMS = make_driver_db_foomatic
make_driver_db_foomatic_SOURCES = make_driver_db_foomatic.c make_driver_db_foomatic_SOURCES = make_driver_db_foomatic.c
entry_DATA = foomatic.print entry_DATA = foomatic.print
entrydir = $(kde_datadir)/kdeprint/plugins entrydir = $(kde_datadir)/tdeprint/plugins

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -23,5 +23,5 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
typedef K_TYPELIST_2( KMFoomaticManager, KFoomaticPrinterImpl ) Products; typedef K_TYPELIST_2( KMFoomaticManager, KFoomaticPrinterImpl ) Products;
K_EXPORT_COMPONENT_FACTORY( kdeprint_foomatic, KGenericFactory< Products > ) K_EXPORT_COMPONENT_FACTORY( tdeprint_foomatic, KGenericFactory< Products > )

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -26,8 +26,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
void kdeprint_foomatic2scanner_init( TQIODevice* ); void tdeprint_foomatic2scanner_init( TQIODevice* );
void kdeprint_foomatic2scanner_terminate(); void tdeprint_foomatic2scanner_terminate();
Foomatic2Loader::Foomatic2Loader() Foomatic2Loader::Foomatic2Loader()
{ {
@ -41,10 +41,10 @@ bool Foomatic2Loader::read( TQIODevice *d )
{ {
bool result = true; bool result = true;
m_foodata.clear(); m_foodata.clear();
kdeprint_foomatic2scanner_init( d ); tdeprint_foomatic2scanner_init( d );
if ( kdeprint_foomatic2parse( this ) != 0 ) if ( tdeprint_foomatic2parse( this ) != 0 )
result = false; result = false;
kdeprint_foomatic2scanner_terminate(); tdeprint_foomatic2scanner_terminate();
return result; return result;
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -46,7 +46,7 @@ public:
private: private:
TQMap<TQString,TQVariant> m_foodata; 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* createValue( const TQString&, const TQMap<TQString,TQVariant>& ) const;
DrBase* createOption( const TQMap<TQString,TQVariant>& ) const; DrBase* createOption( const TQMap<TQString,TQVariant>& ) const;
}; };

@ -4,13 +4,13 @@
#define YYBISON 1 /* Identify Bison output. */ #define YYBISON 1 /* Identify Bison output. */
#define yyparse kdeprint_foomatic2parse #define yyparse tdeprint_foomatic2parse
#define yylex kdeprint_foomatic2lex #define yylex tdeprint_foomatic2lex
#define yyerror kdeprint_foomatic2error #define yyerror tdeprint_foomatic2error
#define yylval kdeprint_foomatic2lval #define yylval tdeprint_foomatic2lval
#define yychar kdeprint_foomatic2char #define yychar tdeprint_foomatic2char
#define yydebug kdeprint_foomatic2debug #define yydebug tdeprint_foomatic2debug
#define yynerrs kdeprint_foomatic2nerrs #define yynerrs tdeprint_foomatic2nerrs
#define VAR 257 #define VAR 257
#define STRING 258 #define STRING 258
#define NUMBER 259 #define NUMBER 259
@ -22,7 +22,7 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -11,5 +11,5 @@
#define QUOTED 262 #define QUOTED 262
extern YYSTYPE kdeprint_foomatic2lval; extern YYSTYPE tdeprint_foomatic2lval;
#endif #endif

@ -1,7 +1,7 @@
%{ %{
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,19 +1,19 @@
#define yy_create_buffer kdeprint_foomatic2_create_buffer #define yy_create_buffer tdeprint_foomatic2_create_buffer
#define yy_delete_buffer kdeprint_foomatic2_delete_buffer #define yy_delete_buffer tdeprint_foomatic2_delete_buffer
#define yy_scan_buffer kdeprint_foomatic2_scan_buffer #define yy_scan_buffer tdeprint_foomatic2_scan_buffer
#define yy_scan_string kdeprint_foomatic2_scan_string #define yy_scan_string tdeprint_foomatic2_scan_string
#define yy_scan_bytes kdeprint_foomatic2_scan_bytes #define yy_scan_bytes tdeprint_foomatic2_scan_bytes
#define yy_flex_debug kdeprint_foomatic2_flex_debug #define yy_flex_debug tdeprint_foomatic2_flex_debug
#define yy_init_buffer kdeprint_foomatic2_init_buffer #define yy_init_buffer tdeprint_foomatic2_init_buffer
#define yy_flush_buffer kdeprint_foomatic2_flush_buffer #define yy_flush_buffer tdeprint_foomatic2_flush_buffer
#define yy_load_buffer_state kdeprint_foomatic2_load_buffer_state #define yy_load_buffer_state tdeprint_foomatic2_load_buffer_state
#define yy_switch_to_buffer kdeprint_foomatic2_switch_to_buffer #define yy_switch_to_buffer tdeprint_foomatic2_switch_to_buffer
#define yyin kdeprint_foomatic2in #define yyin tdeprint_foomatic2in
#define yyleng kdeprint_foomatic2leng #define yyleng tdeprint_foomatic2leng
#define yylex kdeprint_foomatic2lex #define yylex tdeprint_foomatic2lex
#define yyout kdeprint_foomatic2out #define yyout tdeprint_foomatic2out
#define yyrestart kdeprint_foomatic2restart #define yyrestart tdeprint_foomatic2restart
#define yytext kdeprint_foomatic2text #define yytext tdeprint_foomatic2text
#line 19 "./fooscanner.cpp" #line 19 "./fooscanner.cpp"
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
@ -427,7 +427,7 @@ char *yytext;
#line 2 "./fooscanner.l" #line 2 "./fooscanner.l"
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -449,13 +449,13 @@ char *yytext;
#define YYSTYPE QVariant #define YYSTYPE QVariant
#include "fooparser.cpp.h" #include "fooparser.cpp.h"
#define yylval kdeprint_foomatic2lval #define yylval tdeprint_foomatic2lval
#define YY_INPUT( buf, result, max_size ) \ #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 ) \ if ( result < 0 ) \
result = 0; \ result = 0; \
} \ } \
@ -463,7 +463,7 @@ char *yytext;
result = 0; \ result = 0; \
} }
TQIODevice* kdeprint_foomatic2scanner_device = NULL; TQIODevice* tdeprint_foomatic2scanner_device = NULL;
#line 468 "./fooscanner.cpp" #line 468 "./fooscanner.cpp"
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
@ -1696,12 +1696,12 @@ int main()
#line 73 "./fooscanner.l" #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;
} }

@ -1,7 +1,7 @@
%{ %{
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -23,13 +23,13 @@
#define YYSTYPE QVariant #define YYSTYPE QVariant
#include "fooparser.cpp.h" #include "fooparser.cpp.h"
#define yylval kdeprint_foomatic2lval #define yylval tdeprint_foomatic2lval
#define YY_INPUT( buf, result, max_size ) \ #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 ) \ if ( result < 0 ) \
result = 0; \ result = 0; \
} \ } \
@ -37,7 +37,7 @@
result = 0; \ result = 0; \
} }
QIODevice* kdeprint_foomatic2scanner_device = NULL; QIODevice* tdeprint_foomatic2scanner_device = NULL;
%} %}
%option noyywrap %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;
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -36,7 +36,7 @@
* - run:/<execname> -> check for a running executable * - run:/<execname> -> check for a running executable
*/ */
#include "kdeprintcheck.h" #include "tdeprintcheck.h"
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kdebug.h> #include <kdebug.h>

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#include "kdeprintd.h" #include "tdeprintd.h"
#include "kprintprocess.h" #include "kprintprocess.h"
#include <tqfile.h> #include <tqfile.h>
@ -42,7 +42,7 @@
extern "C" extern "C"
{ {
KDE_EXPORT KDEDModule *create_kdeprintd(const TQCString& name) KDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name)
{ {
return new KDEPrintd(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 ) ); KURL url( re.cap( 1 ) );
if ( !url.isLocalFile() ) 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 ) ); command.replace( re, KProcess::quote( tmpFilename ) );
proc->setOutput( re.cap( 1 ) ); proc->setOutput( re.cap( 1 ) );
proc->setTempOutput( tmpFilename ); proc->setTempOutput( tmpFilename );
@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files)
i18n("Provide root's Password"), i18n("Provide root's Password"),
"provideRootsPassword") == KMessageBox::Continue) "provideRootsPassword") == KMessageBox::Continue)
{ {
cmd = ("kdesu -c " + KProcess::quote(cmd)); cmd = ("tdesu -c " + KProcess::quote(cmd));
break; break;
} }
else 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; kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl;
} }
#include "kdeprintd.moc" #include "tdeprintd.moc"

@ -3,8 +3,8 @@ Type=Service
ServiceTypes=KDEDModule ServiceTypes=KDEDModule
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kdeprintd X-KDE-Library=tdeprintd
X-KDE-FactoryName=kdeprintd X-KDE-FactoryName=tdeprintd
X-KDE-Kded-autoload=false X-KDE-Kded-autoload=false
X-KDE-Kded-load-on-demand=true X-KDE-Kded-load-on-demand=true

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,5 +1,5 @@
Id=kde-3.1-toolbar Id=kde-3.1-toolbar
File=kdeprintrc File=tdeprintrc
Group=General Group=General
Options=copy Options=copy
Key=ViewToolBar,ViewMenuBar Key=ViewToolBar,ViewMenuBar

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -24,7 +24,7 @@
#include "kprinterimpl.h" #include "kprinterimpl.h"
#include "kprinter.h" #include "kprinter.h"
#include "kpreloadobject.h" #include "kpreloadobject.h"
#include "kdeprintcheck.h" #include "tdeprintcheck.h"
#include "kxmlcommand.h" #include "kxmlcommand.h"
#include <tqdir.h> #include <tqdir.h>
@ -113,8 +113,8 @@ KMFactory::KMFactory()
if ( !ok ) if ( !ok )
settings.writeEntry( "/qt/embedFonts", true ); settings.writeEntry( "/qt/embedFonts", true );
KGlobal::iconLoader()->addAppDir("kdeprint"); KGlobal::iconLoader()->addAppDir("tdeprint");
KGlobal::locale()->insertCatalogue("kdeprint"); KGlobal::locale()->insertCatalogue("tdeprint");
// create DCOP signal connection // create DCOP signal connection
connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false);
@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst)
if (sys.isEmpty()) if (sys.isEmpty())
// load default configured print plugin // load default configured print plugin
sys = printSystem(); 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)); m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname));
if (!m_factory) if (!m_factory)
{ {
@ -228,7 +228,7 @@ KConfig* KMFactory::printConfig(const TQString& group)
{ {
if (!m_printconfig) if (!m_printconfig)
{ {
m_printconfig = new KConfig("kdeprintrc"); m_printconfig = new KConfig("tdeprintrc");
Q_CHECK_PTR(m_printconfig); Q_CHECK_PTR(m_printconfig);
} }
if (!group.isEmpty()) if (!group.isEmpty())
@ -295,7 +295,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst)
TQValueList<KMFactory::PluginInfo> KMFactory::pluginList() 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; TQValueList<PluginInfo> list;
for (uint i=0; i<d.count(); i++) for (uint i=0; i<d.count(); i++)
{ {
@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name)
{ {
TQString path(name); TQString path(name);
if (path[0] != '/') 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); KSimpleConfig conf(path);
PluginInfo info; PluginInfo info;
@ -339,7 +339,7 @@ void KMFactory::registerObject(KPReloadObject *obj, bool priority)
m_objects.prepend(obj); m_objects.prepend(obj);
else else
m_objects.append(obj); 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) // remove object from list (not deleted as autoDelete is false)
m_objects.removeRef(obj); 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() 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 ) 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: * We do not use an internal event loop for 2 potential problems:
* - the MessageWindow modality (appearing afterwards, it pops up on top * - the MessageWindow modality (appearing afterwards, it pops up on top
* of the password dialog) * of the password dialog)
* - KMTimer should be stopped, but it's unavailable from this object * - 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() ) if ( reply.isValid() )
{ {
TQString replyString = reply; 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 ) 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: * We do not use an internal event loop for 2 potential problems:
* - the MessageWindow modality (appearing afterwards, it pops up on top * - the MessageWindow modality (appearing afterwards, it pops up on top
* of the password dialog) * of the password dialog)
* - KMTimer should be stopped, but it's unavailable from this object * - 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" #include "kmfactory.moc"

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -78,7 +78,7 @@ TQString KMJob::pixmap()
return TQString::tqfromLatin1("exec"); return TQString::tqfromLatin1("exec");
// normal case // normal case
QString str("kdeprint_job"); QString str("tdeprint_job");
switch (m_state) switch (m_state)
{ {
case KMJob::Printing: case KMJob::Printing:

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -27,7 +27,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqvaluevector.h> #include <tqvaluevector.h>
#include <kdeprint/kmobject.h> #include <tdeprint/kmobject.h>
#include <kdelibs_export.h> #include <kdelibs_export.h>
/** /**

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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) if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213)
{ {
f.close(); f.close();
destname = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8);
f.setName(destname); f.setName(destname);
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
@ -422,7 +422,7 @@ TQString KMManager::testPage()
conf->setGroup("General"); conf->setGroup("General");
QString tpage = conf->readPathEntry("TestPage"); QString tpage = conf->readPathEntry("TestPage");
if (tpage.isEmpty()) if (tpage.isEmpty())
tpage = locate("data","kdeprint/testprint.ps"); tpage = locate("data","tdeprint/testprint.ps");
return tpage; return tpage;
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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 #warning internal header, do not use except if you are a KDEPrint developer
#endif #endif
#include <kdeprint/kmprinter.h> #include <tdeprint/kmprinter.h>
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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; if (!m_pixmap.isEmpty()) return m_pixmap;
QString str("kdeprint_printer"); QString str("tdeprint_printer");
if (!isValid()) str.append("_defect"); if (!isValid()) str.append("_defect");
else else
{ {

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -29,7 +29,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kurl.h> #include <kurl.h>
#include <tqmap.h> #include <tqmap.h>
#include <kdeprint/kmobject.h> #include <tdeprint/kmobject.h>
class KMDBEntry; class KMDBEntry;
class DrMain; class DrMain;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -20,7 +20,7 @@
#include "kmspecialmanager.h" #include "kmspecialmanager.h"
#include "kmmanager.h" #include "kmmanager.h"
#include "kmprinter.h" #include "kmprinter.h"
#include "kdeprintcheck.h" #include "tdeprintcheck.h"
#include "kxmlcommand.h" #include "kxmlcommand.h"
#include "driver.h" #include "driver.h"
@ -46,11 +46,11 @@ bool KMSpecialManager::savePrinters()
QString confname; QString confname;
if (getuid() == 0) if (getuid() == 0)
{ {
confname = locate("data", "kdeprint/specials.desktop"); confname = locate("data", "tdeprint/specials.desktop");
if (confname.startsWith(KGlobal::dirs()->localkdedir())) if (confname.startsWith(KGlobal::dirs()->localkdedir()))
{ {
// seems there's a problem here // 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 " "local KDE directory. This file probably comes from a previous KDE "
"release and should be removed in order to manage global pseudo " "release and should be removed in order to manage global pseudo "
"printers.")); "printers."));
@ -58,7 +58,7 @@ bool KMSpecialManager::savePrinters()
} }
} }
else else
confname = locateLocal("data","kdeprint/specials.desktop"); confname = locateLocal("data","tdeprint/specials.desktop");
KSimpleConfig conf(confname); KSimpleConfig conf(confname);
@ -108,7 +108,7 @@ bool KMSpecialManager::loadPrinters()
bool result(true); bool result(true);
TQString localDir = KGlobal::dirs()->localkdedir(); 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 // local files should processed last, so we need to reorder the list
// and put local files at the end // and put local files at the end
TQStringList orderedFiles; TQStringList orderedFiles;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob()
TQString KMThreadJob::jobFile() TQString KMThreadJob::jobFile()
{ {
QString f = locateLocal("data","kdeprint/printjobs"); QString f = locateLocal("data","tdeprint/printjobs");
return f; return f;
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -270,7 +270,7 @@ void KPCopiesPage::slotRangeEntered()
void KPCopiesPage::slotCollateClicked() void KPCopiesPage::slotCollateClicked()
{ {
TQString s("kdeprint_"); TQString s("tdeprint_");
s.append((m_collate->isChecked() ? "collate" : "uncollate")); s.append((m_collate->isChecked() ? "collate" : "uncollate"));
if (m_order->isChecked()) s.append("_reverse"); if (m_order->isChecked()) s.append("_reverse");
m_collatepix->setPixmap(UserIcon(s)); m_collatepix->setPixmap(UserIcon(s));

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -21,7 +21,7 @@
#define KPCOPIESPAGE_H #define KPCOPIESPAGE_H
#include "kprintdialogpage.h" #include "kprintdialogpage.h"
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
class TQRadioButton; class TQRadioButton;
class TQLineEdit; class TQLineEdit;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -696,11 +696,11 @@ void KPGeneralPage::slotOrientationChanged(int ID)
TQString iconstr; TQString iconstr;
switch (ID) switch (ID)
{ {
case ORIENT_PORTRAIT_ID: iconstr = "kdeprint_portrait"; break; case ORIENT_PORTRAIT_ID: iconstr = "tdeprint_portrait"; break;
case ORIENT_LANDSCAPE_ID: iconstr = "kdeprint_landscape"; break; case ORIENT_LANDSCAPE_ID: iconstr = "tdeprint_landscape"; break;
case ORIENT_REVPORTRAIT_ID: iconstr = "kdeprint_revportrait"; break; case ORIENT_REVPORTRAIT_ID: iconstr = "tdeprint_revportrait"; break;
case ORIENT_REVLANDSCAPE_ID: iconstr = "kdeprint_revlandscape"; break; case ORIENT_REVLANDSCAPE_ID: iconstr = "tdeprint_revlandscape"; break;
default: iconstr = "kdeprint_portrait"; break; default: iconstr = "tdeprint_portrait"; break;
} }
m_orientpix->setPixmap(UserIcon(iconstr)); m_orientpix->setPixmap(UserIcon(iconstr));
} }
@ -710,10 +710,10 @@ void KPGeneralPage::slotNupChanged(int ID)
TQString iconstr; TQString iconstr;
switch (ID) switch (ID)
{ {
case NUP_1_ID: iconstr = "kdeprint_nup1"; break; case NUP_1_ID: iconstr = "tdeprint_nup1"; break;
case NUP_2_ID: iconstr = "kdeprint_nup2"; break; case NUP_2_ID: iconstr = "tdeprint_nup2"; break;
case NUP_4_ID: iconstr = "kdeprint_nup4"; break; case NUP_4_ID: iconstr = "tdeprint_nup4"; break;
default: iconstr = "kdeprint_nup1"; break; default: iconstr = "tdeprint_nup1"; break;
} }
m_nuppix->setPixmap(UserIcon(iconstr)); m_nuppix->setPixmap(UserIcon(iconstr));
} }
@ -725,10 +725,10 @@ void KPGeneralPage::slotDuplexChanged(int ID)
TQString iconstr; TQString iconstr;
switch (ID) switch (ID)
{ {
case DUPLEX_NONE_ID: iconstr = "kdeprint_duplex_none"; break; case DUPLEX_NONE_ID: iconstr = "tdeprint_duplex_none"; break;
case DUPLEX_LONG_ID: iconstr = "kdeprint_duplex_long"; break; case DUPLEX_LONG_ID: iconstr = "tdeprint_duplex_long"; break;
case DUPLEX_SHORT_ID: iconstr = "kdeprint_duplex_short"; break; case DUPLEX_SHORT_ID: iconstr = "tdeprint_duplex_short"; break;
default: iconstr = "kdeprint_duplex_none"; break; default: iconstr = "tdeprint_duplex_none"; break;
} }
m_duplexpix->setPixmap(UserIcon(iconstr)); m_duplexpix->setPixmap(UserIcon(iconstr));
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -225,12 +225,12 @@ void KPQtPage::init()
void KPQtPage::slotOrientationChanged(int ID) 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) 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) void KPQtPage::slotNupChanged(int ID)
@ -238,10 +238,10 @@ void KPQtPage::slotNupChanged(int ID)
QString pixstr; QString pixstr;
switch (ID) switch (ID)
{ {
case NUP_1: pixstr = "kdeprint_nup1"; break; case NUP_1: pixstr = "tdeprint_nup1"; break;
case NUP_2: pixstr = "kdeprint_nup2"; break; case NUP_2: pixstr = "tdeprint_nup2"; break;
case NUP_4: pixstr = "kdeprint_nup4"; break; case NUP_4: pixstr = "tdeprint_nup4"; break;
case NUP_OTHER: pixstr = "kdeprint_nupother"; break; case NUP_OTHER: pixstr = "tdeprint_nupother"; break;
} }
m_nuppix->setPixmap(UserIcon(pixstr)); m_nuppix->setPixmap(UserIcon(pixstr));
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -20,7 +20,7 @@
#include "kprintaction.h" #include "kprintaction.h"
#include <kprinter.h> #include <kprinter.h>
#include <kdeprint/kmmanager.h> #include <tdeprint/kmmanager.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <klocale.h> #include <klocale.h>

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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); m_printerlabel->setBuddy(d->m_printers);
d->m_properties = new KPushButton(KGuiItem(i18n("P&roperties"), "edit"), m_pbox); d->m_properties = new KPushButton(KGuiItem(i18n("P&roperties"), "edit"), m_pbox);
TQWhatsThis::add( d->m_properties, whatsThisPrintJobProperties); 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); 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); TQWhatsThis::add(d->m_default,whatsThisSetDefaultPrinter);
d->m_filter = new TQPushButton(m_pbox); d->m_filter = new TQPushButton(m_pbox);
d->m_filter->setPixmap(SmallIcon("filter")); d->m_filter->setPixmap(SmallIcon("filter"));
@ -914,7 +914,7 @@ void KPrintDialog::slotToggleFilter(bool on)
void KPrintDialog::slotHelp() void KPrintDialog::slotHelp()
{ {
kapp->invokeHelp(TQString::null, "kdeprint"); kapp->invokeHelp(TQString::null, "tdeprint");
} }
void KPrintDialog::slotOutputFileSelected(const TQString& txt) void KPrintDialog::slotOutputFileSelected(const TQString& txt)

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -26,7 +26,7 @@
#include <kdialog.h> #include <kdialog.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
class KPrinter; class KPrinter;
class KPrintDialogPage; class KPrintDialogPage;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -39,7 +39,7 @@ class DrMain;
* "kde-appname-optionname" for internal reasons. * "kde-appname-optionname" for internal reasons.
* *
* \code * \code
* #include <kdeprint/kprintdialogpage.h> * #include <tdeprint/kprintdialogpage.h>
* *
* class MyDialogPage : public KPrintDialogPage * class MyDialogPage : public KPrintDialogPage
* { * {

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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 << "-d";
args << printerName(); args << printerName();
args << "--noshow"; args << "--noshow";
kapp->kdeinitExec("kjobviewer", args); kapp->tdeinitExec("kjobviewer", args);
} }
} }
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -30,7 +30,7 @@
#include <kdemacros.h> #include <kdemacros.h>
#include <kdelibs_export.h> #include <kdelibs_export.h>
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
class KPrinterImpl; class KPrinterImpl;
class KPrintDialogPage; class KPrintDialogPage;
@ -78,7 +78,7 @@ class DrPageSize;
* of the print dialog to integrate application specific print options. This is done by subclassing * of the print dialog to integrate application specific print options. This is done by subclassing
* KPrintDialogPage and adding the page using addDialogPage(). * 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. * 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. * @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 * page selection will be enabled in the print dialog, otherwise it will be
* disabled. However some applications (word processor) can do page selection * disabled. However some applications (word processor) can do page selection
* themselves, then it will be enabled in the print dialog, whatever the * 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: * feature:
* @li @p ApplicationSide: the application will do page selection * @li @p ApplicationSide: the application will do page selection
* @li @p SystemSide: page selection will be left to the print system, if available (default) * @li @p SystemSide: page selection will be left to the print system, if available (default)

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * 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) 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; int result = 0;
DCOPClient *dclient = kapp->dcopClient(); DCOPClient *dclient = kapp->dcopClient();
@ -209,7 +209,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool
arg << cmd; arg << cmd;
arg << files; arg << files;
arg << removeflag; 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") 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) 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(); KConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("General"); conf->setGroup("General");
if (!conf->readBoolEntry("ShowStatusMsg", true)) if (!conf->readBoolEntry("ShowStatusMsg", true))
@ -243,7 +243,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
arg << message; arg << message;
arg << (int)getpid(); arg << (int)getpid();
arg << kapp->caption(); 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) 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. "); TQString msg = i18n("Unable to start child print process. ");
if (pid == 0) 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 else
msg += i18n("1 is the command that <files> is given to", "Check the command syntax:\n%1 <files>").arg(cmd); msg += i18n("1 is the command that <files> is given to", "Check the command syntax:\n%1 <files>").arg(cmd);
printer->setErrorMessage(msg); printer->setErrorMessage(msg);
@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile()
{ {
TQString f; TQString f;
// be sure the file doesn't exist // 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; return f;
} }
@ -372,7 +372,7 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
return -1; 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 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() ); 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, TQString::null,
i18n("Convert"), i18n("Convert"),
i18n("Keep"), i18n("Keep"),
TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) TQString::tqfromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes)
{ {
// find the filter chain // find the filter chain
TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType); TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -106,7 +106,7 @@ public:
static KLibFactory* componentFactory() 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); KLibFactory *factory(0);
factory = KLibLoader::self()->factory("libkghostviewpart"); factory = KLibLoader::self()->factory("libkghostviewpart");
if( factory ) if( factory )
@ -147,7 +147,7 @@ static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOn
KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
: KDialogBase(parent, "PreviewDlg", true, i18n("Print Preview"), 0) : 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 = new KPrintPreviewPrivate(this);
d->previewonly_ = previewOnly; d->previewonly_ = previewOnly;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -20,7 +20,7 @@
#include "kxmlcommand.h" #include "kxmlcommand.h"
#include "driver.h" #include "driver.h"
#include "kmfactory.h" #include "kmfactory.h"
#include "kdeprintcheck.h" #include "tdeprintcheck.h"
#include "driverview.h" #include "driverview.h"
#include <tqfile.h> #include <tqfile.h>
@ -199,7 +199,7 @@ void KXmlCommand::setComment( const TQString& s )
bool KXmlCommand::isValid() 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) void KXmlCommand::check(bool use_xml)
@ -218,7 +218,7 @@ void KXmlCommand::check(bool use_xml)
void KXmlCommand::loadDesktop() 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"); conf.setGroup("KDE Print Filter Entry");
d->m_description = conf.readEntry("Comment"); d->m_description = conf.readEntry("Comment");
d->m_outputMime = conf.readEntry("MimeTypeOut"); d->m_outputMime = conf.readEntry("MimeTypeOut");
@ -229,7 +229,7 @@ void KXmlCommand::loadDesktop()
void KXmlCommand::saveDesktop() 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.setGroup("KDE Print Filter Entry");
conf.writeEntry("Comment", d->m_description); conf.writeEntry("Comment", d->m_description);
conf.writeEntry("MimeTypeIn", d->m_inputMime); conf.writeEntry("MimeTypeIn", d->m_inputMime);
@ -240,7 +240,7 @@ void KXmlCommand::saveDesktop()
void KXmlCommand::loadXml() void KXmlCommand::loadXml()
{ {
TQFile f(locate("data", "kdeprint/filters/"+name()+".xml")); TQFile f(locate("data", "tdeprint/filters/"+name()+".xml"));
TQDomDocument doc; TQDomDocument doc;
if (f.open(IO_ReadOnly) && doc.setContent(&f) && doc.documentElement().tagName() == "kprintfilter") 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() void KXmlCommand::saveXml()
{ {
TQFile f(locateLocal("data", "kdeprint/filters/"+name()+".xml")); TQFile f(locateLocal("data", "tdeprint/filters/"+name()+".xml"));
if (!f.open(IO_WriteOnly)) if (!f.open(IO_WriteOnly))
return; return;
@ -576,7 +576,7 @@ KXmlCommand* KXmlCommandManager::loadCommand(const TQString& xmlId, bool check)
{ {
if (check) if (check)
{ {
TQString desktopFile = locate("data", "kdeprint/filters/"+xmlId+".desktop"); TQString desktopFile = locate("data", "tdeprint/filters/"+xmlId+".desktop");
if (desktopFile.isEmpty()) if (desktopFile.isEmpty())
return 0; return 0;
} }
@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList()
{ {
if (d->m_cmdlist.isEmpty()) 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) for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it)
{ {

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -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 lpdtools.cpp gschecker.cpp
kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined tdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la tdeprint_lpd_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la
kdeprint_lpd_la_METASOURCES = AUTO tdeprint_lpd_la_METASOURCES = AUTO
noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h
bin_PROGRAMS = make_driver_db_lpd bin_PROGRAMS = make_driver_db_lpd
make_driver_db_lpd_SOURCES = make_driver_db_lpd.c 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 entry_DATA = lpd.print
entrydir = $(kde_datadir)/kdeprint/plugins entrydir = $(kde_datadir)/tdeprint/plugins

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -24,7 +24,7 @@
extern "C" extern "C"
{ {
void* init_kdeprint_lpd() void* init_tdeprint_lpd()
{ {
return new KLpdFactory; return new KLpdFactory;
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -18,12 +18,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kdeprint ${CMAKE_SOURCE_DIR}/tdeprint
) )
link_directories( link_directories(
@ -33,12 +33,12 @@ link_directories(
##### other data ################################ ##### 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 set( ${target}_SRCS
kmlpdunixfactory.cpp kmlpdunixmanager.cpp kmlpdunixfactory.cpp kmlpdunixmanager.cpp
@ -47,6 +47,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} tde_add_kpart( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeprint-shared LINK tdeprint-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,15 +1,15 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE 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 tdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined tdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) tdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT)
kdeprint_lpdunix_la_METASOURCES = AUTO tdeprint_lpdunix_la_METASOURCES = AUTO
noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
entry_DATA = lpdunix.print entry_DATA = lpdunix.print
entrydir = $(kde_datadir)/kdeprint/plugins entrydir = $(kde_datadir)/tdeprint/plugins

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -24,6 +24,6 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
typedef K_TYPELIST_3( KMLpdUnixManager, KLpdUnixPrinterImpl, KMLpdUnixUiManager ) Products; typedef K_TYPELIST_3( KMLpdUnixManager, KLpdUnixPrinterImpl, KMLpdUnixUiManager ) Products;
K_EXPORT_COMPONENT_FACTORY( kdeprint_lpdunix, KGenericFactory< Products > ) K_EXPORT_COMPONENT_FACTORY( tdeprint_lpdunix, KGenericFactory< Products > )

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -18,13 +18,13 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kdeprint ${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/kdeprint/management ${CMAKE_SOURCE_DIR}/tdeprint/management
) )
link_directories( link_directories(
@ -36,18 +36,18 @@ link_directories(
install( FILES install( FILES
printcapentry.h lprhandler.h lprsettings.h printcapentry.h lprhandler.h lprsettings.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint/lpr ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint/lpr )
##### other data ################################ ##### other data ################################
install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins )
install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) 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 set( ${target}_SRCS
printcapreader.cpp lprhandler.cpp matichandler.cpp printcapreader.cpp lprhandler.cpp matichandler.cpp
@ -60,7 +60,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeprint_management-shared LINK tdeprint_management-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -75,6 +75,6 @@ set( ${target}_SRCS
tde_add_executable( ${target} tde_add_executable( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK driverparse-static kdefakes-shared ${DL_LIBRARIES} LINK driverparse-static tdefakes-shared ${DL_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -1,10 +1,10 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE 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 \ matichandler.cpp klprfactory.cpp kmlprmanager.cpp \
kmlpruimanager.cpp lpchelper.cpp lpqhelper.cpp \ kmlpruimanager.cpp lpchelper.cpp lpqhelper.cpp \
kmlprjobmanager.cpp matichelper.cpp \ kmlprjobmanager.cpp matichelper.cpp \
@ -12,10 +12,10 @@ kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
lprsettings.cpp kmconfiglpr.cpp apshandler.cpp \ lprsettings.cpp kmconfiglpr.cpp apshandler.cpp \
lprngtoolhandler.cpp \ lprngtoolhandler.cpp \
editentrydialog.cpp editentrydialog.cpp
kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined tdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la \ tdeprint_lpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la \
$(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE)
kdeprint_lpr_la_METASOURCES = AUTO tdeprint_lpr_la_METASOURCES = AUTO
noinst_HEADERS = printcapreader.h \ noinst_HEADERS = printcapreader.h \
matichandler.h kmlprmanager.h \ matichandler.h kmlprmanager.h \
@ -25,16 +25,16 @@ noinst_HEADERS = printcapreader.h \
lprngtoolhandler.h \ lprngtoolhandler.h \
editentrydialog.h editentrydialog.h
kdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h tdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h
kdeprintlprdir = $(includedir)/kdeprint/lpr tdeprintlprdir = $(includedir)/tdeprint/lpr
bin_PROGRAMS = make_driver_db_lpr bin_PROGRAMS = make_driver_db_lpr
make_driver_db_lpr_SOURCES = make_driver_db_lpr.c make_driver_db_lpr_SOURCES = make_driver_db_lpr.c
make_driver_db_lpr_LDFLAGS = $(all_libraries) 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 entry_DATA = lpr.print
entrydir = $(kde_datadir)/kdeprint/plugins entrydir = $(kde_datadir)/tdeprint/plugins
miscdata_DATA = apsdriver1 apsdriver2 lprngtooldriver1 miscdata_DATA = apsdriver1 apsdriver2 lprngtooldriver1
miscdatadir = $(kde_datadir)/kdeprint miscdatadir = $(kde_datadir)/tdeprint

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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* 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) if (driver)
driver->set("text", "APS Common Driver"); driver->set("text", "APS Common Driver");
return driver; return driver;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -25,5 +25,5 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
typedef K_TYPELIST_4( KMLprManager, KMLprUiManager, KMLprJobManager, KLprPrinterImpl ) Products; 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 > )

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -137,7 +137,7 @@ void KMLprManager::initHandlers()
insertHandler(new LPRngToolHandler(this)); insertHandler(new LPRngToolHandler(this));
// now load external handlers // 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) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
{ {
KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it));
@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt)
void KMLprManager::createPluginActions(KActionCollection *coll) 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"); act->setGroup("plugin");
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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; return NULL;
} }
DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1"));
if (driver) if (driver)
{ {
TQString model = prt->option("driverID"); TQString model = prt->option("driverID");
@ -183,7 +183,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool
DrMain* LPRngToolHandler::loadDbDriver(const TQString& s) DrMain* LPRngToolHandler::loadDbDriver(const TQString& s)
{ {
int p = s.find('/'); int p = s.find('/');
DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1"));
if (driver) if (driver)
driver->set("driverID", s.mid(p+1)); driver->set("driverID", s.mid(p+1));
return driver; return driver;
@ -231,7 +231,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr)
return opts; return opts;
if (m_dict.count() == 0) if (m_dict.count() == 0)
m_dict = loadChoiceDict(locate("data", "kdeprint/lprngtooldriver1")); m_dict = loadChoiceDict(locate("data", "tdeprint/lprngtooldriver1"));
TQString unknown; TQString unknown;
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -25,7 +25,7 @@
#endif #endif
#include <tqobject.h> #include <tqobject.h>
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
/** /**
* @internal * @internal

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -18,16 +18,16 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdefx ${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kdeprint ${CMAKE_SOURCE_DIR}/tdeprint
) )
link_directories( link_directories(
@ -40,19 +40,19 @@ link_directories(
install( FILES install( FILES
kmmainview.h kmjobviewer.h kmprinterpage.h kmmainview.h kmjobviewer.h kmprinterpage.h
kiconselectaction.h kmtimer.h kiconselectaction.h kmtimer.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint )
##### other data ################################ ##### other data ################################
install( FILES install( FILES
tileup.png tiledown.png side.png 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 set( ${target}_SRCS
kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp
@ -77,7 +77,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 4.2.0 VERSION 4.2.0
LINK kdeprint-shared LINK tdeprint-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
@ -87,12 +87,12 @@ tde_add_library( ${target} SHARED AUTOMOC
set( target libtdeprint_management_module ) set( target libtdeprint_management_module )
set( ${target}_SRCS set( ${target}_SRCS
kdeprint_management_module.cpp tdeprint_management_module.cpp
) )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeprint_management-shared LINK tdeprint_management-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -105,7 +105,7 @@ set( ${target}_SRCS
kaddprinterwizard.cpp kaddprinterwizard.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeprint-shared LINK tdeprint-shared
) )

@ -1,10 +1,10 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE 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 lib_LTLIBRARIES = libtdeprint_management.la
kde_module_LTLIBRARIES = libtdeprint_management_module.la kde_module_LTLIBRARIES = libtdeprint_management_module.la
kdeinit_LTLIBRARIES = kaddprinterwizard.la tdeinit_LTLIBRARIES = kaddprinterwizard.la
bin_PROGRAMS = bin_PROGRAMS =
kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp 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_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
libtdeprint_management_la_METASOURCES = AUTO 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_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) 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 tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
kdeprintdir = $(includedir)/kdeprint tdeprintdir = $(includedir)/tdeprint
noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \ noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \
kminfopage.h kmmainview.h kmpages.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 kmconfigfilter.h kmconfigfonts.h kmconfigjobs.h networkscanner.h
dataicon_DATA = tileup.png tiledown.png side.png dataicon_DATA = tileup.png tiledown.png side.png
dataicondir = $(kde_datadir)/kdeprint dataicondir = $(kde_datadir)/tdeprint

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * 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> * Copyright (C) 2004 Dominique Devriese <devriese@kde.org>
* *
* This library is free software; you can redistribute it and/or * 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) 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) KDEPRINT_EXPORT bool config_dialog(TQWidget *parent)

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB()
TQString KMDriverDB::dbFile() TQString KMDriverDB::dbFile()
{ {
// this calls insure missing directories creation // 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; return filename;
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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 // We need to trigger a refresh even if the printer
// has not changed, some jobs may have been canceled // 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. // prname == m_prname.
if (m_prname != prname) if (m_prname != prname)
{ {
@ -298,7 +298,7 @@ void KMJobViewer::initActions()
} }
// Filter actions // 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); fact->setDelayed(false);
connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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())); connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport()));
m_root = new KMListViewItem(this,i18n("Print System")); 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_root->setOpen(true);
m_classes = new KMListViewItem(m_root,i18n("Classes")); m_classes = new KMListViewItem(m_root,i18n("Classes"));
m_classes->setPixmap(0,SmallIcon("package")); m_classes->setPixmap(0,SmallIcon("package"));

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -60,7 +60,7 @@
#undef m_manager #undef m_manager
#define m_manager KMFactory::self()->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); KMWizard dlg(parent);
int flag(0); int flag(0);
@ -181,24 +181,24 @@ void KMMainView::initActions()
vact->setCurrentItem(0); vact->setCurrentItem(0);
connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); 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->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("&Start Printer"),"tdeprint_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("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->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("&Enable Job Spooling"),"tdeprint_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("&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("&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("&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 &Printer/Class..."),"tdeprint_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("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"),"kdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); 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"),"kdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_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..."),"kdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); new KAction(i18n("&Test Printer..."),"tdeprint_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("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"); 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"); KIconSelectAction *dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
@ -208,9 +208,9 @@ void KMMainView::initActions()
dact->setCurrentItem(0); dact->setCurrentItem(0);
connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); 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("R&estart Server"),"tdeprint_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..."),"tdeprint_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("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"); KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
tact->setCheckedState(i18n("Hide &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 = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
tact->setCheckedState(i18n("Hide Me&nu Toolbar")); tact->setCheckedState(i18n("Hide Me&nu Toolbar"));
connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); 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 = new KToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"kdeprint_printer_infos")); tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos"));
tact->setChecked(true); tact->setChecked(true);
connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); 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"); KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
mact->setDelayed(false); mact->setDelayed(false);
connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); 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) for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
{ {
KSimpleConfig conf(*it); KSimpleConfig conf(*it);
@ -301,7 +301,7 @@ void KMMainView::initActions()
m_actions->action("manager_configure")->plug( menu ); m_actions->action("manager_configure")->plug( menu );
m_actions->action("view_refresh")->plug( menu ); m_actions->action("view_refresh")->plug( menu );
//m_menubar->insertItem( i18n( "Manager" ), 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 ); m_menubar->getButton( 3 )->setPopup( menu, true );
menu = new TQPopupMenu( this ); menu = new TQPopupMenu( this );
m_actions->action("view_printerinfos")->plug( menu ); m_actions->action("view_printerinfos")->plug( menu );
@ -586,7 +586,7 @@ void KMMainView::slotAdd()
KMTimer::self()->hold(); KMTimer::self()->hold();
int result(0); 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.")); showErrorMsg(i18n("Unable to create printer."));
KMTimer::self()->release((result == 1)); KMTimer::self()->release((result == 1));
@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID)
KMTimer::self()->hold(); KMTimer::self()->hold();
TQString libname = m_toollist[ID]; TQString libname = m_toollist[ID];
libname.prepend("kdeprint_tool_"); libname.prepend("tdeprint_tool_");
if (m_current && !m_current->device().isEmpty() && !libname.isEmpty()) if (m_current && !m_current->device().isEmpty() && !libname.isEmpty())
{ {
KLibFactory *factory = KLibLoader::self()->factory(libname.local8Bit()); KLibFactory *factory = KLibLoader::self()->factory(libname.local8Bit());
@ -906,12 +906,12 @@ void KMMainView::slotHelp()
{ {
TQString s = TQT_TQOBJECT_CONST(sender())->name(); TQString s = TQT_TQOBJECT_CONST(sender())->name();
if ( s == "invoke_help" ) if ( s == "invoke_help" )
kapp->invokeHelp( TQString::null, "kdeprint" ); kapp->invokeHelp( TQString::null, "tdeprint" );
else if ( s == "invoke_web" ) else if ( s == "invoke_web" )
{ {
TQStringList args; TQStringList args;
args << "exec" << "http://printing.kde.org"; args << "exec" << "http://printing.kde.org";
kapp->kdeinitExec( "kfmclient", args ); kapp->tdeinitExec( "kfmclient", args );
} }
else else
kdDebug( 500 ) << "Unknown help invokator: " << s << endl; kdDebug( 500 ) << "Unknown help invokator: " << s << endl;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -25,7 +25,7 @@
#endif #endif
#include <tqwidget.h> #include <tqwidget.h>
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
#include <kmainwindow.h> #include <kmainwindow.h>
class KMManager; class KMManager;
@ -128,6 +128,6 @@ private:
KToolBar *m_menubar; KToolBar *m_menubar;
}; };
KDEPRINT_EXPORT int kdeprint_management_add_printer_wizard( TQWidget* parent ); KDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
#endif #endif

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -22,7 +22,7 @@
#include "cjanuswidget.h" #include "cjanuswidget.h"
#include "kmprinterpage.h" #include "kmprinterpage.h"
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
#include <kdelibs_export.h> #include <kdelibs_export.h>
#include <tqptrlist.h> #include <tqptrlist.h>

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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); TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0);
main_->addWidget(m_members); main_->addWidget(m_members);
m_pixmap = "kdeprint_printer_class"; m_pixmap = "tdeprint_printer_class";
m_title = i18n("Members"); m_title = i18n("Members");
m_header = i18n("Class Members"); m_header = i18n("Class Members");
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -19,7 +19,7 @@
#include "kmspecialprinterdlg.h" #include "kmspecialprinterdlg.h"
#include "kmprinter.h" #include "kmprinter.h"
#include "kdeprintcheck.h" #include "tdeprintcheck.h"
#include "kmfactory.h" #include "kmfactory.h"
#include "kmspecialmanager.h" #include "kmspecialmanager.h"
#include "kxmlcommandselector.h" #include "kxmlcommandselector.h"

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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 *l2 = new TQLabel(i18n("<b>Model:</b>"), this);
TQLabel *l3 = new TQLabel(i18n("<b>Description:</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); m_settings = new KPushButton(KGuiItem(i18n("&Settings"), "configure"), this);
TQLabel *l0 = new TQLabel(this); TQLabel *l0 = new TQLabel(this);

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -244,7 +244,7 @@ void KMWizard::slotNext()
void KMWizard::slotHelp() void KMWizard::slotHelp()
{ {
kapp->invokeHelp(TQString::null, "kdeprint"); kapp->invokeHelp(TQString::null, "tdeprint");
} }
void KMWizard::enableWizard() void KMWizard::enableWizard()

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * 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->addColumn("");
m_ports->setSorting(-1); m_ports->setSorting(-1);
TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System"));
root->setPixmap(0, SmallIcon("kdeprint_computer")); root->setPixmap(0, SmallIcon("tdeprint_computer"));
root->setOpen(true); root->setOpen(true);
connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*)));
TQLabel *l1 = new TQLabel(i18n("URI:"), this); TQLabel *l1 = new TQLabel(i18n("URI:"), this);
@ -197,7 +197,7 @@ void KMWLocal::initialize()
{ {
TQListViewItem *pItem = new TQListViewItem(last[index], printer); TQListViewItem *pItem = new TQListViewItem(last[index], printer);
last[index]->setOpen(true); last[index]->setOpen(true);
pItem->setPixmap(0, SmallIcon("kdeprint_printer")); pItem->setPixmap(0, SmallIcon("tdeprint_printer"));
} }
} }
m_initialized = true; m_initialized = true;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -137,7 +137,7 @@ void KMWSocket::slotScanFinished()
else else
name = it.current()->Name; name = it.current()->Name;
TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); 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"));
} }
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save