summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt16
-rw-r--r--COMPILING6
-rw-r--r--KDE2PORTING.html12
-rw-r--r--KDE3PORTING.html20
-rw-r--r--Mainpage.dox16
-rw-r--r--Makefile.am.in8
-rw-r--r--NAMING2
-rw-r--r--README10
-rw-r--r--TODO6
-rw-r--r--arts/Makefile.am2
-rw-r--r--arts/kde/CMakeLists.txt6
-rw-r--r--arts/kde/kartsserver.cpp4
-rw-r--r--arts/kde/mcop-dcop/Makefile.am2
-rw-r--r--arts/knotify/CMakeLists.txt8
-rw-r--r--arts/knotify/Makefile.am2
-rw-r--r--arts/message/CMakeLists.txt8
-rw-r--r--arts/message/Makefile.am2
-rw-r--r--config.h.cmake4
-rw-r--r--configure.in.bot4
-rw-r--r--configure.in.in8
-rw-r--r--configure.in.mid2
-rw-r--r--dcop/CMakeLists.txt8
-rw-r--r--dcop/HOWTO8
-rw-r--r--dcop/Mainpage.dox8
-rw-r--r--dcop/Makefile.am14
-rw-r--r--dcop/client/CMakeLists.txt4
-rw-r--r--dcop/client/marshall.cpp2
-rw-r--r--dnssd/CMakeLists.txt6
-rw-r--r--dnssd/Mainpage.dox4
-rw-r--r--dnssd/Makefile.am2
-rw-r--r--doc/common/README.Doxygen6
-rw-r--r--interfaces/Makefile.am2
-rw-r--r--interfaces/kimproxy/library/CMakeLists.txt6
-rw-r--r--interfaces/kmediaplayer/CMakeLists.txt6
-rw-r--r--interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt6
-rw-r--r--interfaces/kscript/CMakeLists.txt6
-rw-r--r--interfaces/kscript/Makefile.am2
-rw-r--r--interfaces/kscript/sample/CMakeLists.txt4
-rw-r--r--interfaces/kspeech/Makefile.am2
-rw-r--r--interfaces/ktexteditor/CMakeLists.txt8
-rw-r--r--interfaces/ktexteditor/Makefile.am2
-rw-r--r--kab/CMakeLists.txt6
-rw-r--r--kab/Makefile.am2
-rw-r--r--kabc/CMakeLists.txt6
-rw-r--r--kabc/Makefile.am4
-rw-r--r--kabc/formats/CMakeLists.txt4
-rw-r--r--kabc/plugins/dir/CMakeLists.txt6
-rw-r--r--kabc/plugins/evolution/Makefile.am2
-rw-r--r--kabc/plugins/file/CMakeLists.txt6
-rw-r--r--kabc/plugins/ldapkio/CMakeLists.txt6
-rw-r--r--kabc/plugins/net/CMakeLists.txt6
-rw-r--r--kabc/plugins/net/Makefile.am2
-rw-r--r--kabc/plugins/sql/Makefile.am2
-rw-r--r--kabc/tests/Makefile.am24
-rw-r--r--kabc/vcard/CMakeLists.txt6
-rw-r--r--kabc/vcard/Makefile.am4
-rw-r--r--kabc/vcardparser/CMakeLists.txt4
-rw-r--r--kabc/vcardparser/Makefile.am6
-rw-r--r--kate/Mainpage.dox2
-rw-r--r--kate/Makefile.am2
-rw-r--r--kate/interfaces/CMakeLists.txt6
-rw-r--r--kate/part/CMakeLists.txt12
-rw-r--r--kate/part/Makefile.am2
-rw-r--r--kate/part/kateprinter.cpp2
-rw-r--r--kate/part/kateprinter.h2
-rw-r--r--kate/plugins/insertfile/CMakeLists.txt6
-rw-r--r--kate/plugins/isearch/CMakeLists.txt6
-rw-r--r--kate/plugins/kdatatool/CMakeLists.txt8
-rw-r--r--kate/plugins/kdatatool/Makefile.am2
-rw-r--r--kate/plugins/wordcompletion/CMakeLists.txt6
-rw-r--r--kcert/CMakeLists.txt6
-rw-r--r--kcmshell/CMakeLists.txt8
-rw-r--r--kcmshell/Makefile.am2
-rw-r--r--kconf_update/CMakeLists.txt8
-rw-r--r--kconf_update/Makefile.am2
-rw-r--r--kdecore/CMakeLists.txt26
-rw-r--r--kdecore/MAINTAINERS2
-rw-r--r--kdecore/Mainpage.dox2
-rw-r--r--kdecore/Makefile.am14
-rw-r--r--kdecore/README2
-rw-r--r--kdecore/README.kstartupinfo2
-rw-r--r--kdecore/configure.in.in6
-rw-r--r--kdecore/kaccel.cpp2
-rw-r--r--kdecore/kaccelmanager.cpp2
-rw-r--r--kdecore/kapplication.cpp30
-rw-r--r--kdecore/kapplication.h16
-rw-r--r--kdecore/kconfig.cpp2
-rw-r--r--kdecore/kconfig_compiler/CMakeLists.txt6
-rw-r--r--kdecore/kconfig_compiler/Makefile.am8
-rw-r--r--kdecore/kconfig_compiler/example/Makefile.am6
-rw-r--r--kdecore/kconfig_compiler/tests/Makefile.am22
-rw-r--r--kdecore/kcrash.cpp10
-rw-r--r--kdecore/kdebug.areas82
-rw-r--r--kdecore/kdebug.cpp2
-rw-r--r--kdecore/kdelibs_export.h2
-rw-r--r--kdecore/kglobal.h2
-rw-r--r--kdecore/kiconeffect.cpp4
-rw-r--r--kdecore/kiconeffect.h2
-rw-r--r--kdecore/kiconloader.cpp2
-rw-r--r--kdecore/kiconloader.h2
-rw-r--r--kdecore/kiconloader_p.h2
-rw-r--r--kdecore/kicontheme.cpp2
-rw-r--r--kdecore/kicontheme.h2
-rw-r--r--kdecore/klibloader.cpp2
-rw-r--r--kdecore/kstartupinfo.cpp4
-rw-r--r--kdecore/kstartupinfo.h2
-rw-r--r--kdecore/ksycoca.cpp4
-rw-r--r--kdecore/kuniqueapplication.cpp2
-rw-r--r--kdecore/libkdecore.nmcheck4
-rw-r--r--kdecore/network/CMakeLists.txt8
-rw-r--r--kdecore/svgicons/CMakeLists.txt4
-rw-r--r--kdecore/tests/Makefile.am2
-rw-r--r--kdecore/tests/testqtargs.cpp4
-rw-r--r--kded/CMakeLists.txt14
-rw-r--r--kded/Mainpage.dox4
-rw-r--r--kded/Makefile.am8
-rw-r--r--kded/kde-menu.cpp2
-rw-r--r--kded/kded.cpp8
-rw-r--r--kdefx/CMakeLists.txt6
-rw-r--r--kdefx/Makefile.am6
-rw-r--r--kdefx/libkdefx.nmcheck2
-rw-r--r--kdeprint/CMakeLists.txt32
-rw-r--r--kdeprint/ChangeLog198
-rw-r--r--kdeprint/Makefile.am46
-rw-r--r--kdeprint/TODO4
-rw-r--r--kdeprint/cups/CMakeLists.txt26
-rw-r--r--kdeprint/cups/Makefile.am20
-rw-r--r--kdeprint/cups/cupsaddsmb2.cpp2
-rw-r--r--kdeprint/cups/cupsaddsmb2.h2
-rw-r--r--kdeprint/cups/cupsdconf2/CMakeLists.txt10
-rw-r--r--kdeprint/cups/cupsdconf2/Makefile.am4
-rw-r--r--kdeprint/cups/cupsdconf2/addressdialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/addressdialog.h2
-rw-r--r--kdeprint/cups/cupsdconf2/browsedialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/browsedialog.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cups-util.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsd.conf.template2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdcomment.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdcomment.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdconf.cpp8
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdconf.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsddialog.cpp6
-rw-r--r--kdeprint/cups/cupsdconf2/cupsddialog.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsddirpage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsddirpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdfilterpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdjobspage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdjobspage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdlogpage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdlogpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdnetworkpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdpage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdsecuritypage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdserverpage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdserverpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdsplash.cpp6
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdsplash.h2
-rw-r--r--kdeprint/cups/cupsdconf2/editlist.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/editlist.h2
-rw-r--r--kdeprint/cups/cupsdconf2/locationdialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/locationdialog.h2
-rw-r--r--kdeprint/cups/cupsdconf2/main.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/portdialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/portdialog.h2
-rw-r--r--kdeprint/cups/cupsdconf2/qdirlineedit.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/qdirlineedit.h2
-rw-r--r--kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/qdirmultilineedit.h2
-rw-r--r--kdeprint/cups/cupsdconf2/sizewidget.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/sizewidget.h2
-rw-r--r--kdeprint/cups/cupsdoprint.c4
-rw-r--r--kdeprint/cups/cupsinfos.cpp2
-rw-r--r--kdeprint/cups/cupsinfos.h2
-rw-r--r--kdeprint/cups/image.cpp2
-rw-r--r--kdeprint/cups/imageposition.cpp4
-rw-r--r--kdeprint/cups/imageposition.h2
-rw-r--r--kdeprint/cups/imagepreview.cpp2
-rw-r--r--kdeprint/cups/imagepreview.h2
-rw-r--r--kdeprint/cups/ippreportdlg.cpp2
-rw-r--r--kdeprint/cups/ippreportdlg.h2
-rw-r--r--kdeprint/cups/ipprequest.cpp4
-rw-r--r--kdeprint/cups/ipprequest.h2
-rw-r--r--kdeprint/cups/kcupsprinterimpl.cpp2
-rw-r--r--kdeprint/cups/kcupsprinterimpl.h2
-rw-r--r--kdeprint/cups/kmconfigcups.cpp2
-rw-r--r--kdeprint/cups/kmconfigcups.h2
-rw-r--r--kdeprint/cups/kmconfigcupsdir.cpp2
-rw-r--r--kdeprint/cups/kmconfigcupsdir.h2
-rw-r--r--kdeprint/cups/kmcupsconfigwidget.cpp2
-rw-r--r--kdeprint/cups/kmcupsconfigwidget.h2
-rw-r--r--kdeprint/cups/kmcupsfactory.cpp4
-rw-r--r--kdeprint/cups/kmcupsjobmanager.cpp4
-rw-r--r--kdeprint/cups/kmcupsjobmanager.h2
-rw-r--r--kdeprint/cups/kmcupsmanager.cpp6
-rw-r--r--kdeprint/cups/kmcupsmanager.h2
-rw-r--r--kdeprint/cups/kmcupsuimanager.cpp2
-rw-r--r--kdeprint/cups/kmcupsuimanager.h2
-rw-r--r--kdeprint/cups/kmpropbanners.cpp2
-rw-r--r--kdeprint/cups/kmpropbanners.h2
-rw-r--r--kdeprint/cups/kmpropquota.cpp2
-rw-r--r--kdeprint/cups/kmpropquota.h2
-rw-r--r--kdeprint/cups/kmpropusers.cpp4
-rw-r--r--kdeprint/cups/kmpropusers.h2
-rw-r--r--kdeprint/cups/kmwbanners.cpp2
-rw-r--r--kdeprint/cups/kmwbanners.h2
-rw-r--r--kdeprint/cups/kmwfax.cpp2
-rw-r--r--kdeprint/cups/kmwfax.h2
-rw-r--r--kdeprint/cups/kmwipp.cpp2
-rw-r--r--kdeprint/cups/kmwipp.h2
-rw-r--r--kdeprint/cups/kmwippprinter.cpp6
-rw-r--r--kdeprint/cups/kmwippprinter.h2
-rw-r--r--kdeprint/cups/kmwippselect.cpp4
-rw-r--r--kdeprint/cups/kmwippselect.h2
-rw-r--r--kdeprint/cups/kmwother.cpp4
-rw-r--r--kdeprint/cups/kmwother.h2
-rw-r--r--kdeprint/cups/kmwquota.cpp2
-rw-r--r--kdeprint/cups/kmwquota.h2
-rw-r--r--kdeprint/cups/kmwusers.cpp2
-rw-r--r--kdeprint/cups/kmwusers.h2
-rw-r--r--kdeprint/cups/kphpgl2page.cpp2
-rw-r--r--kdeprint/cups/kphpgl2page.h2
-rw-r--r--kdeprint/cups/kpimagepage.cpp4
-rw-r--r--kdeprint/cups/kpimagepage.h2
-rw-r--r--kdeprint/cups/kpschedulepage.cpp2
-rw-r--r--kdeprint/cups/kpschedulepage.h2
-rw-r--r--kdeprint/cups/kptagspage.cpp2
-rw-r--r--kdeprint/cups/kptagspage.h2
-rw-r--r--kdeprint/cups/kptextpage.cpp4
-rw-r--r--kdeprint/cups/kptextpage.h2
-rw-r--r--kdeprint/driver.cpp2
-rw-r--r--kdeprint/driver.h2
-rw-r--r--kdeprint/driveritem.cpp2
-rw-r--r--kdeprint/driveritem.h2
-rw-r--r--kdeprint/driverparse.h2
-rw-r--r--kdeprint/driverview.cpp2
-rw-r--r--kdeprint/driverview.h2
-rw-r--r--kdeprint/droptionview.cpp2
-rw-r--r--kdeprint/droptionview.h2
-rw-r--r--kdeprint/ext/CMakeLists.txt16
-rw-r--r--kdeprint/ext/Makefile.am14
-rw-r--r--kdeprint/ext/kextprinterimpl.cpp2
-rw-r--r--kdeprint/ext/kextprinterimpl.h2
-rw-r--r--kdeprint/ext/kmextfactory.cpp4
-rw-r--r--kdeprint/ext/kmextmanager.cpp2
-rw-r--r--kdeprint/ext/kmextmanager.h2
-rw-r--r--kdeprint/ext/kmextuimanager.cpp2
-rw-r--r--kdeprint/ext/kmextuimanager.h2
-rw-r--r--kdeprint/filters/CMakeLists.txt2
-rw-r--r--kdeprint/filters/Makefile.am2
-rw-r--r--kdeprint/foomatic/Makefile.am14
-rw-r--r--kdeprint/foomatic/kfoomaticprinterimpl.cpp2
-rw-r--r--kdeprint/foomatic/kfoomaticprinterimpl.h2
-rw-r--r--kdeprint/foomatic/kmfoomaticfactory.cpp4
-rw-r--r--kdeprint/foomatic/kmfoomaticmanager.cpp2
-rw-r--r--kdeprint/foomatic/kmfoomaticmanager.h2
-rw-r--r--kdeprint/foomatic/make_driver_db_foomatic.c2
-rw-r--r--kdeprint/foomatic2loader.cpp12
-rw-r--r--kdeprint/foomatic2loader.h4
-rw-r--r--kdeprint/fooparser.cpp16
-rw-r--r--kdeprint/fooparser.cpp.h2
-rw-r--r--kdeprint/fooparser.y2
-rw-r--r--kdeprint/fooscanner.cpp50
-rw-r--r--kdeprint/fooscanner.l18
-rw-r--r--kdeprint/kdeprintcheck.cpp4
-rw-r--r--kdeprint/kdeprintcheck.h2
-rw-r--r--kdeprint/kdeprintd.cpp12
-rw-r--r--kdeprint/kdeprintd.desktop4
-rw-r--r--kdeprint/kdeprintd.h2
-rw-r--r--kdeprint/kdeprintrc.upd2
-rw-r--r--kdeprint/kfilelist.cpp2
-rw-r--r--kdeprint/kfilelist.h2
-rw-r--r--kdeprint/kmdbentry.cpp2
-rw-r--r--kdeprint/kmdbentry.h2
-rw-r--r--kdeprint/kmfactory.cpp28
-rw-r--r--kdeprint/kmfactory.h2
-rw-r--r--kdeprint/kmjob.cpp4
-rw-r--r--kdeprint/kmjob.h4
-rw-r--r--kdeprint/kmjobmanager.cpp2
-rw-r--r--kdeprint/kmjobmanager.h2
-rw-r--r--kdeprint/kmmanager.cpp6
-rw-r--r--kdeprint/kmmanager.h4
-rw-r--r--kdeprint/kmobject.h2
-rw-r--r--kdeprint/kmprinter.cpp4
-rw-r--r--kdeprint/kmprinter.h4
-rw-r--r--kdeprint/kmspecialmanager.cpp12
-rw-r--r--kdeprint/kmspecialmanager.h2
-rw-r--r--kdeprint/kmthreadjob.cpp4
-rw-r--r--kdeprint/kmthreadjob.h2
-rw-r--r--kdeprint/kmuimanager.cpp2
-rw-r--r--kdeprint/kmuimanager.h2
-rw-r--r--kdeprint/kmvirtualmanager.cpp2
-rw-r--r--kdeprint/kmvirtualmanager.h2
-rw-r--r--kdeprint/kpcopiespage.cpp4
-rw-r--r--kdeprint/kpcopiespage.h4
-rw-r--r--kdeprint/kpdriverpage.cpp2
-rw-r--r--kdeprint/kpdriverpage.h2
-rw-r--r--kdeprint/kpfileselectpage.cpp2
-rw-r--r--kdeprint/kpfileselectpage.h2
-rw-r--r--kdeprint/kpfilterpage.cpp2
-rw-r--r--kdeprint/kpfilterpage.h2
-rw-r--r--kdeprint/kpgeneralpage.cpp28
-rw-r--r--kdeprint/kpgeneralpage.h2
-rw-r--r--kdeprint/kpipeprocess.cpp2
-rw-r--r--kdeprint/kpipeprocess.h2
-rw-r--r--kdeprint/kpmarginpage.cpp2
-rw-r--r--kdeprint/kpmarginpage.h2
-rw-r--r--kdeprint/kpposterpage.cpp2
-rw-r--r--kdeprint/kpposterpage.h2
-rw-r--r--kdeprint/kpqtpage.cpp14
-rw-r--r--kdeprint/kpqtpage.h2
-rw-r--r--kdeprint/kpreloadobject.cpp2
-rw-r--r--kdeprint/kpreloadobject.h2
-rw-r--r--kdeprint/kprintaction.cpp4
-rw-r--r--kdeprint/kprintaction.h2
-rw-r--r--kdeprint/kprintdialog.cpp8
-rw-r--r--kdeprint/kprintdialog.h4
-rw-r--r--kdeprint/kprintdialogpage.cpp2
-rw-r--r--kdeprint/kprintdialogpage.h4
-rw-r--r--kdeprint/kprinter.cpp4
-rw-r--r--kdeprint/kprinter.h8
-rw-r--r--kdeprint/kprinterimpl.cpp18
-rw-r--r--kdeprint/kprinterimpl.h2
-rw-r--r--kdeprint/kprinterpropertydialog.cpp2
-rw-r--r--kdeprint/kprinterpropertydialog.h2
-rw-r--r--kdeprint/kprintpreview.cpp6
-rw-r--r--kdeprint/kprintpreview.h2
-rw-r--r--kdeprint/kprintprocess.cpp2
-rw-r--r--kdeprint/kprintprocess.h2
-rw-r--r--kdeprint/kxmlcommand.cpp18
-rw-r--r--kdeprint/kxmlcommand.h2
-rw-r--r--kdeprint/lpd/Makefile.am16
-rw-r--r--kdeprint/lpd/gschecker.cpp2
-rw-r--r--kdeprint/lpd/gschecker.h2
-rw-r--r--kdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--kdeprint/lpd/klpdprinterimpl.h2
-rw-r--r--kdeprint/lpd/kmlpdfactory.cpp4
-rw-r--r--kdeprint/lpd/kmlpdfactory.h2
-rw-r--r--kdeprint/lpd/kmlpdmanager.cpp2
-rw-r--r--kdeprint/lpd/kmlpdmanager.h2
-rw-r--r--kdeprint/lpd/kmlpduimanager.cpp2
-rw-r--r--kdeprint/lpd/kmlpduimanager.h2
-rw-r--r--kdeprint/lpd/lpdtools.cpp2
-rw-r--r--kdeprint/lpd/lpdtools.h2
-rw-r--r--kdeprint/lpd/make_driver_db_lpd.c2
-rw-r--r--kdeprint/lpdunix/CMakeLists.txt16
-rw-r--r--kdeprint/lpdunix/Makefile.am14
-rw-r--r--kdeprint/lpdunix/klpdunixprinterimpl.cpp2
-rw-r--r--kdeprint/lpdunix/klpdunixprinterimpl.h2
-rw-r--r--kdeprint/lpdunix/kmlpdunixfactory.cpp4
-rw-r--r--kdeprint/lpdunix/kmlpdunixmanager.cpp2
-rw-r--r--kdeprint/lpdunix/kmlpdunixmanager.h2
-rw-r--r--kdeprint/lpdunix/kmlpdunixuimanager.cpp2
-rw-r--r--kdeprint/lpdunix/kmlpdunixuimanager.h2
-rw-r--r--kdeprint/lpr/CMakeLists.txt24
-rw-r--r--kdeprint/lpr/Makefile.am22
-rw-r--r--kdeprint/lpr/apshandler.cpp4
-rw-r--r--kdeprint/lpr/apshandler.h2
-rw-r--r--kdeprint/lpr/editentrydialog.cpp2
-rw-r--r--kdeprint/lpr/editentrydialog.h2
-rw-r--r--kdeprint/lpr/klprfactory.cpp4
-rw-r--r--kdeprint/lpr/klprprinterimpl.cpp2
-rw-r--r--kdeprint/lpr/klprprinterimpl.h2
-rw-r--r--kdeprint/lpr/kmconfiglpr.cpp2
-rw-r--r--kdeprint/lpr/kmconfiglpr.h2
-rw-r--r--kdeprint/lpr/kmlprjobmanager.cpp2
-rw-r--r--kdeprint/lpr/kmlprjobmanager.h2
-rw-r--r--kdeprint/lpr/kmlprmanager.cpp6
-rw-r--r--kdeprint/lpr/kmlprmanager.h2
-rw-r--r--kdeprint/lpr/kmlpruimanager.cpp2
-rw-r--r--kdeprint/lpr/kmlpruimanager.h2
-rw-r--r--kdeprint/lpr/lpchelper.cpp2
-rw-r--r--kdeprint/lpr/lpchelper.h2
-rw-r--r--kdeprint/lpr/lpqhelper.cpp2
-rw-r--r--kdeprint/lpr/lpqhelper.h2
-rw-r--r--kdeprint/lpr/lprhandler.cpp2
-rw-r--r--kdeprint/lpr/lprhandler.h2
-rw-r--r--kdeprint/lpr/lprngtoolhandler.cpp8
-rw-r--r--kdeprint/lpr/lprngtoolhandler.h2
-rw-r--r--kdeprint/lpr/lprsettings.cpp2
-rw-r--r--kdeprint/lpr/lprsettings.h4
-rw-r--r--kdeprint/lpr/matichandler.cpp2
-rw-r--r--kdeprint/lpr/matichandler.h2
-rw-r--r--kdeprint/lpr/matichelper.cpp2
-rw-r--r--kdeprint/lpr/matichelper.h2
-rw-r--r--kdeprint/lpr/printcapentry.cpp2
-rw-r--r--kdeprint/lpr/printcapentry.h2
-rw-r--r--kdeprint/lpr/printcapreader.cpp2
-rw-r--r--kdeprint/lpr/printcapreader.h2
-rw-r--r--kdeprint/management/CMakeLists.txt28
-rw-r--r--kdeprint/management/Makefile.am12
-rw-r--r--kdeprint/management/cjanuswidget.cpp2
-rw-r--r--kdeprint/management/cjanuswidget.h2
-rw-r--r--kdeprint/management/jobitem.cpp2
-rw-r--r--kdeprint/management/jobitem.h2
-rw-r--r--kdeprint/management/kdeprint_management_module.cpp4
-rw-r--r--kdeprint/management/kiconselectaction.cpp2
-rw-r--r--kdeprint/management/kiconselectaction.h2
-rw-r--r--kdeprint/management/kmconfigcommand.cpp2
-rw-r--r--kdeprint/management/kmconfigcommand.h2
-rw-r--r--kdeprint/management/kmconfigdialog.cpp2
-rw-r--r--kdeprint/management/kmconfigdialog.h2
-rw-r--r--kdeprint/management/kmconfigfilter.cpp2
-rw-r--r--kdeprint/management/kmconfigfilter.h2
-rw-r--r--kdeprint/management/kmconfigfonts.cpp2
-rw-r--r--kdeprint/management/kmconfigfonts.h2
-rw-r--r--kdeprint/management/kmconfiggeneral.cpp2
-rw-r--r--kdeprint/management/kmconfiggeneral.h2
-rw-r--r--kdeprint/management/kmconfigjobs.cpp2
-rw-r--r--kdeprint/management/kmconfigjobs.h2
-rw-r--r--kdeprint/management/kmconfigpage.cpp2
-rw-r--r--kdeprint/management/kmconfigpage.h2
-rw-r--r--kdeprint/management/kmconfigpreview.cpp2
-rw-r--r--kdeprint/management/kmconfigpreview.h2
-rw-r--r--kdeprint/management/kmdbcreator.cpp2
-rw-r--r--kdeprint/management/kmdbcreator.h2
-rw-r--r--kdeprint/management/kmdriverdb.cpp4
-rw-r--r--kdeprint/management/kmdriverdb.h2
-rw-r--r--kdeprint/management/kmdriverdbwidget.cpp2
-rw-r--r--kdeprint/management/kmdriverdbwidget.h2
-rw-r--r--kdeprint/management/kmdriverdialog.cpp2
-rw-r--r--kdeprint/management/kmdriverdialog.h2
-rw-r--r--kdeprint/management/kmiconview.cpp2
-rw-r--r--kdeprint/management/kmiconview.h2
-rw-r--r--kdeprint/management/kminfopage.cpp2
-rw-r--r--kdeprint/management/kminfopage.h2
-rw-r--r--kdeprint/management/kminstancepage.cpp2
-rw-r--r--kdeprint/management/kminstancepage.h2
-rw-r--r--kdeprint/management/kmjobviewer.cpp6
-rw-r--r--kdeprint/management/kmjobviewer.h2
-rw-r--r--kdeprint/management/kmlistview.cpp4
-rw-r--r--kdeprint/management/kmlistview.h2
-rw-r--r--kdeprint/management/kmmainview.cpp50
-rw-r--r--kdeprint/management/kmmainview.h6
-rw-r--r--kdeprint/management/kmpages.cpp2
-rw-r--r--kdeprint/management/kmpages.h2
-rw-r--r--kdeprint/management/kmprinterpage.h2
-rw-r--r--kdeprint/management/kmprinterview.cpp2
-rw-r--r--kdeprint/management/kmprinterview.h2
-rw-r--r--kdeprint/management/kmpropbackend.cpp2
-rw-r--r--kdeprint/management/kmpropbackend.h2
-rw-r--r--kdeprint/management/kmpropcontainer.cpp2
-rw-r--r--kdeprint/management/kmpropcontainer.h2
-rw-r--r--kdeprint/management/kmpropdriver.cpp2
-rw-r--r--kdeprint/management/kmpropdriver.h2
-rw-r--r--kdeprint/management/kmpropertypage.cpp2
-rw-r--r--kdeprint/management/kmpropertypage.h4
-rw-r--r--kdeprint/management/kmpropgeneral.cpp2
-rw-r--r--kdeprint/management/kmpropgeneral.h2
-rw-r--r--kdeprint/management/kmpropmembers.cpp4
-rw-r--r--kdeprint/management/kmpropmembers.h2
-rw-r--r--kdeprint/management/kmpropwidget.cpp2
-rw-r--r--kdeprint/management/kmpropwidget.h2
-rw-r--r--kdeprint/management/kmspecialprinterdlg.cpp4
-rw-r--r--kdeprint/management/kmspecialprinterdlg.h2
-rw-r--r--kdeprint/management/kmtimer.cpp2
-rw-r--r--kdeprint/management/kmtimer.h2
-rw-r--r--kdeprint/management/kmwbackend.cpp2
-rw-r--r--kdeprint/management/kmwbackend.h2
-rw-r--r--kdeprint/management/kmwclass.cpp2
-rw-r--r--kdeprint/management/kmwclass.h2
-rw-r--r--kdeprint/management/kmwdriver.cpp2
-rw-r--r--kdeprint/management/kmwdriver.h2
-rw-r--r--kdeprint/management/kmwdriverselect.cpp2
-rw-r--r--kdeprint/management/kmwdriverselect.h2
-rw-r--r--kdeprint/management/kmwdrivertest.cpp4
-rw-r--r--kdeprint/management/kmwdrivertest.h2
-rw-r--r--kdeprint/management/kmwend.cpp2
-rw-r--r--kdeprint/management/kmwend.h2
-rw-r--r--kdeprint/management/kmwfile.cpp2
-rw-r--r--kdeprint/management/kmwfile.h2
-rw-r--r--kdeprint/management/kmwinfobase.cpp2
-rw-r--r--kdeprint/management/kmwinfobase.h2
-rw-r--r--kdeprint/management/kmwinfopage.cpp2
-rw-r--r--kdeprint/management/kmwinfopage.h2
-rw-r--r--kdeprint/management/kmwizard.cpp4
-rw-r--r--kdeprint/management/kmwizard.h2
-rw-r--r--kdeprint/management/kmwizardpage.cpp2
-rw-r--r--kdeprint/management/kmwizardpage.h2
-rw-r--r--kdeprint/management/kmwlocal.cpp6
-rw-r--r--kdeprint/management/kmwlocal.h2
-rw-r--r--kdeprint/management/kmwlpd.cpp2
-rw-r--r--kdeprint/management/kmwlpd.h2
-rw-r--r--kdeprint/management/kmwname.cpp2
-rw-r--r--kdeprint/management/kmwname.h2
-rw-r--r--kdeprint/management/kmwpassword.cpp2
-rw-r--r--kdeprint/management/kmwpassword.h2
-rw-r--r--kdeprint/management/kmwsmb.cpp2
-rw-r--r--kdeprint/management/kmwsmb.h2
-rw-r--r--kdeprint/management/kmwsocket.cpp4
-rw-r--r--kdeprint/management/kmwsocket.h2
-rw-r--r--kdeprint/management/kmwsocketutil.cpp2
-rw-r--r--kdeprint/management/kmwsocketutil.h2
-rw-r--r--kdeprint/management/kxmlcommanddlg.cpp2
-rw-r--r--kdeprint/management/kxmlcommanddlg.h2
-rw-r--r--kdeprint/management/kxmlcommandselector.cpp4
-rw-r--r--kdeprint/management/kxmlcommandselector.h2
-rw-r--r--kdeprint/management/networkscanner.cpp2
-rw-r--r--kdeprint/management/networkscanner.h2
-rw-r--r--kdeprint/management/pluginaction.cpp2
-rw-r--r--kdeprint/management/pluginaction.h2
-rw-r--r--kdeprint/management/sidepixmap.cpp8
-rw-r--r--kdeprint/management/sidepixmap.h2
-rw-r--r--kdeprint/management/smbview.cpp6
-rw-r--r--kdeprint/management/smbview.h2
-rw-r--r--kdeprint/marginpreview.cpp2
-rw-r--r--kdeprint/marginpreview.h2
-rw-r--r--kdeprint/marginvaluewidget.cpp2
-rw-r--r--kdeprint/marginvaluewidget.h2
-rw-r--r--kdeprint/marginwidget.cpp2
-rw-r--r--kdeprint/marginwidget.h2
-rw-r--r--kdeprint/messagewindow.cpp4
-rw-r--r--kdeprint/messagewindow.h2
-rw-r--r--kdeprint/pics/CMakeLists.txt50
-rw-r--r--kdeprint/pics/Makefile.am42
-rw-r--r--kdeprint/plugincombobox.cpp2
-rw-r--r--kdeprint/plugincombobox.h2
-rw-r--r--kdeprint/posterpreview.cpp2
-rw-r--r--kdeprint/posterpreview.h2
-rw-r--r--kdeprint/ppdloader.cpp16
-rw-r--r--kdeprint/ppdloader.h4
-rw-r--r--kdeprint/ppdparser.cpp20
-rw-r--r--kdeprint/ppdparser.cpp.h2
-rw-r--r--kdeprint/ppdparser.y6
-rw-r--r--kdeprint/ppdscanner.cpp74
-rw-r--r--kdeprint/ppdscanner.l42
-rw-r--r--kdeprint/printerfilter.cpp2
-rw-r--r--kdeprint/printerfilter.h2
-rw-r--r--kdeprint/rlpr/CMakeLists.txt18
-rw-r--r--kdeprint/rlpr/Makefile.am14
-rw-r--r--kdeprint/rlpr/kmconfigproxy.cpp2
-rw-r--r--kdeprint/rlpr/kmconfigproxy.h2
-rw-r--r--kdeprint/rlpr/kmproprlpr.cpp2
-rw-r--r--kdeprint/rlpr/kmproprlpr.h2
-rw-r--r--kdeprint/rlpr/kmproxywidget.cpp2
-rw-r--r--kdeprint/rlpr/kmproxywidget.h2
-rw-r--r--kdeprint/rlpr/kmrlprfactory.cpp4
-rw-r--r--kdeprint/rlpr/kmrlprmanager.cpp4
-rw-r--r--kdeprint/rlpr/kmrlprmanager.h2
-rw-r--r--kdeprint/rlpr/kmrlpruimanager.cpp2
-rw-r--r--kdeprint/rlpr/kmrlpruimanager.h2
-rw-r--r--kdeprint/rlpr/kmwrlpr.cpp10
-rw-r--r--kdeprint/rlpr/kmwrlpr.h2
-rw-r--r--kdeprint/rlpr/krlprprinterimpl.cpp2
-rw-r--r--kdeprint/rlpr/krlprprinterimpl.h2
-rw-r--r--kdeprint/signal_proc.c2
-rw-r--r--kdeprint/specials.desktop8
-rw-r--r--kdeprint/tests/Makefile.am6
-rw-r--r--kdeprint/tools/escputil/CMakeLists.txt14
-rw-r--r--kdeprint/tools/escputil/Makefile.am12
-rw-r--r--kdeprint/tools/escputil/escpwidget.cpp8
-rw-r--r--kdeprint/tools/escputil/escpwidget.h2
-rw-r--r--kdeprint/treecombobox.cpp2
-rw-r--r--kdeprint/treecombobox.h2
-rw-r--r--kdeprint/util.cpp2
-rw-r--r--kdeprint/util.h2
-rw-r--r--kdesu/CMakeLists.txt22
-rw-r--r--kdesu/Mainpage.dox4
-rw-r--r--kdesu/Makefile.am26
-rw-r--r--kdesu/README6
-rw-r--r--kdesu/client.cpp18
-rw-r--r--kdesu/client.h12
-rw-r--r--kdesu/configure.in.in18
-rw-r--r--kdesu/defaults.h2
-rw-r--r--kdesu/kcookie.cpp2
-rw-r--r--kdesu/kcookie.h2
-rw-r--r--kdesu/kdesu_pty.cpp4
-rw-r--r--kdesu/kdesu_pty.h2
-rw-r--r--kdesu/kdesu_stub.c48
-rw-r--r--kdesu/libkdesu.nmcheck2
-rw-r--r--kdesu/process.cpp4
-rw-r--r--kdesu/process.h4
-rw-r--r--kdesu/ssh.cpp10
-rw-r--r--kdesu/ssh.h2
-rw-r--r--kdesu/stub.cpp10
-rw-r--r--kdesu/stub.h10
-rw-r--r--kdesu/su.cpp12
-rw-r--r--kdesu/su.h2
-rw-r--r--kdeui/CMakeLists.txt12
-rw-r--r--kdeui/Makefile.am12
-rw-r--r--kdeui/about/CMakeLists.txt2
-rw-r--r--kdeui/about/Makefile.am2
-rw-r--r--kdeui/kaboutkde.cpp2
-rw-r--r--kdeui/kactivelabel.cpp2
-rw-r--r--kdeui/kcmodule.cpp2
-rw-r--r--kdeui/kdepackages.h42
-rw-r--r--kdeui/kdetrayproxy/CMakeLists.txt6
-rw-r--r--kdeui/kpanelmenu.cpp2
-rw-r--r--kdeui/kpanelmenu.h4
-rw-r--r--kdeui/kpassdlg.cpp4
-rw-r--r--kdeui/kpixmapio.cpp2
-rw-r--r--kdeui/kpixmapio.h2
-rw-r--r--kdeui/kpixmapregionselectorwidget.cpp4
-rw-r--r--kdeui/kpixmapregionselectorwidget.h4
-rw-r--r--kdeui/krootpixmap.cpp2
-rw-r--r--kdeui/ktip.cpp4
-rw-r--r--kdeui/libkdeui.nmcheck2
-rw-r--r--kdeui/qxembed.cpp4
-rw-r--r--kdeui/tests/CMakeLists.txt8
-rw-r--r--kdeui/tests/Makefile.am2
-rw-r--r--kdewidgets/CMakeLists.txt8
-rw-r--r--kdewidgets/Makefile.am4
-rw-r--r--kdoctools/CMakeLists.txt4
-rw-r--r--kdoctools/Mainpage.dox2
-rw-r--r--kdoctools/configure.in.in4
-rw-r--r--kdoctools/customization/entities/contributor.entities2
-rw-r--r--kdoctools/customization/entities/general.entities4
-rw-r--r--kdoctools/customization/obsolete/general.entities2
-rw-r--r--kdoctools/customization/sr/user.entities2
-rw-r--r--kdoctools/template.docbook2
-rw-r--r--khtml/CMakeLists.txt12
-rw-r--r--khtml/Mainpage.dox2
-rw-r--r--khtml/Makefile.am8
-rw-r--r--khtml/css/CMakeLists.txt6
-rw-r--r--khtml/design.h2
-rw-r--r--khtml/dom/CMakeLists.txt4
-rw-r--r--khtml/dom/Makefile.am2
-rw-r--r--khtml/ecma/CMakeLists.txt8
-rw-r--r--khtml/html/CMakeLists.txt6
-rw-r--r--khtml/java/CMakeLists.txt6
-rw-r--r--khtml/khtml_part.cpp2
-rw-r--r--khtml/khtml_printsettings.cpp2
-rw-r--r--khtml/khtml_printsettings.h4
-rw-r--r--khtml/khtmlview.cpp2
-rw-r--r--khtml/kmultipart/CMakeLists.txt6
-rw-r--r--khtml/misc/CMakeLists.txt6
-rw-r--r--khtml/misc/Makefile.am2
-rw-r--r--khtml/rendering/CMakeLists.txt6
-rw-r--r--khtml/rendering/Makefile.am2
-rw-r--r--khtml/xml/CMakeLists.txt6
-rw-r--r--khtml/xml/Makefile.am2
-rw-r--r--kimgio/CMakeLists.txt30
-rw-r--r--kimgio/Makefile.am2
-rw-r--r--kinit/CMakeLists.txt38
-rw-r--r--kinit/Mainpage.dox8
-rw-r--r--kinit/Makefile.am34
-rw-r--r--kinit/README28
-rw-r--r--kinit/README.wrapper22
-rw-r--r--kinit/configure.in.in12
-rw-r--r--kinit/kinit.cpp174
-rw-r--r--kinit/klauncher.cpp86
-rw-r--r--kinit/klauncher.h8
-rw-r--r--kinit/klauncher_cmds.h14
-rw-r--r--kinit/klauncher_main.cpp4
-rw-r--r--kinit/setproctitle.cpp4
-rw-r--r--kinit/setproctitle.h4
-rw-r--r--kinit/start_kdeinit.c8
-rw-r--r--kinit/start_kdeinit_wrapper.c20
-rw-r--r--kinit/tests/klaunchertest.cpp2
-rw-r--r--kinit/wrapper.c14
-rw-r--r--kio/CMakeLists.txt2
-rw-r--r--kio/DESIGN2
-rw-r--r--kio/Makefile.am4
-rw-r--r--kio/bookmarks/CMakeLists.txt8
-rw-r--r--kio/bookmarks/Makefile.am2
-rw-r--r--kio/httpfilter/CMakeLists.txt4
-rw-r--r--kio/kfile/CMakeLists.txt8
-rw-r--r--kio/kfile/ChangeLog2
-rw-r--r--kio/kfile/Makefile.am2
-rw-r--r--kio/kfile/kfilesharedlg.cpp2
-rw-r--r--kio/kio/CMakeLists.txt8
-rw-r--r--kio/kio/Makefile.am4
-rw-r--r--kio/kio/kmimetype.cpp2
-rw-r--r--kio/kio/kprotocolinfo.cpp2
-rw-r--r--kio/kio/kprotocolinfo.h10
-rw-r--r--kio/kio/krun.cpp10
-rw-r--r--kio/kio/scheduler.cpp2
-rw-r--r--kio/kio/sessiondata.cpp28
-rw-r--r--kio/kio/slavebase.cpp2
-rw-r--r--kio/kioexec/CMakeLists.txt6
-rw-r--r--kio/kioexec/Makefile.am2
-rw-r--r--kio/kpasswdserver/CMakeLists.txt8
-rw-r--r--kio/kssl/CMakeLists.txt8
-rw-r--r--kio/kssl/Makefile.am2
-rw-r--r--kio/misc/CMakeLists.txt16
-rw-r--r--kio/misc/Makefile.am8
-rw-r--r--kio/misc/kdesasl/CMakeLists.txt14
-rw-r--r--kio/misc/kdesasl/Makefile.am6
-rw-r--r--kio/misc/kdesasl/kdesasl.cpp2
-rw-r--r--kio/misc/kfile/CMakeLists.txt6
-rw-r--r--kio/misc/kfile/Makefile.am2
-rw-r--r--kio/misc/kntlm/CMakeLists.txt6
-rw-r--r--kio/misc/kpac/CMakeLists.txt8
-rw-r--r--kio/misc/kpac/Makefile.am2
-rw-r--r--kio/misc/ksendbugmail/CMakeLists.txt4
-rw-r--r--kio/misc/ksendbugmail/Makefile.am2
-rw-r--r--kio/misc/kssld/CMakeLists.txt6
-rw-r--r--kio/misc/ktelnetservice.cpp2
-rw-r--r--kio/misc/kwalletd/CMakeLists.txt8
-rw-r--r--kio/misc/uiserver.cpp2
-rw-r--r--kio/tests/CMakeLists.txt4
-rw-r--r--kio/tests/Makefile.am2
-rw-r--r--kio/tests/kruntest.cpp8
-rw-r--r--kioslave/bzip2/CMakeLists.txt4
-rw-r--r--kioslave/file/CMakeLists.txt4
-rw-r--r--kioslave/ftp/CMakeLists.txt6
-rw-r--r--kioslave/gzip/CMakeLists.txt4
-rw-r--r--kioslave/gzip/Makefile.am2
-rw-r--r--kioslave/http/CMakeLists.txt8
-rw-r--r--kioslave/http/Makefile.am4
-rw-r--r--kioslave/http/http.cc2
-rw-r--r--kioslave/http/kcookiejar/CMakeLists.txt12
-rw-r--r--kioslave/http/kcookiejar/Makefile.am2
-rw-r--r--kioslave/http/kcookiejar/tests/Makefile.am2
-rw-r--r--kioslave/iso/CMakeLists.txt4
-rw-r--r--kioslave/metainfo/CMakeLists.txt4
-rw-r--r--kioslave/metainfo/Makefile.am2
-rw-r--r--kjs/CMakeLists.txt4
-rw-r--r--kjs/Mainpage.dox2
-rw-r--r--kjs/Makefile.am2
-rw-r--r--kjs/date_object.cpp2
-rw-r--r--kmdi/CMakeLists.txt8
-rw-r--r--kmdi/kmdi/CMakeLists.txt8
-rw-r--r--kmdi/kmdi/dockcontainer.cpp2
-rw-r--r--kmdi/kmdidockcontainer.cpp2
-rw-r--r--knewstuff/CMakeLists.txt6
-rw-r--r--knewstuff/Mainpage.dox2
-rw-r--r--knewstuff/Makefile.am6
-rw-r--r--kparts/CMakeLists.txt6
-rw-r--r--kparts/Mainpage.dox2
-rw-r--r--kparts/Makefile.am2
-rw-r--r--krandr/CMakeLists.txt8
-rw-r--r--krandr/Mainpage.dox2
-rw-r--r--krandr/Makefile.am4
-rw-r--r--kresources/CMakeLists.txt6
-rw-r--r--kresources/Makefile.am2
-rw-r--r--kresources/README.design4
-rw-r--r--krsync/CMakeLists.txt10
-rw-r--r--kspell2/CMakeLists.txt6
-rw-r--r--kspell2/plugins/aspell/CMakeLists.txt4
-rw-r--r--kspell2/plugins/hspell/CMakeLists.txt4
-rw-r--r--kspell2/plugins/ispell/CMakeLists.txt4
-rw-r--r--kspell2/ui/CMakeLists.txt6
-rw-r--r--kstyles/asteroid/CMakeLists.txt8
-rw-r--r--kstyles/asteroid/Makefile.am2
-rw-r--r--kstyles/highcolor/CMakeLists.txt8
-rw-r--r--kstyles/highcolor/Makefile.am4
-rw-r--r--kstyles/highcontrast/CMakeLists.txt8
-rw-r--r--kstyles/highcontrast/Makefile.am2
-rw-r--r--kstyles/highcontrast/config/CMakeLists.txt8
-rw-r--r--kstyles/keramik/CMakeLists.txt10
-rw-r--r--kstyles/keramik/Makefile.am8
-rw-r--r--kstyles/kthemestyle/CMakeLists.txt8
-rw-r--r--kstyles/kthemestyle/Makefile.am4
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp2
-rw-r--r--kstyles/light/CMakeLists.txt8
-rw-r--r--kstyles/light/Makefile.am4
-rw-r--r--kstyles/plastik/CMakeLists.txt8
-rw-r--r--kstyles/plastik/Makefile.am2
-rw-r--r--kstyles/plastik/config/CMakeLists.txt8
-rw-r--r--kstyles/utils/installtheme/CMakeLists.txt6
-rw-r--r--kstyles/utils/installtheme/Makefile.am2
-rw-r--r--kunittest/CMakeLists.txt6
-rw-r--r--kunittest/Makefile.am2
-rw-r--r--kutils/CMakeLists.txt6
-rw-r--r--kutils/Mainpage.dox2
-rw-r--r--kutils/Makefile.am2
-rw-r--r--kutils/kcmoduleproxy.cpp14
-rw-r--r--kutils/ksettings/CMakeLists.txt6
-rw-r--r--kwallet/backend/CMakeLists.txt6
-rw-r--r--kwallet/backend/Makefile.am2
-rw-r--r--kwallet/client/CMakeLists.txt6
-rw-r--r--libkmid/CMakeLists.txt6
-rw-r--r--libkmid/Makefile.am4
-rw-r--r--libkscreensaver/CMakeLists.txt6
-rw-r--r--networkstatus/CMakeLists.txt10
-rw-r--r--networkstatus/clientiface.h2
-rw-r--r--networkstatus/clientifaceimpl.cpp2
-rw-r--r--networkstatus/clientifaceimpl.h2
-rw-r--r--networkstatus/connectionmanager.cpp2
-rw-r--r--networkstatus/network.cpp2
-rw-r--r--networkstatus/network.h2
-rw-r--r--networkstatus/networkstatus.cpp2
-rw-r--r--networkstatus/networkstatus.h2
-rw-r--r--networkstatus/networkstatuscommon.cpp2
-rw-r--r--networkstatus/networkstatuscommon.h2
-rw-r--r--networkstatus/networkstatusiface.h2
-rw-r--r--networkstatus/provideriface.h2
-rw-r--r--networkstatus/serviceiface.h2
-rw-r--r--networkstatus/serviceifaceimpl.cpp2
-rw-r--r--networkstatus/serviceifaceimpl.h2
-rw-r--r--networkstatus/testservice.cpp2
-rw-r--r--networkstatus/testservice.h2
-rw-r--r--pics/CMakeLists.txt10
-rw-r--r--pics/Makefile.am6
-rw-r--r--win/common.pro12
-rw-r--r--win/dirent.h2
-rw-r--r--win/fcntl.h2
-rw-r--r--win/kde_file_win.h2
-rw-r--r--win/pro_files/dcop/client/client.pro2
-rw-r--r--win/pro_files/dcop/client/dcop/dcop.pro2
-rw-r--r--win/pro_files/dcop/client/dcopfind/dcopfind.pro2
-rw-r--r--win/pro_files/dcop/client/dcopref/dcopref.pro2
-rw-r--r--win/pro_files/dcop/dcopidl/dcopidl.pro4
-rw-r--r--win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro4
-rw-r--r--win/pro_files/dcop/dcopserver/dcopserver.pro2
-rw-r--r--win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro2
-rw-r--r--win/pro_files/dcop/iceauth/iceauth.pro2
-rw-r--r--win/pro_files/dcop/testdcop/testdcop.pro2
-rw-r--r--win/pro_files/dcop/tests/dcop_test.pro2
-rw-r--r--win/pro_files/dcop/tests/driver.pro2
-rw-r--r--win/pro_files/dcop/tests/tests.pro2
-rw-r--r--win/pro_files/interfaces/ktexteditor/ktexteditor.pro4
-rw-r--r--win/pro_files/kabc/kabc.pro2
-rw-r--r--win/pro_files/kabc/vcard/vcard.pro2
-rw-r--r--win/pro_files/kate/interfaces/interfaces.pro2
-rw-r--r--win/pro_files/kate/part/part.pro6
-rw-r--r--win/pro_files/kdecore/kdecore.pro12
-rw-r--r--win/pro_files/kdefx/kdefx.pro2
-rw-r--r--win/pro_files/kdefx/kdefx_rel.pro2
-rw-r--r--win/pro_files/kdeprint/kdeprint.pro2
-rw-r--r--win/pro_files/kdeui/kdeui.pro4
-rw-r--r--win/pro_files/kdewidgets/kdewidgets.pro4
-rw-r--r--win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro2
-rw-r--r--win/pro_files/kio/kio.pro6
-rw-r--r--win/pro_files/kioslave/common.pro2
-rw-r--r--win/pro_files/kmdi/kmdi.pro4
-rw-r--r--win/pro_files/kmdi/test/test.pro2
-rw-r--r--win/pro_files/kparts/kparts.pro2
-rw-r--r--win/pro_files/kresources/kresources.pro2
-rw-r--r--win/pro_files/kstyles/common.pro2
-rw-r--r--win/pro_files/kstyles/kthemestyle/themestyle.pro2
-rw-r--r--win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro2
-rw-r--r--win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro14
-rw-r--r--win/pro_files/kutils/kutils.pro2
-rw-r--r--win/pwd.h2
-rw-r--r--win/signal.h2
-rw-r--r--win/stdlib.h2
-rw-r--r--win/string.h2
-rw-r--r--win/sys/mman.h2
-rw-r--r--win/sys/resource.h2
-rw-r--r--win/sys/stat.h2
-rw-r--r--win/sys/time.h2
-rw-r--r--win/sys/times.h2
-rw-r--r--win/sys/utsname.h2
-rw-r--r--win/syslog.h2
-rw-r--r--win/tools/build_kdelibs_dbg6
-rw-r--r--win/tools/build_kdelibs_rel6
-rwxr-xr-xwin/tools/kde_env2
-rw-r--r--win/unistd.h2
-rw-r--r--win/win.pro4
-rw-r--r--win/win32_utils.h2
847 files changed, 2344 insertions, 2344 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 569129be..5837d0f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -412,7 +412,7 @@ if( WITH_SUDO_KDESU_BACKEND )
if( __PATH_SUDO )
set( DEFAULT_SUPER_USER_COMMAND ${__PATH_SUDO} )
else( __PATH_SUDO )
- message( FATAL_ERROR "sudo was chosen as kdesu backend, but was not found in path." )
+ message( FATAL_ERROR "sudo was chosen as tdesu backend, but was not found in path." )
endif( __PATH_SUDO )
endif( WITH_SUDO_KDESU_BACKEND )
@@ -740,7 +740,7 @@ endif( WITH_HSPELL )
configure_file( config.h.cmake config.h )
configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
-configure_file( kdecore/kdemacros.h.cmake kdecore/kdemacros.h )
+configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
configure_file( kjs/global.h.in kjs/global.h )
configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
@@ -751,7 +751,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc )
-set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_compiler )
+set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler )
##### global compiler settings ##################
@@ -777,11 +777,11 @@ install( FILES
add_subdirectory( dcop )
add_subdirectory( libltdl )
add_subdirectory( kglib )
-add_subdirectory( kdefx )
-add_subdirectory( kdecore )
+add_subdirectory( tdefx )
+add_subdirectory( tdecore )
add_subdirectory( kunittest )
-add_subdirectory( kdeui )
-add_subdirectory( kdesu )
+add_subdirectory( tdeui )
+add_subdirectory( tdesu )
add_subdirectory( kjs )
add_subdirectory( kwallet )
add_subdirectory( kio )
@@ -797,7 +797,7 @@ add_subdirectory( kutils )
add_subdirectory( kspell2 )
add_subdirectory( kmdi )
add_subdirectory( kinit )
-add_subdirectory( kdeprint )
+add_subdirectory( tdeprint )
add_subdirectory( kab )
add_subdirectory( kresources )
add_subdirectory( kabc )
diff --git a/COMPILING b/COMPILING
index c40f507b..d572b2b6 100644
--- a/COMPILING
+++ b/COMPILING
@@ -102,11 +102,11 @@ Makefile.am but not a Makefile. If you try to compile such a directory
you will get an error like:
Making all in management
- make[3]: Entering directory /home/gregturp/KDE/kdelibs/kdeprint/management'
+ make[3]: Entering directory /home/gregturp/KDE/kdelibs/tdeprint/management'
make[3]: *** No rule to make target all'. Stop.
- make[3]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint/management'
+ make[3]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint/management'
make[2]: *** [all-recursive] Error 1
- make[2]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint'
+ make[2]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory /home/gregturp/KDE/kdelibs'
make: *** [all-recursive-am] Error 2
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 111d2c45..da4cd731 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -30,7 +30,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#launching">Starting other programs</A></LI>
<LI><A HREF="#khtmlw">khtmlw</A></LI>
<LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
-<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></LI>
+<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
<LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI>
<LI><A HREF="#libkfm">libkfm</A></LI>
<LI><A HREF="#KDialog">KDialog</A></LI>
@@ -175,7 +175,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
certain option was specified on the command line and your application
now automatically supports --help and --version. It aborts with a
useful error message when the command line contains a syntax error.
- See kdelibs/kdecore/kcmdlineargs.h for more info.<P>
+ See kdelibs/tdecore/kcmdlineargs.h for more info.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -285,7 +285,7 @@ The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication
have all been removed. If you need direct access to these or need
access to a help menu in a class that is not derived from
KMainWindow then allocate an instance of the new class KHelpMenu.
-See KDE 2.0 API reference or khelpmenu.h (kdeui) for additional info.<P>
+See KDE 2.0 API reference or khelpmenu.h (tdeui) for additional info.<P>
Espen Sand &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>
@@ -430,7 +430,7 @@ khtmlw has been replaced with khtml.<BR>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></H3>
+<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></H3>
KDE Drag and Drop is Dead. Long live Qt Xdnd.<P>
@@ -481,7 +481,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
Much more extensive documentation on the KConfig and friends API can
be found in the kdoc generated documentation from the header files,
- and in kdecore/KCONFIG_DESIGN.<P>
+ and in tdecore/KCONFIG_DESIGN.<P>
To use the new iterator, you will probably want to do something like
this:<P>
@@ -515,7 +515,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
<TR><TD>KFM::exec </TD><TD>-&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>
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>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index c8639454..7ef397c0 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -17,8 +17,8 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
<UL>
<LI><A HREF="#gettingstarted">Getting Started</A></LI>
<LI><A HREF="#kab">Changes in kab</A></LI>
-<LI><A HREF="#kdecore">Changes in kdecore</A></LI>
-<LI><A HREF="#kdeui">Changes in kdeui</A></LI>
+<LI><A HREF="#tdecore">Changes in tdecore</A></LI>
+<LI><A HREF="#tdeui">Changes in tdeui</A></LI>
<LI><A HREF="#kio">Changes in kio</A></LI>
<LI><A HREF="#kparts">Changes in kparts</A></LI>
<LI><A HREF="#kspell">Changes in kspell</A></LI>
@@ -65,7 +65,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="kdecore">Changes in kdecore</A></H3>
+<H3><A NAME="tdecore">Changes in tdecore</A></H3>
<H4>KDesktopWidget</H4>
KDesktopWidget is obsolete. Include &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.
<H4>KPixmapSplitter</H4>
-KPixmapSplitter has now been moved to the new kdefx library.
+KPixmapSplitter has now been moved to the new tdefx library.
<H4>KStringHandler</H4>
The <i>matchFilename( const TQString& filename, const TQString& pattern )</i> method has been
@@ -121,8 +121,8 @@ Due to the major changes in the TQStyle API in Qt3, KStyle has been completely
re-written. KStyle is now a thin wrapper around TQCommonStyle with a few extra
primitive elements and a simple popupMenu transparency engine. All KStyles can
now style Qt apps like designer and assistant automatically. KStyle is no longer
-present in kdecore. It is now in a new library called kdefx to allow Qt apps to
-use KDE's styles without having the styles linked to kdecore/kdeui.
+present in tdecore. It is now in a new library called tdefx to allow Qt apps to
+use KDE's styles without having the styles linked to tdecore/tdeui.
<H4>KURL</H4>
The <i>filename( bool _ignore_trailing_slash_in_path = true )</i> method has been
@@ -219,7 +219,7 @@ KURLBar and KURLBarItem.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="kdeui">Changes in kdeui</A></H3>
+<H3><A NAME="tdeui">Changes in tdeui</A></H3>
<H4>KAccelMenu</H4>
This class has been removed, Qt offers the same functionality.
@@ -281,7 +281,7 @@ KEdit is now deprecated. You should use use KTextEditor::Editor or
KTextEdit instead.
<H4>KImageEffect</H4>
-KImageEffect has now been moved to the new kdefx library.
+KImageEffect has now been moved to the new tdefx library.
<H4>KMessageBox</H4>
KMessageBox now does automatic line-breaking. When using plain-text, you should
@@ -303,7 +303,7 @@ at run-time). See KDE 3.0 documentation
for more informations on this new extension.
<H4>KPixmapEffect</H4>
-PixmapEffect has now been moved to the new kdefx library.
+PixmapEffect has now been moved to the new tdefx library.
<H4>KProgress</H4>
KProgress is now based on TQProgressBar.
@@ -319,7 +319,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.
<H4>KThemeBase, KThemeStyle</H4>
KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API
-present in Qt3/KDE3. KThemeBase is no longer in kdeui, but in kstyles/kthemestyle
+present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
as its use is basically limited to KThemeStyle.
<H4>KAction, KToolBar, KToolBarButton and icons</H4>
diff --git a/Mainpage.dox b/Mainpage.dox
index 368f25ba..f1d31fae 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -8,11 +8,11 @@
* can subscribe or read the mailing lists for any additions and/or
* modifications to the API.
*
- * - <a target="_top" href="kdecore/html/index.html"><b>kdecore</b></a>
- * (<a target="_top" href="kdecore/html/classes.html">classes</a>)\n
+ * - <a target="_top" href="tdecore/html/index.html"><b>tdecore</b></a>
+ * (<a target="_top" href="tdecore/html/classes.html">classes</a>)\n
* <i>Core Trinity classes that are not related to the user interface.</i>
- * - <a target="_top" href="kdeui/html/index.html"><b>kdeui</b></a>
- * (<a target="_top" href="kdeui/html/classes.html">classes</a>)\n
+ * - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a>
+ * (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n
* <i>Trinity User interface classes such as widgets.</i>
* - <a target="_top" href="khtml/html/index.html"><b>khtml</b></a>
* (<a target="_top" href="khtml/html/classes.html">classes</a>)\n
@@ -30,8 +30,8 @@
* - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a>
* (<a target="_top" href="dcop/html/classes.html">classes</a>)\n
* <i>The DCOP communications library.</i>
- * - <a target="_top" href="kdefx/html/index.html"><b>kdefx</b></a>
- * (<a target="_top" href="kdefx/html/classes.html">classes</a>)\n
+ * - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a>
+ * (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n
* <i>A library with pixmap effects.</i>
* - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a>
* (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n
@@ -39,8 +39,8 @@
* - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a>
* (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n
* <i>Midi library.</i>
- * - <a target="_top" href="kdeprint/html/index.html"><b>kdeprint</b></a>
- * (<a target="_top" href="kdeprint/html/classes.html">classes</a>)\n
+ * - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
+ * (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
* <i>High level printer control functionality.</i>
* - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a>
* (<a target="_top" href="krandr/html/classes.html">classes</a>)\n
diff --git a/Makefile.am.in b/Makefile.am.in
index ba1149e5..6a92a88a 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -18,10 +18,10 @@
# Boston, MA 02110-1301, USA.
-COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio kded kded_post
+COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post
COMPILE_BEFORE_doc = kdoctools
-COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml krandr
-COMPILE_AFTER_kdeprint = kate khtml
+COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
+COMPILE_AFTER_tdeprint = kate khtml
COMPILE_BEFORE_khtml = kutils
COMPILE_BEFORE_kabc = kab kresources
COMPILE_BEFORE_kate = interfaces kutils
@@ -53,7 +53,7 @@ messages:
find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
- echo ./kdecore/kde-config.cpp.in >> files ;\
+ echo ./tdecore/kde-config.cpp.in >> files ;\
$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
: > kde.pot ;\
$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot
diff --git a/NAMING b/NAMING
index 7ffa2738..6d54ac1b 100644
--- a/NAMING
+++ b/NAMING
@@ -16,7 +16,7 @@ use both "xxxx.la" and "libxxxx.la" as names for DSOs!!
KDEInit Loadable Modules
========================
Name: <appname>.la
-Definition: kdeinit_LTLIBRARIES = <appname>.la
+Definition: tdeinit_LTLIBRARIES = <appname>.la
LDFLAGS: -module $(KDE_PLUGIN)
diff --git a/README b/README
index 94177175..139d8041 100644
--- a/README
+++ b/README
@@ -45,23 +45,23 @@ Here is an alphabetical list:
* kconf_update
Auto-Updater for config files.
-* kdecore
+* tdecore
This is the core collection of KDE stuff. Non GUI classes reside here.
* kded
The KDE daemon checks for newly installed software, update files
or hostname changes and takes according actions.
-* kdefx
+* tdefx
Library with pixmap effects.
-* kdeprint
+* tdeprint
The very versatile printing subsystem of KDE.
-* kdesu
+* tdesu
Library for password entering and handling
-* kdeui
+* tdeui
The main collection of misc. user interface classes (widgets).
KSpell and related classes are a frontend to ispell for use within a
GUI app.
diff --git a/TODO b/TODO
index 3d308705..afb4709e 100644
--- a/TODO
+++ b/TODO
@@ -71,7 +71,7 @@ that we would like to make for the next binary incompatible release.
- Solve need for casting when using bitfield enums (e.g. KProcess::Communication),
if Simon's solution works.
-- Merge kdelibs/kdecore/kuser.h and kdeadmin/kuser/kuser.h.
+- Merge kdelibs/tdecore/kuser.h and kdeadmin/kuser/kuser.h.
- Simplify memory management with KParts. The part and the widget delete each other,
which in fact makes it more complex to handle. The part owns the widget so it
@@ -173,7 +173,7 @@ that we would like to make for the next binary incompatible release.
- Get rid of KXMLClient::conserveMemory() and the conserveMemory argument in createGUI. It created
too many problems in the past. Not worth the trouble.
-- Split KProtocolInfo into KProtocolInfoBase in kdecore (with almost everything)
+- Split KProtocolInfo into KProtocolInfoBase in tdecore (with almost everything)
and KProtocolInfo in kio (with the methods taking a KURL, which need KProtocolManager)
- Rename KDirNotify_stub and update API (no need for '*' arguments anymore)
@@ -221,7 +221,7 @@ an alternative help->contents action)
just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea
to have here for later doing.
-- Move KRichTextLabel into kdeui if still required with Qt 4.
+- Move KRichTextLabel into tdeui if still required with Qt 4.
- Add the concept of a session to KIO, in particular for KHTML so that it can
have all of its jobs associated in some way (a unique key of sorts). Will
diff --git a/arts/Makefile.am b/arts/Makefile.am
index 31bd7bbb..f15b8b7b 100644
--- a/arts/Makefile.am
+++ b/arts/Makefile.am
@@ -4,6 +4,6 @@ else
SUBDIRS = knotify
endif
-DOXYGEN_REFERENCES = kio kdecore kdeui
+DOXYGEN_REFERENCES = kio tdecore tdeui
include ../admin/Doxyfile.am
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index 9c8028bb..3877ddb9 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -15,9 +15,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index a1b75e2f..50e8b3a2 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -77,7 +77,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
X11CommConfig.sync();
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
if(rt)
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
@@ -91,7 +91,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
// We could have a race-condition here.
// The correct way to do it is to make artsd fork-and-exit
// after starting to listen to connections (and running artsd
- // directly instead of using kdeinit), but this is better
+ // directly instead of using tdeinit), but this is better
// than nothing.
int time = 0;
do
diff --git a/arts/kde/mcop-dcop/Makefile.am b/arts/kde/mcop-dcop/Makefile.am
index 6e2b90ea..07d5e7a0 100644
--- a/arts/kde/mcop-dcop/Makefile.am
+++ b/arts/kde/mcop-dcop/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(includedir)/arts -I$(top_srcdir)/arts/kde $(all_includes)
bin_PROGRAMS=
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kmcop.la
+tdeinit_LTLIBRARIES = kmcop.la
kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel
kmcop_la_LIBADD = ../libartskde.la
diff --git a/arts/knotify/CMakeLists.txt b/arts/knotify/CMakeLists.txt
index 7871b181..c290e918 100644
--- a/arts/knotify/CMakeLists.txt
+++ b/arts/knotify/CMakeLists.txt
@@ -14,11 +14,11 @@ include_directories(
${ARTS_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/arts/kde
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
)
link_directories(
@@ -43,7 +43,7 @@ set( ${target}_SRCS
if( ARTS_FOUND )
set( LIBS artskde-shared )
else( ARTS_FOUND )
- set( LIBS kdeui-shared )
+ set( LIBS tdeui-shared )
endif( ARTS_FOUND )
tde_add_kpart( ${target} AUTOMOC
diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am
index 9472b5de..fea1a9e9 100644
--- a/arts/knotify/Makefile.am
+++ b/arts/knotify/Makefile.am
@@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
check_PROGRAMS = knotifytest
knotifytest_SOURCES = knotifytest.cpp
knotifytest_LDADD = $(LIB_KDECORE)
-knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = knotify.h
diff --git a/arts/message/CMakeLists.txt b/arts/message/CMakeLists.txt
index 1a07d3d9..12e91f65 100644
--- a/arts/message/CMakeLists.txt
+++ b/arts/message/CMakeLists.txt
@@ -11,9 +11,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
)
link_directories(
@@ -31,6 +31,6 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/arts/message/Makefile.am b/arts/message/Makefile.am
index 19dbe8f2..24b7a6d1 100644
--- a/arts/message/Makefile.am
+++ b/arts/message/Makefile.am
@@ -4,5 +4,5 @@ bin_PROGRAMS = artsmessage
artsmessage_SOURCES = artsmessage.cc
-artsmessage_LDADD = ../../kdeui/libtdeui.la
+artsmessage_LDADD = ../../tdeui/libtdeui.la
artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS)
diff --git a/config.h.cmake b/config.h.cmake
index 99562b3a..cc009095 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -692,10 +692,10 @@
/* Enable prevention against poor Linux OOM-killer */
#cmakedefine KDEINIT_OOM_PROTECT 1
-/* Use FontConfig in kdeinit */
+/* Use FontConfig in tdeinit */
#cmakedefine KDEINIT_USE_FONTCONFIG 1
-/* Use Xft preinitialization in kdeinit */
+/* Use Xft preinitialization in tdeinit */
#cmakedefine KDEINIT_USE_XFT 1
/* Suffix for lib directories */
diff --git a/configure.in.bot b/configure.in.bot
index 8c6d85bf..4383af87 100644
--- a/configure.in.bot
+++ b/configure.in.bot
@@ -52,7 +52,7 @@ if test -z "$LIBXML_CFLAGS"; then
echo "so if you want helpfiles you should consider installing it."
echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform."
- echo "You can find a copy of libxml2 in the kdesupport module if you're using CVS."
+ echo "You can find a copy of libxml2 in the tdesupport module if you're using CVS."
echo ""
all_tests=bad
fi
@@ -64,7 +64,7 @@ if test -z "$LIBXSLT_CFLAGS"; then
echo "so if you want helpfiles you should consider installing it."
echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform."
- echo "You can find a copy of libxslt in the kdesupport module if you're using CVS."
+ echo "You can find a copy of libxslt in the tdesupport module if you're using CVS."
echo ""
all_tests=bad
fi
diff --git a/configure.in.in b/configure.in.in
index 658ca039..5eae312c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -250,13 +250,13 @@ AC_SUBST(LIBICE)
AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
-AC_SUBST(LIB_KDECORE, '$(top_builddir)/kdecore/libtdecore.la')
-AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libtdeui.la')
+AC_SUBST(LIB_KDECORE, '$(top_builddir)/tdecore/libtdecore.la')
+AC_SUBST(LIB_KDEUI, '$(top_builddir)/tdeui/libtdeui.la')
AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
-AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/kdeprint/libtdeprint.la')
+AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
@@ -308,7 +308,7 @@ AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
-AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/kdecore/kconfig_compiler/kconfig_compiler')
+AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler')
ac_save_LIBS="$LIBS"
LIBS="$LIBS $X_LDFLAGS -lICE"
diff --git a/configure.in.mid b/configure.in.mid
index 30814e3a..669f0d13 100644
--- a/configure.in.mid
+++ b/configure.in.mid
@@ -1,7 +1,7 @@
dnl put here things which have to be done after all usual autoconf macros
dnl have been run, but before the Makefiles are created
-all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/kdefx -I$(top_builddir)/kdecore -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
+all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
AC_SUBST(all_includes)
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
diff --git a/dcop/CMakeLists.txt b/dcop/CMakeLists.txt
index 8854ba88..ed35d657 100644
--- a/dcop/CMakeLists.txt
+++ b/dcop/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -53,7 +53,7 @@ tde_add_library( ${target} SHARED AUTOMOC
)
-#### dcopserver (kdeinit) #######################
+#### dcopserver (tdeinit) #######################
set( target dcopserver )
@@ -61,7 +61,7 @@ set( ${target}_SRCS
dcopserver.cpp dcopsignals.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kICE-static DCOP-shared
)
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 8609021c..c12939ce 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -464,7 +464,7 @@ Sometimes it might be interesting to use DCOP between processes
belonging to different users, e.g. a frontend process running
with the user's id, and a backend process running as root.
-For this you can use kdesu with the --nonewdcop option. kdesu will
+For this you can use tdesu with the --nonewdcop option. tdesu will
then forward the address of the DCOP server as well as the authentication
information to the new user.
@@ -479,9 +479,9 @@ carefully reviewed that your DCOPClient does not provide objects/functions
that could be abused for privilege escalation.
-Example: kdesu --nonewdcop -u root -c kcmroot
+Example: tdesu --nonewdcop -u root -c kcmroot
-This will, after kdesu got the root password, execute kcmroot as root,
+This will, after tdesu got the root password, execute kcmroot as root,
talking to the user's dcop server.
@@ -503,7 +503,7 @@ int main(int argc, char **argv)
Compiled with:
-g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -lkdecore
+g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore
on Linux yields the following memory use statistics:
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index d573b01b..ece62618 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -377,15 +377,15 @@ second process where to find the authentication information.
(Note that this implies that the second process is able to
read the authentication file, so it will probably only work
if the second process runs as root. If it should run as another
-user, a similar approach to what kdesu does with xauth must
+user, a similar approach to what tdesu does with xauth must
be taken. In fact, it would be a very good idea to add DCOP
-support to kdesu!)
+support to tdesu!)
For example
-ICEAUTHORITY=~user/.ICEauthority kdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`
+ICEAUTHORITY=~user/.ICEauthority tdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`
-will, after kdesu got the root password, execute kcmroot as root, talking
+will, after tdesu got the root password, execute kcmroot as root, talking
to the user's dcop server.
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index ced19c79..18739518 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -33,7 +33,7 @@ lib_LTLIBRARIES = libDCOP.la
libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
-libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
+libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck
include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h
noinst_HEADERS = version.h dcopglobal.h dcopserver.h testdcop.h dcopsignals.h dcop-path.h
@@ -43,27 +43,27 @@ METASOURCES = AUTO
# dcopstub needs to go first for --enable-final to work
libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
-kdeinit_LTLIBRARIES = dcopserver.la
+tdeinit_LTLIBRARIES = dcopserver.la
dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdcop_SOURCES = testdcop.cpp
testdcop_LDADD = libDCOP.la
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
-dcop_deadlock_test_LDADD = ../kdecore/libtdecore.la
+dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdcopc_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)
EXTRA_DIST = HOWTO ICE Mainpage.dox
-DOXYGEN_REFERENCES = kdecore
+DOXYGEN_REFERENCES = tdecore
DOXYGEN_EXCLUDE = KDE-ICE
include ../admin/Doxyfile.am
diff --git a/dcop/client/CMakeLists.txt b/dcop/client/CMakeLists.txt
index 51aca752..d0b0ee93 100644
--- a/dcop/client/CMakeLists.txt
+++ b/dcop/client/CMakeLists.txt
@@ -13,8 +13,8 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_BINARY_DIR}/tdecore
)
link_directories(
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index 9defa6d4..e848ac76 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#define KDE_QT_ONLY
-#include "../../kdecore/kurl.cpp"
+#include "../../tdecore/kurl.cpp"
bool mkBool( const TQString& s )
{
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 50984b71..3df24100 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -13,9 +13,9 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -44,7 +44,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK kdecore-shared
+ LINK tdecore-shared
DEPENDENCIES kconfig_compiler
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/dnssd/Mainpage.dox b/dnssd/Mainpage.dox
index 81ab7c98..1a056763 100644
--- a/dnssd/Mainpage.dox
+++ b/dnssd/Mainpage.dox
@@ -33,8 +33,8 @@ Jakub Stachowski
*/
-// Trinity5: get rid of kdeui reference when settings.kcfgc is changed
-// DOXYGEN_REFERENCES = kdecore kdeui
+// Trinity5: get rid of tdeui reference when settings.kcfgc is changed
+// DOXYGEN_REFERENCES = tdecore tdeui
// DOXYGEN_SET_PROJECT_NAME = DNSSD
// DOXYGEN_SET_EXCLUDE_PATTERNS += */dnssd/avahi* */dnssd/mdnsd*
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index 37df3485..c24bdd6b 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -14,7 +14,7 @@ libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
dnssdincludedir = $(includedir)/dnssd
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.h
-libkdnssd_la_LIBADD = ../kdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
+libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
#kde_kcfg_DATA = kcm_kdnssd.kcfg
diff --git a/doc/common/README.Doxygen b/doc/common/README.Doxygen
index 77b6bfe5..708f224c 100644
--- a/doc/common/README.Doxygen
+++ b/doc/common/README.Doxygen
@@ -75,14 +75,14 @@ Differences with current dox: <TODO>
# autoconf and configure. Run it in the "top builddir" with one argument,
# the "top srcdir". Something like this:
#
-# cd /mnt/build/kdepim
-# sh /mnt/src/kdepim/doc/api/doxygen.sh /mnt/src/kdepim
+# cd /mnt/build/tdepim
+# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim
#
# You can also build single subdirs (for instance, after updating some
# dox and you don't want to rebuild for the enitre module) by giving the
# subdirectory _relative to the top srcdir_ as a second argument:
#
-# sh /mnt/src/kdepim/doc/api/doxygen.sh /mnt/src/kdepim kpilot/lib
+# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim kpilot/lib
#
# When generating dox for kdelibs, a tag file for Qt is also created.
# The location of Qt is specified indirectly through $QTDOCDIR or,
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 7fc75c1e..583a7055 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech
-DOXYGEN_REFERENCES = kdecore kdefx kdeui kparts dcop
+DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop
DOXYGEN_SET_RECURSIVE = YES
include ../admin/Doxyfile.am
diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/kimproxy/library/CMakeLists.txt
index fb958497..347e552a 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/kimproxy/library/CMakeLists.txt
@@ -14,10 +14,10 @@ add_subdirectory( icons )
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/kmediaplayer/CMakeLists.txt
index 06e14d9d..98346388 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/kmediaplayer/CMakeLists.txt
@@ -16,12 +16,12 @@ endif( ARTS_FOUND )
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
)
link_directories(
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
index a316b4ff..03237da8 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
@@ -13,12 +13,12 @@ include_directories(
${TQT_INCLUDE_DIRS}
${ARTS_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/interfaces
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/interfaces/kscript/CMakeLists.txt b/interfaces/kscript/CMakeLists.txt
index 98afa228..233dc1c4 100644
--- a/interfaces/kscript/CMakeLists.txt
+++ b/interfaces/kscript/CMakeLists.txt
@@ -15,10 +15,10 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am
index dbb2843b..1d60cae7 100644
--- a/interfaces/kscript/Makefile.am
+++ b/interfaces/kscript/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_
#lib_LTLIBRARIES = libkscriptloader.la libkscript.la
lib_LTLIBRARIES = libkscript.la
#libkscriptloader_la_SOURCES = scriptloader.cpp
-#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#libkscriptloader_la_LIBADD = $(LIB_KPARTS)
libkscript_la_SOURCES = scriptmanager.cpp
diff --git a/interfaces/kscript/sample/CMakeLists.txt b/interfaces/kscript/sample/CMakeLists.txt
index eb28b188..cdb2505e 100644
--- a/interfaces/kscript/sample/CMakeLists.txt
+++ b/interfaces/kscript/sample/CMakeLists.txt
@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/interfaces/kscript
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
diff --git a/interfaces/kspeech/Makefile.am b/interfaces/kspeech/Makefile.am
index a1ecda67..f8f2b936 100644
--- a/interfaces/kspeech/Makefile.am
+++ b/interfaces/kspeech/Makefile.am
@@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h
# Define DCOP/Text-to-Speech Service Type.
kde_servicetypes_DATA = dcoptexttospeech.desktop
-DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
include ../../admin/Doxyfile.am
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt
index a011f212..3f430b50 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -14,12 +14,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kabc
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kabc
@@ -90,7 +90,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK kdeui-shared kabc-shared kparts-shared
+ LINK tdeui-shared kabc-shared kparts-shared
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/ktexteditor/Makefile.am
index d2095e78..8881648e 100644
--- a/interfaces/ktexteditor/Makefile.am
+++ b/interfaces/ktexteditor/Makefile.am
@@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)
ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
diff --git a/kab/CMakeLists.txt b/kab/CMakeLists.txt
index acf8663c..12e1ced4 100644
--- a/kab/CMakeLists.txt
+++ b/kab/CMakeLists.txt
@@ -12,9 +12,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
)
link_directories(
diff --git a/kab/Makefile.am b/kab/Makefile.am
index e29e87b9..89e1aab8 100644
--- a/kab/Makefile.am
+++ b/kab/Makefile.am
@@ -10,6 +10,6 @@ libkab_la_SOURCES = \
qconfigDB.cc
libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
-libkab_la_LIBADD = ../kdeui/libtdeui.la
+libkab_la_LIBADD = ../tdeui/libtdeui.la
libkab_la_METASOURCES = AUTO
diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt
index 1db5f73c..3cca6586 100644
--- a/kabc/CMakeLists.txt
+++ b/kabc/CMakeLists.txt
@@ -24,11 +24,11 @@ include_directories(
# external includes
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kab
diff --git a/kabc/Makefile.am b/kabc/Makefile.am
index 52b8bcb4..76e37e2b 100644
--- a/kabc/Makefile.am
+++ b/kabc/Makefile.am
@@ -52,7 +52,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kab2kabc
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kab2kabc_LDADD = libkabc.la ../kab/libkab.la
kab2kabc_SOURCES = kab2kabc.cpp
@@ -62,7 +62,7 @@ autostartdir = $(datadir)/autostart
manager_DATA = kabc_manager.desktop
managerdir = $(kde_servicesdir)/kresources
-DOXYGEN_REFERENCES = kdecore kdeui
+DOXYGEN_REFERENCES = tdecore tdeui
map_DATA = countrytransl.map
mapdir = $(kde_datadir)/kabc
diff --git a/kabc/formats/CMakeLists.txt b/kabc/formats/CMakeLists.txt
index 47ad9f37..327cb1ea 100644
--- a/kabc/formats/CMakeLists.txt
+++ b/kabc/formats/CMakeLists.txt
@@ -14,10 +14,10 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt
index f25967dc..1bc7d8da 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/kabc/plugins/dir/CMakeLists.txt
@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am
index 0ffc7e18..5967b943 100644
--- a/kabc/plugins/evolution/Makefile.am
+++ b/kabc/plugins/evolution/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
kabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../kdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
+kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
METASOURCES = AUTO
diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt
index e3a0fc3a..0c767b00 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/kabc/plugins/file/CMakeLists.txt
@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt
index b0e2b0d0..57370c9c 100644
--- a/kabc/plugins/ldapkio/CMakeLists.txt
+++ b/kabc/plugins/ldapkio/CMakeLists.txt
@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfiles
diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt
index e7336f1f..5433af21 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/kabc/plugins/net/CMakeLists.txt
@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am
index 1998296a..f4183d44 100644
--- a/kabc/plugins/net/Makefile.am
+++ b/kabc/plugins/net/Makefile.am
@@ -11,7 +11,7 @@ libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
kde_module_LTLIBRARIES = kabc_net.la
kabc_net_la_SOURCES = resourcenetplugin.cpp
-kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../kdecore/.libs/ -lkdecore
+kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore
kabc_net_la_LIBADD = libkabc_net.la
METASOURCES = AUTO
diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am
index 81093868..6d638936 100644
--- a/kabc/plugins/sql/Makefile.am
+++ b/kabc/plugins/sql/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_sql.la
kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp
kabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kabc_sql_la_LIBADD = ../../libkabc.la ../../../kdeui/libtdeui.la
+kabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la
METASOURCES = AUTO
diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am
index 12651b8f..3c40ccb6 100644
--- a/kabc/tests/Makefile.am
+++ b/kabc/tests/Makefile.am
@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
testlock_LDFLAGS = $(all_libraries)
testlock_SOURCES = testlock.cpp
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testldapclient_SOURCES = testldapclient.cpp
EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
-testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testkabc_SOURCES = testkabc.cpp
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddressee_SOURCES = testaddressee.cpp
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddresseelist_SOURCES = testaddresseelist.cpp
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddressfmt_SOURCES = testaddressfmt.cpp
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testkabcdlg_SOURCES = testkabcdlg.cpp
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdistlist_SOURCES = testdistlist.cpp
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddresslineedit_SOURCES = testaddresslineedit.cpp
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigread_SOURCES = bigread.cpp
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigwrite_SOURCES = bigwrite.cpp
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdb_SOURCES = testdb.cpp
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcargl_SOURCES = kabcargl.cpp
diff --git a/kabc/vcard/CMakeLists.txt b/kabc/vcard/CMakeLists.txt
index f2ac63ba..8ad98843 100644
--- a/kabc/vcard/CMakeLists.txt
+++ b/kabc/vcard/CMakeLists.txt
@@ -15,8 +15,8 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/generated
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -35,6 +35,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am
index 20d9b640..94d08e29 100644
--- a/kabc/vcard/Makefile.am
+++ b/kabc/vcard/Makefile.am
@@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
check_PROGRAMS = testwrite testread
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testwrite_LDADD = libvcard.la
testwrite_SOURCES = testwrite.cpp
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testread_LDADD = libvcard.la
testread_SOURCES = testread.cpp
diff --git a/kabc/vcardparser/CMakeLists.txt b/kabc/vcardparser/CMakeLists.txt
index e68bd8fb..2c6fa112 100644
--- a/kabc/vcardparser/CMakeLists.txt
+++ b/kabc/vcardparser/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am
index 0b30120c..5978a8f3 100644
--- a/kabc/vcardparser/Makefile.am
+++ b/kabc/vcardparser/Makefile.am
@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread_SOURCES = testread.cpp
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread2_SOURCES = testread2.cpp testutils.cpp
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testwrite_SOURCES = testwrite.cpp
diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox
index 301d5788..8d8515b5 100644
--- a/kate/Mainpage.dox
+++ b/kate/Mainpage.dox
@@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
@lgpl
*/
-// DOXYGEN_REFERENCES = kdecore kio kdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
+// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
// DOXYGEN_SET_PROJECT_NAME = Kate
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kate/Makefile.am b/kate/Makefile.am
index 180e86da..04666d8c 100644
--- a/kate/Makefile.am
+++ b/kate/Makefile.am
@@ -6,6 +6,6 @@ messages:
$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
-DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
include ../admin/Doxyfile.am
diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt
index 07f13aa6..c747f184 100644
--- a/kate/interfaces/CMakeLists.txt
+++ b/kate/interfaces/CMakeLists.txt
@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces
)
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt
index 9d039225..11e34721 100644
--- a/kate/part/CMakeLists.txt
+++ b/kate/part/CMakeLists.txt
@@ -15,18 +15,18 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kjs
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kjs
${CMAKE_SOURCE_DIR}/kutils
- ${CMAKE_SOURCE_DIR}/kdeprint
+ ${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
${LUA_INCLUDE_DIRS}
@@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_kpart( ${target}
SOURCES dummy.cpp
EMBED kate-static
- LINK kjs-shared kdeprint-shared katepartinterfaces-shared kutils-shared
+ LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index 9be7a9e6..5b9cea18 100644
--- a/kate/part/Makefile.am
+++ b/kate/part/Makefile.am
@@ -20,7 +20,7 @@ libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_
libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/kdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
+INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
METASOURCES = AUTO
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 837d773e..925c99e1 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
* Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk>
* Copyright (c) 2002, 2003 Anders Lund <anders@alweb.dk>
*
diff --git a/kate/part/kateprinter.h b/kate/part/kateprinter.h
index 09f63d74..283c2b58 100644
--- a/kate/part/kateprinter.h
+++ b/kate/part/kateprinter.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
* Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk>
*
* This library is free software; you can redistribute it and/or
diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt
index f6e0d25d..8f4390f6 100644
--- a/kate/plugins/insertfile/CMakeLists.txt
+++ b/kate/plugins/insertfile/CMakeLists.txt
@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt
index 8a9c7652..693c3a40 100644
--- a/kate/plugins/isearch/CMakeLists.txt
+++ b/kate/plugins/isearch/CMakeLists.txt
@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces
)
diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt
index c073d234..aba50c79 100644
--- a/kate/plugins/kdatatool/CMakeLists.txt
+++ b/kate/plugins/kdatatool/CMakeLists.txt
@@ -12,11 +12,11 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/interfaces
diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am
index 02aaff78..aa1e68bb 100644
--- a/kate/plugins/kdatatool/Makefile.am
+++ b/kate/plugins/kdatatool/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/kdefx $(all_includes)
+INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes)
METASOURCES = AUTO
# Install this plugin in the KDE modules directory
diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt
index f93e0329..007b93f2 100644
--- a/kate/plugins/wordcompletion/CMakeLists.txt
+++ b/kate/plugins/wordcompletion/CMakeLists.txt
@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces
)
diff --git a/kcert/CMakeLists.txt b/kcert/CMakeLists.txt
index 52d8aa82..b8bf6c84 100644
--- a/kcert/CMakeLists.txt
+++ b/kcert/CMakeLists.txt
@@ -13,11 +13,11 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kio/kssl
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt
index 46e8f28a..fafd6c2b 100644
--- a/kcmshell/CMakeLists.txt
+++ b/kcmshell/CMakeLists.txt
@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kutils
@@ -34,7 +34,7 @@ set( ${target}_SRCS
main.cpp main.skel
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kutils-shared
DEPENDENCIES dcopidl
diff --git a/kcmshell/Makefile.am b/kcmshell/Makefile.am
index e26b0c6f..bc89bed8 100644
--- a/kcmshell/Makefile.am
+++ b/kcmshell/Makefile.am
@@ -23,7 +23,7 @@ METASOURCES = AUTO
lib_LTLIBRARIES =
bin_PROGRAMS =
-kdeinit_LTLIBRARIES = kcmshell.la
+tdeinit_LTLIBRARIES = kcmshell.la
kcmshell_la_SOURCES = main.cpp main.skel
kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
diff --git a/kconf_update/CMakeLists.txt b/kconf_update/CMakeLists.txt
index ec529165..2e25811a 100644
--- a/kconf_update/CMakeLists.txt
+++ b/kconf_update/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -28,7 +28,7 @@ set( ${target}_SRCS
kconf_update.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdecore-shared
+ LINK tdecore-shared
)
diff --git a/kconf_update/Makefile.am b/kconf_update/Makefile.am
index 6d181fae..34e03cf8 100644
--- a/kconf_update/Makefile.am
+++ b/kconf_update/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES= -I../kded $(all_includes)
bin_PROGRAMS =
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kconf_update.la
+tdeinit_LTLIBRARIES = kconf_update.la
kconf_update_la_SOURCES = kconf_update.cpp
kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 2cad31cb..348e8045 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -27,8 +27,8 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/network
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/libltdl
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio
${LIBART_INCLUDE_DIRS}
${LIBIDN_INCLUDE_DIRS}
@@ -90,7 +90,7 @@ install( FILES eventsrc
##### libtdecore ################################
-set( target kdecore )
+set( target tdecore )
set( ${target}_SRCS
libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
@@ -120,7 +120,7 @@ set( ${target}_SRCS
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
- kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
+ kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
kqiodevicegzip_p.cpp ktimezones.cpp
)
@@ -128,16 +128,16 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 4.2.0
- EMBED kdecorenetwork-static
- LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
+ EMBED tdecorenetwork-static
+ LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)
-##### kdefakes_nonpic ###########################
+##### tdefakes_nonpic ###########################
-set( target kdefakes_nonpic )
+set( target tdefakes_nonpic )
set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -148,9 +148,9 @@ tde_add_library( ${target} STATIC
DESTINATION ${LIB_INSTALL_DIR}
)
-##### kdefakes_pic ##############################
+##### tdefakes_pic ##############################
-set( target kdefakes_pic )
+set( target tdefakes_pic )
set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -164,7 +164,7 @@ tde_add_library( ${target} STATIC_PIC
##### libtdefakes ###############################
-set( target kdefakes )
+set( target tdefakes )
set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -185,7 +185,7 @@ configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY )
tde_add_executable( kde-config
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@@ -204,6 +204,6 @@ tde_add_executable(kgrantpty SETUID
tde_add_executable( kdetcompmgr
SOURCES kdetcompmgr.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdecore/MAINTAINERS b/kdecore/MAINTAINERS
index 50820b5f..64b825f0 100644
--- a/kdecore/MAINTAINERS
+++ b/kdecore/MAINTAINERS
@@ -104,7 +104,7 @@ klockfile.cpp Waldo Bastian <bastian@kde.org> (copyright)
kmacroexpander.cpp
kmanagerselection.cpp Lubos Lunak <l.lunak@kde.org> (copyright)
kmountpoint.cpp Waldo Bastian <bastian@kde.org> (copyright)
-kprotocolinfo_kdecore.cpp Torben Weis <weis@kde.org> (copyright)
+kprotocolinfo_tdecore.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Waldo Bastian <bastian@kde.org> (copyright)
kpty.cpp
diff --git a/kdecore/Mainpage.dox b/kdecore/Mainpage.dox
index 987080ad..c0e13a33 100644
--- a/kdecore/Mainpage.dox
+++ b/kdecore/Mainpage.dox
@@ -5,7 +5,7 @@ as the configuration system, IPC, internationalization and locale
support, site-independent access to the filesystem and a large number
of other (but no less important) things.
<p>
-All Trinity applications should link to the kdecore library. Also, using a
+All Trinity applications should link to the tdecore library. Also, using a
KApplication derived class instead of TQApplication is almost
mandatory if you expect your application to behave nicely within the
Trinity environment.
diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am
index 32ccec1c..92ee7ebf 100644
--- a/kdecore/Makefile.am
+++ b/kdecore/Makefile.am
@@ -20,7 +20,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes) $(LIBART_CFLAGS)
+INCLUDES = -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdecore/network $(all_includes) $(LIBART_CFLAGS)
if include_SVGICONS
SVGICONS=svgicons
@@ -117,20 +117,20 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp \
- kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
+ kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
kqiodevicegzip_p.cpp ktimezones.cpp
libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
- $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
+ $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck
libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
- $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
+ $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck
libtdecore_la_METASOURCES = AUTO
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore
+SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/tdecore
kdebugdir = $(kde_confdir)
kdebug_DATA = kdebug.areas kdebugrc language.codes
@@ -154,7 +154,7 @@ install-data-local:
uninstall-local:
-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h
-# If you add a color palette file here, please change kdelibs/kdeui/kcolordialog.cpp too to allow to translate the name
+# If you add a color palette file here, please change kdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
colorsdir = $(kde_confdir)/colors
@@ -188,7 +188,7 @@ install-exec-hook:
DISTCLEANFILES = kde-config.cpp
-DOXYGEN_REFERENCES = dcop kdeui kparts kio
+DOXYGEN_REFERENCES = dcop tdeui kparts kio
DOXYGEN_EXCLUDE = malloc kde_file.h
DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES
diff --git a/kdecore/README b/kdecore/README
index 0788341a..ec99f440 100644
--- a/kdecore/README
+++ b/kdecore/README
@@ -1,3 +1,3 @@
-This is the KDE "core" library. The kdecore library provides basic non user
+This is the KDE "core" library. The tdecore library provides basic non user
interface functionality.
diff --git a/kdecore/README.kstartupinfo b/kdecore/README.kstartupinfo
index 233ccde1..cbb6a6df 100644
--- a/kdecore/README.kstartupinfo
+++ b/kdecore/README.kstartupinfo
@@ -88,7 +88,7 @@ The KStartupInfo classes :
--------------------------
In some cases, or if you are interested in getting the ASN information, you
-have to use the KStartupInfo classes in kdelibs/kdecore.
+have to use the KStartupInfo classes in kdelibs/tdecore.
Receiving the application startup notification information :
------------------------------------------------------------
diff --git a/kdecore/configure.in.in b/kdecore/configure.in.in
index b2fe9bd6..7439a7c1 100644
--- a/kdecore/configure.in.in
+++ b/kdecore/configure.in.in
@@ -1,7 +1,7 @@
dnl Compile in the exec prefix to help kstddirs in finding dynamic libs
AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])
-dnl Compile in kde_bindir to safely find kdesu_stub.
+dnl Compile in kde_bindir to safely find tdesu_stub.
if test "$exec_prefix" = "NONE"; then
bindir_str="\"$prefix/bin\""
else
@@ -167,9 +167,9 @@ AC_TRY_LINK(dnl
AC_CHECK_HEADERS(sys/mount.h)
-dnl AC_OUTPUT(kdecore/kde-config.cpp)
+dnl AC_OUTPUT(tdecore/kde-config.cpp)
-AM_CONFIG_HEADER(kdecore/kdemacros.h)
+AM_CONFIG_HEADER(tdecore/kdemacros.h)
SVGICONS=
diff --git a/kdecore/kaccel.cpp b/kdecore/kaccel.cpp
index 75cd7aec..b1fe773c 100644
--- a/kdecore/kaccel.cpp
+++ b/kdecore/kaccel.cpp
@@ -523,7 +523,7 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
const TQString& KAccel::configGroup() const
{ return d->configGroup(); }
-// for kdegames/ksirtet
+// for tdegames/ksirtet
void KAccel::setConfigGroup( const TQString& s )
{ d->setConfigGroup( s ); }
diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp
index 7dc49ce7..6e8f08e0 100644
--- a/kdecore/kaccelmanager.cpp
+++ b/kdecore/kaccelmanager.cpp
@@ -46,7 +46,7 @@
#include "kaccelmanager_private.h"
-#include "../kdeui/kstdaction_p.h"
+#include "../tdeui/kstdaction_p.h"
#include "../kutils/kmultitabbar.h"
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index 1f0db724..9fdcfbcb 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -1440,18 +1440,18 @@ bool KApplication::sessionSaving() const
void KApplication::startKdeinit()
{
#ifndef Q_WS_WIN //TODO
- KInstance inst( "startkdeinitlock" );
- KLockFile lock( locateLocal( "tmp", "startkdeinitlock", &inst ));
+ KInstance inst( "starttdeinitlock" );
+ KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
lock.lock();
DCOPClient cl;
if( cl.attach())
return; // whoever held the lock has already started dcopserver
}
- // Try to launch kdeinit.
- TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"));
+ // Try to launch tdeinit.
+ TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"));
if (srv.isEmpty())
- srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
+ srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
if (srv.isEmpty())
return;
if (kapp && (Tty != kapp->type()))
@@ -2884,7 +2884,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
TQString error;
// TODO this should check if cmd has a .desktop file, and use data from it, together
// with sending more ASN data
- if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
+ if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
if (Tty != kapp->type())
TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK"));
@@ -3006,7 +3006,7 @@ startServiceInternal( const TQCString &function,
// make sure there is id, so that user timestamp exists
stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id );
#endif
- if( function.left( 12 ) != "kdeinit_exec" )
+ if( function.left( 12 ) != "tdeinit_exec" )
stream << noWait;
if (!dcopClient->call(_launcher, _launcher,
@@ -3100,32 +3100,32 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi
}
int
-KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid )
{
- return kdeinitExec( name, args, error, pid, "" );
+ return tdeinitExec( name, args, error, pid, "" );
}
int
-KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id )
{
- return startServiceInternal("kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
+ return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
name, args, error, 0, pid, startup_id, false);
}
int
-KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid )
{
- return kdeinitExecWait( name, args, error, pid, "" );
+ return tdeinitExecWait( name, args, error, pid, "" );
}
int
-KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id )
{
- return startServiceInternal("kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
+ return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
name, args, error, 0, pid, startup_id, false);
}
diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h
index 25ecb6ee..f1be3bfb 100644
--- a/kdecore/kapplication.h
+++ b/kdecore/kapplication.h
@@ -814,10 +814,10 @@ public:
TQString *error=0, TQCString *dcopService=0, int *pid = 0, const TQCString &startup_id = "", bool noWait = false );
/**
- * Starts a program via kdeinit.
+ * Starts a program via tdeinit.
*
* program name and arguments are converted to according to the
- * local encoding and passed as is to kdeinit.
+ * local encoding and passed as is to tdeinit.
*
* @param name Name of the program to start
* @param args Arguments to pass to the program
@@ -830,16 +830,16 @@ public:
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
- static int kdeinitExec( const TQString& name, const TQStringList &args,
+ static int tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with startup_id = ""
- static int kdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
+ static int tdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
TQString *error=0, int *pid = 0 );
/**
- * Starts a program via kdeinit and wait for it to finish.
+ * Starts a program via tdeinit and wait for it to finish.
*
- * Like kdeinitExec(), but it waits till the program is finished.
+ * Like tdeinitExec(), but it waits till the program is finished.
* As such it behaves similar to the system(...) function.
*
* @param name Name of the program to start
@@ -853,10 +853,10 @@ public:
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
- static int kdeinitExecWait( const TQString& name, const TQStringList &args,
+ static int tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with startup_id = ""
- static int kdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
+ static int tdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
TQString *error=0, int *pid = 0 );
/**
diff --git a/kdecore/kconfig.cpp b/kdecore/kconfig.cpp
index 2531034e..709e39de 100644
--- a/kdecore/kconfig.cpp
+++ b/kdecore/kconfig.cpp
@@ -294,7 +294,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
{
TQStringList args;
args << "--check" << updateFile;
- KApplication::kdeinitExecWait("kconf_update", args);
+ KApplication::tdeinitExecWait("kconf_update", args);
reparseConfiguration();
}
setGroup(oldGroup);
diff --git a/kdecore/kconfig_compiler/CMakeLists.txt b/kdecore/kconfig_compiler/CMakeLists.txt
index d256d21c..4acc09f5 100644
--- a/kdecore/kconfig_compiler/CMakeLists.txt
+++ b/kdecore/kconfig_compiler/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -24,6 +24,6 @@ link_directories(
tde_add_executable( kconfig_compiler
SOURCES kconfig_compiler.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdecore/kconfig_compiler/Makefile.am b/kdecore/kconfig_compiler/Makefile.am
index e80f24d0..d7b1400a 100644
--- a/kdecore/kconfig_compiler/Makefile.am
+++ b/kdecore/kconfig_compiler/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = example tests
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = kconfig_compiler
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kconfig_compiler_LDADD = $(LIB_KDECORE)
kconfig_compiler_SOURCES = kconfig_compiler.cpp
@@ -13,6 +13,6 @@ TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
check-local:
for i in $(TESTFILES); \
do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
- perl $(top_srcdir)/kdecore/kconfig_compiler/checkkcfg.pl \
- $(top_srcdir)/kdecore/kconfig_compiler/tests/$$i; done
+ perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \
+ $(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done
diff --git a/kdecore/kconfig_compiler/example/Makefile.am b/kdecore/kconfig_compiler/example/Makefile.am
index 4359c429..9c0454ad 100644
--- a/kdecore/kconfig_compiler/example/Makefile.am
+++ b/kdecore/kconfig_compiler/example/Makefile.am
@@ -1,13 +1,13 @@
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example # autoexample
EXTRA_PROGRAMS = autoexample
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
example_LDADD = $(LIB_KDECORE)
example_SOURCES = example.cpp exampleprefs_base.cpp
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
autoexample.cpp
diff --git a/kdecore/kconfig_compiler/tests/Makefile.am b/kdecore/kconfig_compiler/tests/Makefile.am
index 01a510f3..0b47449f 100644
--- a/kdecore/kconfig_compiler/tests/Makefile.am
+++ b/kdecore/kconfig_compiler/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
@@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \
test_dpointer.cpp test_dpointer.h \
md5sums
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test1_LDADD = $(LIB_KDECORE)
test1_SOURCES = test1main.cpp test1.cpp
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test2_LDADD = $(LIB_KDECORE)
test2_SOURCES = test2main.cpp test2.cpp
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test3_LDADD = $(LIB_KDECORE)
test3_SOURCES = test3main.cpp test3.cpp
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test4_LDADD = $(LIB_KDECORE)
test4_SOURCES = test4main.cpp test4.cpp
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test5_LDADD = $(LIB_KDECORE)
test5_SOURCES = test5main.cpp test5.cpp
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test6_LDADD = $(LIB_KDECORE)
test6_SOURCES = test6main.cpp test6.cpp
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test7_LDADD = $(LIB_KDECORE)
test7_SOURCES = test7main.cpp test7.cpp
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test8_LDADD = $(LIB_KDECORE)
test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test9_LDADD = $(LIB_KDECORE)
test9_SOURCES = test9main.cpp test9.cpp
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test_dpointer_LDADD = $(LIB_KDECORE)
test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
diff --git a/kdecore/kcrash.cpp b/kdecore/kcrash.cpp
index dd758f03..dbbd4133 100644
--- a/kdecore/kcrash.cpp
+++ b/kdecore/kcrash.cpp
@@ -177,7 +177,7 @@ KCrash::defaultCrashHandler (int sig)
argv[i++] = "--appname";
argv[i++] = appName;
if (KApplication::loadedByKdeinit)
- argv[i++] = "--kdeinit";
+ argv[i++] = "--tdeinit";
// only add apppath if it's not NULL
if (appPath) {
@@ -314,10 +314,10 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
}
}
-// If we can't reach kdeinit we can still at least try to fork()
+// If we can't reach tdeinit we can still at least try to fork()
void KCrash::startDirectly( const char* argv[], int )
{
- fprintf( stderr, "KCrash cannot reach kdeinit, launching directly.\n" );
+ fprintf( stderr, "KCrash cannot reach tdeinit, launching directly.\n" );
pid_t pid = fork();
if (pid <= 0)
{
@@ -483,13 +483,13 @@ static int openSocket()
return -1;
}
- if (strlen(sock_file)+strlen(display)+strlen("/kdeinit_")+2 > MAX_SOCK_FILE)
+ if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE)
{
fprintf(stderr, "Warning: Socket name will be too long.\n");
free(display);
return -1;
}
- strcat(sock_file, "/kdeinit_");
+ strcat(sock_file, "/tdeinit_");
strcat(sock_file, display);
free(display);
diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas
index e4c526be..efa46034 100644
--- a/kdecore/kdebug.areas
+++ b/kdecore/kdebug.areas
@@ -5,48 +5,48 @@
#
#Format : number<tab>description
-125 kdecore (KAccel)
-126 kdecore (KURL)
+125 tdecore (KAccel)
+126 tdecore (KURL)
127 kio (KProtocolInfo)
-128 kdecore (KRegExp)
-129 kdecore (KAction)
+128 tdecore (KRegExp)
+129 tdecore (KAction)
130 kio (KPasswdServer)
-131 kdecore (KAcceleratorManager)
-150 kdecore (KLibLoader)
-160 kdecore (KNotifyClient)
-170 kdecore (KNetwork socket)
-171 kdecore (KSocks)
-172 kdecore (KStartupInfo)
-173 kdecore (KLocale)
-174 kdecore (KProcIO)
-175 kdecore (KProcess)
-176 kdecore (KWin)
-177 kdecore (KConfigSkeleton)
-178 kdecore (KConfigDialogManager)
-179 kdecore (KNetwork resolver)
-180 kdecore (kdelibs)
-200 kdeui (KMainWindow)
-220 kdeui (KToolBar)
-230 kdeui (KCommand)
-240 kdeui (kdelibs)
+131 tdecore (KAcceleratorManager)
+150 tdecore (KLibLoader)
+160 tdecore (KNotifyClient)
+170 tdecore (KNetwork socket)
+171 tdecore (KSocks)
+172 tdecore (KStartupInfo)
+173 tdecore (KLocale)
+174 tdecore (KProcIO)
+175 tdecore (KProcess)
+176 tdecore (KWin)
+177 tdecore (KConfigSkeleton)
+178 tdecore (KConfigDialogManager)
+179 tdecore (KNetwork resolver)
+180 tdecore (kdelibs)
+200 tdeui (KMainWindow)
+220 tdeui (KToolBar)
+230 tdeui (KCommand)
+240 tdeui (kdelibs)
250 kfile (kdelibs)
-264 kdecore (KIconLoader)
-265 kdecore (KIconEffect)
-270 kdeui (KRootPixmap)
-280 kdeui (KSharedPixmap)
-281 kdeui (KCModule)
-282 kdeui (KDockWidget)
-290 kdeui (KPixmapIO)
-291 kdeui (KAboutDialog)
-292 kdeui (KComboBox)
-293 kdeui (KLineEdit)
-294 kdeui (KEdit)
-295 kdeui (KMenuBar)
-296 kdeui (KPopupMenu)
-298 kdeui (KDatePicker)
+264 tdecore (KIconLoader)
+265 tdecore (KIconEffect)
+270 tdeui (KRootPixmap)
+280 tdeui (KSharedPixmap)
+281 tdeui (KCModule)
+282 tdeui (KDockWidget)
+290 tdeui (KPixmapIO)
+291 tdeui (KAboutDialog)
+292 tdeui (KComboBox)
+293 tdeui (KLineEdit)
+294 tdeui (KEdit)
+295 tdeui (KMenuBar)
+296 tdeui (KPopupMenu)
+298 tdeui (KDatePicker)
399 kimgio
400 artskde
-500 kdeprint
+500 tdeprint
700 kutils (KSettings::Dialog)
701 kutils (KSettings::Dispatcher)
702 kutils (KPluginSelector)
@@ -61,7 +61,7 @@
780 kcmshell (kdelibs)
790 kimproxy (kdelibs)
800 kabapi (kdelibs)
-900 kdesu (kdelibs)
+900 tdesu (kdelibs)
912 ksmartcard (kdelibs)
@@ -74,8 +74,8 @@
1202 konqueror
1203 libkonq
1204 kdesktop
-1205 kdesud
-1206 kdesu
+1205 tdesud
+1206 tdesu
1207 kdesktop (Minicli)
1208 kcontrol
1210 kicker
@@ -151,7 +151,7 @@
5150 libkleopatra
-# kdepim
+# tdepim
5200 kitchensync
5201 kitchensync (Konnector)
5202 kitchensync (OpieKonnector)
diff --git a/kdecore/kdebug.cpp b/kdecore/kdebug.cpp
index 8b7b4d88..ed1a3d60 100644
--- a/kdecore/kdebug.cpp
+++ b/kdecore/kdebug.cpp
@@ -289,7 +289,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
}
case 1: // Message Box
{
- // Since we are in kdecore here, we cannot use KMsgBox and use
+ // Since we are in tdecore here, we cannot use KMsgBox and use
// TQMessageBox instead
if ( !kDebug_data->aAreaName.isEmpty() )
aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) );
diff --git a/kdecore/kdelibs_export.h b/kdecore/kdelibs_export.h
index 5624fcdd..220657d0 100644
--- a/kdecore/kdelibs_export.h
+++ b/kdecore/kdelibs_export.h
@@ -67,7 +67,7 @@
#endif /*_KDELIBS_EXPORT_H*/
-/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros
+/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
between 'class' keyword and <classname>: */
#ifdef KDE_DEPRECATED
# ifndef KDECORE_EXPORT_DEPRECATED
diff --git a/kdecore/kglobal.h b/kdecore/kglobal.h
index c00279e1..08e12767 100644
--- a/kdecore/kglobal.h
+++ b/kdecore/kglobal.h
@@ -227,7 +227,7 @@ int KDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
* support, site-independent access to the filesystem and a large number
* of other (but no less important) things.
*
- * All KDE applications should link to the kdecore library. Also, using a
+ * All KDE applications should link to the tdecore library. Also, using a
* KApplication derived class instead of TQApplication is almost
* mandatory if you expect your application to behave nicely within the
* KDE environment.
diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp
index dddfba55..9c76c7e4 100644
--- a/kdecore/kiconeffect.cpp
+++ b/kdecore/kiconeffect.cpp
@@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4
* $Id$
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* with minor additions and based on ideas from
* Torsten Rahn <torsten@kde.org>
@@ -279,7 +279,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value,
return result;
}
-// Taken from KImageEffect. We don't want to link kdecore to kdeui! As long
+// Taken from KImageEffect. We don't want to link tdecore to tdeui! As long
// as this code is not too big, it doesn't seem much of a problem to me.
void KIconEffect::toGray(TQImage &img, float value)
diff --git a/kdecore/kiconeffect.h b/kdecore/kiconeffect.h
index b5f84cc2..a8e7b685 100644
--- a/kdecore/kiconeffect.h
+++ b/kdecore/kiconeffect.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* with minor additions and based on ideas from
* Torsten Rahn <torsten@kde.org>
diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp
index 62950e5d..317a56ad 100644
--- a/kdecore/kiconloader.cpp
+++ b/kdecore/kiconloader.cpp
@@ -2,7 +2,7 @@
*
* $Id$
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kiconloader.h b/kdecore/kiconloader.h
index f8ac3fbc..b7f1478f 100644
--- a/kdecore/kiconloader.h
+++ b/kdecore/kiconloader.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kiconloader_p.h b/kdecore/kiconloader_p.h
index e6ae1365..4a769539 100644
--- a/kdecore/kiconloader_p.h
+++ b/kdecore/kiconloader_p.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kicontheme.cpp b/kdecore/kicontheme.cpp
index ea91ab41..0f7d3b60 100644
--- a/kdecore/kicontheme.cpp
+++ b/kdecore/kicontheme.cpp
@@ -2,7 +2,7 @@
*
* $Id$
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kicontheme.h b/kdecore/kicontheme.h
index 3a1f14fa..d8e29d33 100644
--- a/kdecore/kicontheme.h
+++ b/kdecore/kicontheme.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp
index 1a90881d..290e2315 100644
--- a/kdecore/klibloader.cpp
+++ b/kdecore/klibloader.cpp
@@ -362,7 +362,7 @@ TQString KLibLoader::findLibrary( const char * name, const KInstance * instance
{
libfile = instance->dirs()->findResource( "lib", libname );
#ifndef NDEBUG
- if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules
+ if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for tdeinit modules
kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl;
#endif
}
diff --git a/kdecore/kstartupinfo.cpp b/kdecore/kstartupinfo.cpp
index 98195e8e..12825e80 100644
--- a/kdecore/kstartupinfo.cpp
+++ b/kdecore/kstartupinfo.cpp
@@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE.
****************************************************************************/
-// kdDebug() can't be turned off in kdeinit
+// kdDebug() can't be turned off in tdeinit
#if 0
#define KSTARTUPINFO_ALL_DEBUG
#warning Extra KStartupInfo debug messages enabled.
@@ -66,7 +66,7 @@ DEALINGS IN THE SOFTWARE.
static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO";
static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID";
// DESKTOP_STARTUP_ID is used also in kinit/wrapper.c ,
-// kdesu in both kdelibs and kdebase and who knows where else
+// tdesu in both kdelibs and kdebase and who knows where else
static const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID";
static bool auto_app_started_sending = true;
diff --git a/kdecore/kstartupinfo.h b/kdecore/kstartupinfo.h
index da3018d8..807e484c 100644
--- a/kdecore/kstartupinfo.h
+++ b/kdecore/kstartupinfo.h
@@ -49,7 +49,7 @@ class KStartupInfoPrivate;
*
* This class can be used to send information about started application,
* change the information and receive this information. For detailed
- * description, see kdelibs/kdecore/README.kstartupinfo.
+ * description, see kdelibs/tdecore/README.kstartupinfo.
*
* You usually don't need to use this class for sending the notification
* information, as KDE libraries should do this when an application is
diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp
index 2df7ae77..3a655d61 100644
--- a/kdecore/ksycoca.cpp
+++ b/kdecore/ksycoca.cpp
@@ -98,7 +98,7 @@ KSycoca::KSycoca()
}
// We register with DCOP _before_ we try to open the database.
// This way we can be relative sure that the KDE framework is
- // up and running (kdeinit, dcopserver, klaucnher, kded) and
+ // up and running (tdeinit, dcopserver, klaucnher, kded) and
// that the database is up to date.
openDatabase();
_self = this;
@@ -332,7 +332,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id)
if (!triedLaunchingKdeinit) // try only once
{
triedLaunchingKdeinit = true;
- kdDebug(7011) << "findFactory: we have no database.... launching kdeinit" << endl;
+ kdDebug(7011) << "findFactory: we have no database.... launching tdeinit" << endl;
KApplication::startKdeinit();
// Ok, the new database should be here now, open it.
}
diff --git a/kdecore/kuniqueapplication.cpp b/kdecore/kuniqueapplication.cpp
index 7cd0575c..193aafcd 100644
--- a/kdecore/kuniqueapplication.cpp
+++ b/kdecore/kuniqueapplication.cpp
@@ -164,7 +164,7 @@ KUniqueApplication::start()
::exit(255);
}
- // Try to launch kdeinit.
+ // Try to launch tdeinit.
startKdeinit();
regName = dc->registerAs(appName, false);
if (regName.isEmpty())
diff --git a/kdecore/libkdecore.nmcheck b/kdecore/libkdecore.nmcheck
index b8057d35..7c017a6e 100644
--- a/kdecore/libkdecore.nmcheck
+++ b/kdecore/libkdecore.nmcheck
@@ -1,6 +1,6 @@
# KDE namespace check file
-# kdecore classes
+# tdecore classes
K*::*
# these should preferably go in some namespace in KDE4
@@ -48,7 +48,7 @@ kasciistricmp
# from libtldl
lt_dl*
-# from kdefakes
+# from tdefakes
setenv
unsetenv
usleep
diff --git a/kdecore/network/CMakeLists.txt b/kdecore/network/CMakeLists.txt
index e00fdd0c..101da484 100644
--- a/kdecore/network/CMakeLists.txt
+++ b/kdecore/network/CMakeLists.txt
@@ -13,8 +13,8 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_BINARY_DIR}/tdecore
)
@@ -35,9 +35,9 @@ install( FILES
install( FILES ipv6blacklist DESTINATION ${CONFIG_INSTALL_DIR} )
-##### kdecorenetwork ############################
+##### tdecorenetwork ############################
-set( target kdecorenetwork )
+set( target tdecorenetwork )
set( ${target}_SRCS
kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp
diff --git a/kdecore/svgicons/CMakeLists.txt b/kdecore/svgicons/CMakeLists.txt
index 71492566..4f234551 100644
--- a/kdecore/svgicons/CMakeLists.txt
+++ b/kdecore/svgicons/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${LIBART_INCLUDE_DIRS}
)
diff --git a/kdecore/tests/Makefile.am b/kdecore/tests/Makefile.am
index 71e6faa9..e35ae68a 100644
--- a/kdecore/tests/Makefile.am
+++ b/kdecore/tests/Makefile.am
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-INCLUDES = -I$(top_srcdir)/kdecore $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdecore $(all_includes)
AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
diff --git a/kdecore/tests/testqtargs.cpp b/kdecore/tests/testqtargs.cpp
index 3853bc03..d1c8ff24 100644
--- a/kdecore/tests/testqtargs.cpp
+++ b/kdecore/tests/testqtargs.cpp
@@ -5,7 +5,7 @@
g++ -g -Wall -o testqtargs testqtargs.cpp -I/usr/X11R6/include \
-I/opt/qt3/include -I/opt/trinity/include -L/usr/X11R6/lib -L/opt/qt3/lib \
- -L/opt/trinity/lib -lqt -lkdecore
+ -L/opt/trinity/lib -lqt -ltdecore
if invoked like this ./testqtargs --bg blue --caption something --hello hi
@@ -28,7 +28,7 @@
--bg is aliased to --background but If you try it with --background or
-background, you get the same thing.
- in kdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used
+ in tdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used
by the static method Kapplication::addCmdLineOptions to add the Qt options
but its' entries look like this:
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index aa466d99..0b9a3d72 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -14,10 +14,10 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
@@ -47,9 +47,9 @@ set( ${target}_SRCS
kded.cpp kdedmodule.cpp
)
-# we must to export kdeinit_kded-shared because various
+# we must to export tdeinit_kded-shared because various
# modules need this library
-tde_add_kdeinit_executable( ${target} AUTOMOC EXPORT
+tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT
SOURCES ${${target}_SRCS}
LINK kio-shared
)
@@ -66,7 +66,7 @@ set( ${target}_SRCS
kctimefactory.cpp vfolder_menu.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kio-shared
)
@@ -82,7 +82,7 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox
index 47f010f9..50c0493d 100644
--- a/kded/Mainpage.dox
+++ b/kded/Mainpage.dox
@@ -4,7 +4,7 @@ TrinityD runs in the background and performs a number of small tasks. Some
of these tasks are built in, others are started on demand.
<p>
The chances are you are looking here because you want to write a
-TrinityD module. For that, see TrinityDModule in kdecore and the
+TrinityD module. For that, see TrinityDModule in tdecore and the
<a href="http://websvn.kde.org/trunk/Trinity/kdelibs/kded/README.kded?view=markup">TrinityD
README</a>.
@@ -21,6 +21,6 @@ Waldo Bastian \<bastian@kde.org\>
*/
-// DOXYGEN_REFERENCES = kdecore kdeui kio
+// DOXYGEN_REFERENCES = tdecore tdeui kio
// DOXYGEN_SET_PROJECT_NAME = TrinityD
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kded/Makefile.am b/kded/Makefile.am
index 554a0e53..c91804b4 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -20,7 +20,7 @@
INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
+tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
@@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
-kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdontchangethehostname_LDADD = $(LIB_KDECORE)
kdontchangethehostname_SOURCES = khostname.cpp
-kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmimelist_LDADD = ../kio/libkio.la
kmimelist_SOURCES = kmimelist.cpp
-kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kde_menu_LDADD = $(LIB_KIO)
kde_menu_SOURCES = kde-menu.cpp
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 873ce154..33faf6c7 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
args.append("--checkstamps");
TQString command = "kbuildsycoca";
TQCString _launcher = KApplication::launcher();
- if (!DCOPRef(_launcher, _launcher).call("kdeinit_exec_wait", command, args).isValid())
+ if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
{
qWarning("Can't talk to klauncher!");
command = KGlobal::dirs()->findExe(command);
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 1d234ac0..2a634ff5 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -75,17 +75,17 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
dataStream << TQString("kbuildsycoca") << args;
TQCString _launcher = KApplication::launcher();
- kapp->dcopClient()->callAsync(_launcher, _launcher, "kdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
+ kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
}
else
{
- KApplication::kdeinitExecWait( "kbuildsycoca", args );
+ KApplication::tdeinitExecWait( "kbuildsycoca", args );
}
}
static void runKonfUpdate()
{
- KApplication::kdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
+ KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
}
static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName)
@@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
TQStringList args;
args.append(TQFile::decodeName(oldName));
args.append(TQFile::decodeName(newName));
- KApplication::kdeinitExecWait( "kdontchangethehostname", args );
+ KApplication::tdeinitExecWait( "kdontchangethehostname", args );
}
Kded::Kded(bool checkUpdates, bool new_startup)
diff --git a/kdefx/CMakeLists.txt b/kdefx/CMakeLists.txt
index 1c33bb8f..1aa52627 100644
--- a/kdefx/CMakeLists.txt
+++ b/kdefx/CMakeLists.txt
@@ -14,8 +14,8 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -33,7 +33,7 @@ install( FILES
##### libtdefx ##################################
-set( target kdefx )
+set( target tdefx )
set( ${target}_SRCS
kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp
diff --git a/kdefx/Makefile.am b/kdefx/Makefile.am
index 5c88a6e7..2b588ba5 100644
--- a/kdefx/Makefile.am
+++ b/kdefx/Makefile.am
@@ -26,8 +26,8 @@ lib_LTLIBRARIES = libtdefx.la
libtdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
libtdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11)
libtdefx_la_NMCHECK = $(srcdir)/libtdefx.nmcheck
-libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
- $(top_srcdir)/kdecore/standard_weak.nmcheck
+libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck \
+ $(top_srcdir)/tdecore/standard_weak.nmcheck
include_HEADERS = kpixmap.h kpixmapsplitter.h \
kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
@@ -40,6 +40,6 @@ METASOURCES = AUTO
EXTRA_DIST = Mainpage.dox
-DOXYGEN_REFERENCES = kdecore
+DOXYGEN_REFERENCES = tdecore
include ../admin/Doxyfile.am
diff --git a/kdefx/libkdefx.nmcheck b/kdefx/libkdefx.nmcheck
index a0bf7e60..bebebf28 100644
--- a/kdefx/libkdefx.nmcheck
+++ b/kdefx/libkdefx.nmcheck
@@ -1,6 +1,6 @@
# KDE namespace check file
-# kdefx classes
+# tdefx classes
K*::*
# these should preferably go in some namespace in KDE4
diff --git a/kdeprint/CMakeLists.txt b/kdeprint/CMakeLists.txt
index fa77fd3b..bdbacc0b 100644
--- a/kdeprint/CMakeLists.txt
+++ b/kdeprint/CMakeLists.txt
@@ -26,12 +26,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
@@ -53,16 +53,16 @@ install( FILES
kprintdialogpage.h kpreloadobject.h kmmanager.h
kmprinter.h kmobject.h kprintdialog.h driver.h
kmjobmanager.h kmjob.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint )
##### other data ################################
install( FILES kprintpreviewui.rc DESTINATION ${CONFIG_INSTALL_DIR}/ui )
-install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/kdeprint )
-install( FILES kdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
-install( FILES kdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( FILES kdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
+install( FILES tdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+install( FILES tdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
##### driverparse ###############################
@@ -74,25 +74,25 @@ tde_add_library( ${target} STATIC_PIC
)
-##### kded_kdeprintd ############################
+##### kded_tdeprintd ############################
-set( target kded_kdeprintd )
+set( target kded_tdeprintd )
set( ${target}_SRCS
- kdeprintd.cpp kprintprocess.cpp kdeprintd.skel
+ tdeprintd.cpp kprintprocess.cpp tdeprintd.skel
)
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kio-shared kdeinit_kded-shared
+ LINK kio-shared tdeinit_kded-shared
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-#### kdeprint ###################################
+#### tdeprint ###################################
-set( target kdeprint )
+set( target tdeprint )
set( ${target}_SRCS
kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
@@ -103,7 +103,7 @@ set( ${target}_SRCS
kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp
kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp
kpipeprocess.cpp kpfilterpage.cpp kmspecialmanager.cpp
- kdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp
+ tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp
kfilelist.cpp kprintaction.cpp kpfileselectpage.cpp
treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp
marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp
diff --git a/kdeprint/ChangeLog b/kdeprint/ChangeLog
index 18204450..5ce11bd3 100644
--- a/kdeprint/ChangeLog
+++ b/kdeprint/ChangeLog
@@ -1,10 +1,10 @@
-Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
+Since 2.2 release, Michael Goffioul <tdeprint@swing.be>
* automatic filtering: if the input file format is not directly supported
- by the print spooler, kdeprint will try to convert the file to the
+ by the print spooler, tdeprint will try to convert the file to the
primary supported input format (usually PostScript). To achieve this,
- kdeprint uses the available filters (defined in XML files) and tries to
+ tdeprint uses the available filters (defined in XML files) and tries to
build up a filter chain.
- * mime type checking: when building a filter chain, kdeprint checks that
+ * mime type checking: when building a filter chain, tdeprint checks that
each output format is supported as an input by the next filter
* possibility to specify input file from the print dialog in StandAlone
mode (like XPP)
@@ -20,7 +20,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* print dialog: possibility to select the files to print in standalone
mode (like XPP).
-27/08/2001 Michael Goffioul <kdeprint@swing.be>
+27/08/2001 Michael Goffioul <tdeprint@swing.be>
* implementation of "Schedule" tab in print dialog for the CUPS plugin
(job-hold-until attribute).
* Printer aliases are now handled gracefully in the LPR plugin (they
@@ -29,30 +29,30 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
setOption("kde-isspecial", "1");
setOption("kde-special-command", cmd);
-28/08/2001 Michael Goffioul <kdeprint@swing.be>
+28/08/2001 Michael Goffioul <tdeprint@swing.be>
* implementation of KPrintAction, which provides a quick access to
a class of printers (special, regular or both). An application just
needs to create a KPrintAction anc connect to print(KPrinter*).
-31/08/2001 Michael Goffioul <kdeprint@swing.be>
+31/08/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: fix crash for Qt3 port, must check if attr->name is NULL
before comparing it with strcmp or strncmp.
-12/09/2001 Michael Goffioul <kdeprint@swing.be>
+12/09/2001 Michael Goffioul <tdeprint@swing.be>
* Management library: set all toolbars non movable to avoid move handles
-13/09/2001 Michael Goffioul <kdeprint@swing.be>
+13/09/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: fix multiple showing of password dialog for password-
protected printers (timer is now blocked when the password dialog is
shown)
-14/09/2001 Michael Goffioul <kdeprint@swing.be>
+14/09/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: configuration wizard rewritten using the structure of
ESP PrintPro: more consistent, less pages and widgets. Not used as
default config wizard yet.
* QList -> QPtrList
-25/09/2001 Michael Goffioul <kdeprint@swing.be>
+25/09/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: made the new configuration wizard as default one.
* other QList -> QPtrList fixes (committed to CVS)
* Avoid to call plugin functions "completePrinter<xxx>" for pseudo
@@ -64,21 +64,21 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* Wizard: fix buffer overflow when adding a remote LPD queue having
a lot of jobs waiting
-03/10/2001 Michael Goffioul <kdeprint@swing.be>
+03/10/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: make use of GET/PUT request to handle configuration
file. Possibility to admin a remote CUPS server (if allowed)
* CUPS plugin: added "/jobs" in the available resources list
-09/10/2001 Michael Goffioul <kdeprint@swing.be>
+09/10/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: added 2 missing pages in stand-alone mode, "Image"
and "Text".
-10/10/2001 Michael Goffioul <kdeprint@swing.be>
+10/10/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: "HP-GL/2" page added
* General: added a GUI to configure the preview program, into the
config dialog of the print manager
-12/10/2001 Michael Goffioul <kdeprint@swing.be>
+12/10/2001 Michael Goffioul <tdeprint@swing.be>
* general: added the possibility for a plugin to add new actions
to the toolbar and context menu (main use = export driver in
CUPS).
@@ -86,16 +86,16 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
through samba. Threaded operation with progress bar to notify
the user. Graphical equivalent to cupsaddsmb from cups-1.1.11.
-16/10/2001 Michael Goffioul <kdeprint@swing.be>
+16/10/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: removed the "file" backend as it doesn't seem to
be available since a couple of releases, and added a "Other"
page to the wizard for any third-party backend (like pdf).
-18/10/2001 Michael Goffioul <kdeprint@swing.be>
- * kdeprintfax: don't hardcode program path, use the $PATH variable
+18/10/2001 Michael Goffioul <tdeprint@swing.be>
+ * tdeprintfax: don't hardcode program path, use the $PATH variable
first to find the program. Default to /usr/bin if not found.
-02/11/2001 Michael Goffioul <kdeprint@swing.be>
+02/11/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin:
. fix for remote printers when there's also a local
printer with the same name: the printer-uri-supported
@@ -104,22 +104,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
as well as detected IPP printers on the network (in
the wizard)
-05/11/2001 Michael Goffioul <kdeprint@swing.be>
- * kdeprintfax: added possibility to view files being faxed and
+05/11/2001 Michael Goffioul <tdeprint@swing.be>
+ * tdeprintfax: added possibility to view files being faxed and
file action (remove and view) are enabled only when needed.
* KPrinter: when printing to a file, support encoding and spaces
in file names + system --> KProcess.
-07/11/2001 Michael Goffioul <kdeprint@swing.be>
- * kdeprint: fixed some problems:
- . collate entirely handled by kdeprint, even in the case
+07/11/2001 Michael Goffioul <tdeprint@swing.be>
+ * tdeprint: fixed some problems:
+ . collate entirely handled by tdeprint, even in the case
of page selection on application-side.
. set KPrinter object in KPrintDialog before adding other
dialog pages (some pages may need it)
* wizard: changed button layout and added a side graphic. Not
committed as the graphic comes from HP driver (copyright).
-08/11/2001 Michael Goffioul <kdeprint@swing.be>
+08/11/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin:
. complete IPP report for job added
. implementation of dynamically added plugin menus for
@@ -127,24 +127,24 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
. printer infos are now retrieved from the correct host
for remote printers and classes (idem for IPP report)
* general: implementation of a DCOP signal communication to
- synchronize all kdeprint apps, a plugin change in one app is
+ synchronize all tdeprint apps, a plugin change in one app is
notified to all other opened apps (via DCOP).
* kicker extension: made extension aware of plugin change in
other apps (using new DCOP signal comm).
-09/11/2001 Michael Goffioul <kdeprint@swing.be>
+09/11/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS plugin: added the possibility to list jobs on remote
printers. No management is allowed on remote jobs (yet?).
-10/11/2001 Michael Goffioul <kdeprint@swing.be>
+10/11/2001 Michael Goffioul <tdeprint@swing.be>
* general: use KShellProcess::quote() for any quoting. Normally,
all quoting problem should be fixed now.
-12/11/2001 Michael Goffioul <kdeprint@swing.be>
+12/11/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS: redesigned the "cups-add-smb" dialog to make it more
user-driendly.
-13/11/2001 Michael GOffioul <kdeprint@swing.be>
+13/11/2001 Michael GOffioul <tdeprint@swing.be>
* general: implementation of a KActiveLabel class to embed active
links in labels. Clicking on it "exec" the associated URL.
* general: make use of KActiveLabel in the first page of the
@@ -154,7 +154,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
correctly when scanning the network (however it should be
avoided as smbspool seems to be unable to handle it).
-14/11/2001 Michael Goffioul <kdeprint@swing.be>
+14/11/2001 Michael Goffioul <tdeprint@swing.be>
* ioslave: uploaded new templates from Chris (which adds support
for pseudo printers
* manager: modified RootOnly message for better consistency between
@@ -168,13 +168,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
. added hiding mechanism to make the dialog more compact
(show/hide button can probably be improved)
-15/11/2001 Michael Goffioul <kdeprint@swing.be>
+15/11/2001 Michael Goffioul <tdeprint@swing.be>
* CUPS: drivers are now downloaded from the actual server for remote
printers. This allows to have access to all options set for any
printer (even remote ones). However remote printer's drivers are
kept read-only.
-16/11/2001 Michael Goffioul <kdeprint@swing.be>
+16/11/2001 Michael Goffioul <tdeprint@swing.be>
* print dialog: instances are now presented in a tree structure in
the combo box -> cleaner view.
* general: ported the use of a global instance file to 2.2 branch
@@ -185,7 +185,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
numerical option and update the corresponding enum one with the
closest value.
-21/11/2001 Michael Goffioul <kdeprint@swing.be>
+21/11/2001 Michael Goffioul <tdeprint@swing.be>
* job viewer: clicking on 'x' button only hide the job viewer but
doesn't quit the app. To quit, either use menu item (from window
or system tray) or accel when job viewer is visible.
@@ -193,13 +193,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
it is always centered on its parent now. It also have the dialog
buttons in title bar (no minimize).
-23/11/2001 Michael Goffioul <kdeprint@swing.be>
+23/11/2001 Michael Goffioul <tdeprint@swing.be>
* job management: the job management has been re-engineered to follow
the paradigm "1 window == 1 queue". There's still the possibility to
view jobs for all printers within a single window. This should enhance
the usability of job management tools (I hope).
-26/11/2001 Michael Goffioul <kdeprint@swing.be>
+26/11/2001 Michael Goffioul <tdeprint@swing.be>
* job management: job type (active/completed) is now handled on a
printer basis instead of a global property of the manager. This allows
different windows to show different job type, and also ease the
@@ -214,21 +214,21 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
This new mechanism should also be applied to print management dynamic
actions (more consistent).
-28/11/2001 Michael Goffioul <kdeprint@swing.be>
+28/11/2001 Michael Goffioul <tdeprint@swing.be>
* special printers: added the possibility to have configurable options
in pseudo-printers. Options are described in an additional XML file
(like filters) and configured through an "Advanced" tab in the property
dialog. TODO: graphical configuration widget + apply KXmlCommand to
normal filters.
-29/11/2001 Michael Goffioul <kdeprint@swing.be>
+29/11/2001 Michael Goffioul <tdeprint@swing.be>
* general: fixed sorting of options in driver view. They should be shown
in order of appearance now.
* general: make use of the new KXmlCommand class for filters too.
* filters: removed the "Page Size" from the options of enscript filter,
this is taken from the KPrinter object now.
-04/12/2001 Michael Goffioul <kdeprint@swing.be>
+04/12/2001 Michael Goffioul <tdeprint@swing.be>
* general: finalized the new XML command mechanism:
. graphical command builder
. pseudo-printers and filters are completely based on new XML
@@ -236,14 +236,14 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
previous mechanism are not used).
. KPrintFilter and KMFilterManager are now obsolete and replaced
by KXmlCommand and KXmlCommandManager respectively.
- * kdeprintfax: made the log window a "real" log window. It is dynamically
+ * tdeprintfax: made the log window a "real" log window. It is dynamically
refreshed on new debug output arrival (suggested by user).
-10/12/2001 Michael Goffioul <kdeprint@swing.be>
+10/12/2001 Michael Goffioul <tdeprint@swing.be>
* general: make use of "Detail" mechanism of KDialogBase in XML command
editor.
-11/12/2001 Michael Goffioul <kdeprint@swing.be>
+11/12/2001 Michael Goffioul <tdeprint@swing.be>
* instances: for root, instances are saved in global file
/etc/cups/lpoptions. This allows to easily create global instances
(just be root and create the instance).
@@ -251,17 +251,17 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
file, such that root is able to manage global pseudo printers. Locale
pseudo printers still override global ones if they have the same name.
-12/12/2001 Michael Goffioul <kdeprint@swing.be>
+12/12/2001 Michael Goffioul <tdeprint@swing.be>
* general: added error messages when the printer list cannot be retrieved
in print manager and print dialog. With CUPS, if the server is not
running, an error message is shown to the user.
* CUPS: disabled all backends if no server is running.
-13/12/2001 Michael Goffioul <kdeprint@swing.be>
+13/12/2001 Michael Goffioul <tdeprint@swing.be>
* general: preleminary support for external printer tool. Only escputil
at this moment.
-03/01/2002 Michael Goffioul <kdeprint@swing.be>
+03/01/2002 Michael Goffioul <tdeprint@swing.be>
* general:
. added a "ID name" label to the first dialog for command editing
. put "View Printer Infos" in front of orientation and view type
@@ -273,12 +273,12 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
. added a WhatsThis help to the "Instances" tab briefly explaining
what's an instance.
-09/01/2002 Michael Goffioul <kdeprint@swing.be>
+09/01/2002 Michael Goffioul <tdeprint@swing.be>
* general: when filtering, the file type is checked against supported
formats. If the format is not supported, a warning is issued and the
user has the possibility to auto-convert the file to a supported
format. Consequence: you can now safely perform page selection on any
- file type with any printer and any spooler, kdeprint will try to convert
+ file type with any printer and any spooler, tdeprint will try to convert
the file to PS.
* preview dialog: rewrote the code in a cleaner way, avoiding the use
of a non toplevel main window. Preview dialog looks simpler now. New
@@ -293,10 +293,10 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
Netscape. If files are given on the command line, this option is
forced unset.
. added a "--nodialog" option for quick print.
- . added the persistent feature (with some code rewrite in kdeprint
+ . added the persistent feature (with some code rewrite in tdeprint
library)
-10/01/2002 Michael Goffioul <kdeprint@swing.be>
+10/01/2002 Michael Goffioul <tdeprint@swing.be>
* general: added (temporary) workaround for drawing problems in fixed
toolbars, until a real fix gets implemented:
static_cast<QWidget*>(tb)->layout()->setMargin(1);
@@ -304,18 +304,18 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* general: added KPrinter::autoConfigure(), to automatically configure
a KPrinter object without the need for a print dialog.
-14/01/2002 Michael Goffioul <kdeprint@swing.be>
+14/01/2002 Michael Goffioul <tdeprint@swing.be>
* slave: made case-insensitive for backward compatibility (old URLs may
come from history). Now print:/Classes should work OK.
* CUPS: moved the IPP report to an separate dialog and added the
possibility to print the result.
-15/01/2002 Michael Goffioul <kdeprint@swing.be>
+15/01/2002 Michael Goffioul <tdeprint@swing.be>
* started the implementation of a new LPR/LPRng plugin: this implementation
is designed to be modular to provide support for various systems like
Foomatic, APSFilter, GNUlpr or Printtool(RH).
-17/01/2002 Michael Goffioul <kdeprint@swing.be>
+17/01/2002 Michael Goffioul <tdeprint@swing.be>
* LPR: first implementation of a job manager. Make use of asynchronous
lpc and lpq processes. Major problem: delay between new state and
screen update due to the fact that data are started to be updated when
@@ -326,22 +326,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
the default basename for output file.
* test: updated to Qt3 and demonstrate the use of the DocFileName feature
-21/01/2002 Michael Goffioul <kdeprint@swing.be>
+21/01/2002 Michael Goffioul <tdeprint@swing.be>
* LPR: added basic implementation of a KPrinterImpl object -> plugin is
functional (though far from complete...)
-22/01/2002 Michael Goffioul <kdeprint@swing.be>
- * kdeprintfax: make use of new address book (libkabc) instead of the old
+22/01/2002 Michael Goffioul <tdeprint@swing.be>
+ * tdeprintfax: make use of new address book (libkabc) instead of the old
one (libkab).
-29/01/2002 Michael Goffioul <kdeprint@swing.be>
+29/01/2002 Michael Goffioul <tdeprint@swing.be>
* LPR: enhancement of the APSFilter handler. Still missing: setup the
options in the print command line
* wizard: removed the garbage '&' in last page
* general: added SMB util functions -> to be used whenever it's
possible (CUPS plugin, Foomatic handler => TO BE DONE)
-30/01/2002 Michael Goffioul <kdeprint@swing.be>
+30/01/2002 Michael Goffioul <tdeprint@swing.be>
* general: use QGuardedPtr to keep KPrinterImpl object in KPrinter, this
should avoid some crashes.
* LPR:
@@ -350,7 +350,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
. fix problem with rmote lpd queues: force lp=<empty string> in
printcap entry
-07/02/2002 Michael Goffioul <kdeprint@swing.be>
+07/02/2002 Michael Goffioul <tdeprint@swing.be>
* job viewer: fix crash when switching the print plugin elsewhere and
there's some jobs shown + fix refresh problem when switching plugin
* general: fix small bug when removing a filter in "Filters" page
@@ -358,12 +358,12 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
problem with non-docked vertical toolbars. Use plain QPushButton
instead, but this has some drawing problems in HighColor style.
-11/02/2002 Michael Goffioul <kdeprint@swing.be>
+11/02/2002 Michael Goffioul <tdeprint@swing.be>
* LPR: added support for LPRngTool+IFHP (not complete yet though)
* general: various fixes for crashes, inconsistencies, ...
-12/02/2002 Michael Goffioul <kdeprint@swing.be>
- * kdeprintfax: added %email to possible command tags. The e-mail address
+12/02/2002 Michael Goffioul <tdeprint@swing.be>
+ * tdeprintfax: added %email to possible command tags. The e-mail address
is retrieved from standard settings in KControl module. The tag can
also be used in the "Name" field of the options dialog
* LPR: completion of the LPRngTool handler + implementation of dynamic
@@ -375,7 +375,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* CUPS: configuration tool now handles gracefully unrecognized options,
a warning is issued, and they are restored as-is on file saving.
-13/02/2002 Michael Goffioul <kdeprint@swing.be>
+13/02/2002 Michael Goffioul <tdeprint@swing.be>
* CUPS: added support for job-billing and page-label, and put them
along with the scredule option into a single "Advanced" tab.
* CUPS: added job billing info to the job viewer
@@ -383,23 +383,23 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
dialog
* general: allow multi selection in the file list of print dialog
-14/02/2002 Michael Goffioul <kdeprint@swing.be>
+14/02/2002 Michael Goffioul <tdeprint@swing.be>
* CUPS: added the possibility to edit job attributes on-the-fly using
a dialog similar to the printer properties dialog. Still the be fixed:
page ranges (problem with option encoding in CUPS).
-15/02/2002 Michael Goffioul <kdeprint@swing.be>
+15/02/2002 Michael Goffioul <tdeprint@swing.be>
* general: fixed infinite recursion bug in KIconSelectAction
* CUPS: temporarily disabled edition of page-ranges as it seems CUPS is
buggy. I should find a workaround.
* general (CUPS): enable some actions for jobs on remote hosts. It seems
to work OK between my local LM-8.1 and a remote LM-7.2.
-16/02/2002 Michael Goffioul <kdeprint@swing.be>
+16/02/2002 Michael Goffioul <tdeprint@swing.be>
* CUPS: added direct Foomatic driver support (no need the all PPD package
from foomatic anymore, driver are loaded directly from Foomatic)
-17/02/2002 Michael GOffioul <kdeprint@swing.be>
+17/02/2002 Michael GOffioul <tdeprint@swing.be>
* preview:
. better algorithm to find a preview object
. more comprehensive error report
@@ -407,11 +407,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* general: added the backend stuff for printer filtering, needs GUI
-> allows to only show a selected set of printers
-18/02/2002 Michael Goffioul <kdeprint@swing.be>
+18/02/2002 Michael Goffioul <tdeprint@swing.be>
* general: simple printer filtering mechanism based on printer name
and location regexp. Graphical configuration for printer name.
-19/02/2002 Michael Goffioul <kdeprint@swing.be>
+19/02/2002 Michael Goffioul <tdeprint@swing.be>
* general:
. completion of the printer filtering mechanism (added location
string filter)
@@ -420,16 +420,16 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
. possibility to open the main option dialog from print dialog
(for example to change the filter or default preview program)
. added icon on push buttons when useful
- . changed plugin names to kdeprint_* (stripped the leading "lib")
+ . changed plugin names to tdeprint_* (stripped the leading "lib")
-20/02/2002 Michael Goffioul <kdeprint@swing.be>
+20/02/2002 Michael Goffioul <tdeprint@swing.be>
* slave: prevent konqueror to consider a trailing slash as a directory
specification (simply add a config entry in protocol file)
* general: large UI standardization by making use of KDialogBase along
with KGuiItem
* kicker menu: possibility to open main Options Dialog from the menu
-21/02/2002 Michael Goffioul <kdeprint@swing.be>
+21/02/2002 Michael Goffioul <tdeprint@swing.be>
* general: splitted the printer state into enable/disable and start/stop
and modified the GUI to reflect this
* general: removed the KMManager::configure(), obsoleted by the complete
@@ -437,22 +437,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* kicker extension: extension of the menu plugin to allow access to the
server configuration tool as well as the "kprinter" utility.
-25/02/2002 Michael Goffioul <kdeprint@swing.be>
+25/02/2002 Michael Goffioul <tdeprint@swing.be>
* LPR: added printer testing support
-26/02/2002 Michael Goffioul <kdeprint@swing.be>
+26/02/2002 Michael Goffioul <tdeprint@swing.be>
* general: printer filtering specs are now ORed instead of ANDed
* general: changed "Advanced" to "Driver Settings"
* CUPS: fixed RIPCache problem, added support for possible suffixes
-27/02/2002 Michael Goffioul <kdeprint@swing.be>
+27/02/2002 Michael Goffioul <tdeprint@swing.be>
* CUPS: workaround to allow special characters in login/password without
breaking security. Possible now to use safely chars like '@' and '/'
in login.
* general: added a check box in the config dialog to enable/disable
font embedding into PS data (compatible with Qt settings).
-28/02/2002 Michael Goffioul <kdeprint@swing.be>
+28/02/2002 Michael Goffioul <tdeprint@swing.be>
* general: job viewer updated correctly on plugin reload -> additional
columns and "history" action state
* general: internal *Settings objects are synchonized on config changes
@@ -460,11 +460,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* general: improved feedback to user when creating driver DB
* CUPS: speed optimization when creating driver DB (simple hack to avoid
to parse the entire PPD file each time => much better)
- * kdeprintfax: added "-n" and "-f %email" by default for the Hylafax
+ * tdeprintfax: added "-n" and "-f %email" by default for the Hylafax
system
* general: various small UI improvements (suggested by Thomas)
-02/03/2002 Michael Goffioul <kdeprint@swing.be>
+02/03/2002 Michael Goffioul <tdeprint@swing.be>
* general: modified the driver structure to support dynamic options
as in SuSE
* LPR: more management support for SuSE handler -> drver settings can
@@ -472,7 +472,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* general: needed stuff to provide translations for filters (Coolo will
now extract the strings from XML files for translators)
-10/03/2002 Michael Goffioul <kdeprint@swing.be>
+10/03/2002 Michael Goffioul <tdeprint@swing.be>
* CUPS: allow any integer value for RIPCache + don't upload the cupsd.conf
with wrong settings
@@ -480,7 +480,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* KDE-3 RELEASE *
*****************
-(CeBIT) Michael Goffioul <kdeprint@swing.be>
+(CeBIT) Michael Goffioul <tdeprint@swing.be>
* Fix various crashes:
. when changing the CUPS server (notify registered object before
reloading)
@@ -491,7 +491,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* general: started generealization of a margin widget to configure the
margins of the KPrinter object
-25/03/2002 Michael Goffioul <kdeprint@swing.be>
+25/03/2002 Michael Goffioul <tdeprint@swing.be>
* general: do not use pointers in various views, to avoid dangling
pointers (and crashes) when changing something (plugin, config file, ...).
This makes the aboutToReload functions quite useless, but it has to
@@ -502,13 +502,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
* general: added help button to the wizard and the print dialog. They
are connected to the main help (should probably add an anchor to go
directly to the associated part).
- * kdeprintfax: more support/sync with standard addressbook:
- . possibility to start the ab editor from kdeprintfax
+ * tdeprintfax: more support/sync with standard addressbook:
+ . possibility to start the ab editor from tdeprintfax
. make use of the "Organization" field as enterprise
. fix problem with empty phone number (ex: no business fax).
-26/03/2002 Michael Goffioul <kdeprint@swing.be>
- * kdeprintfax:
+26/03/2002 Michael Goffioul <tdeprint@swing.be>
+ * tdeprintfax:
. added support for Mgetty-sendfax
. added support for page size in filters
. make use of the localized page size as default
@@ -518,19 +518,19 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
. bugfix in logview: behaves safely when closed using the title
bar button
-27/03/2002 Michael Goffioul <kdeprint@swing.be>
+27/03/2002 Michael Goffioul <tdeprint@swing.be>
* general: created a separate "Fonts" section in the KDEPrint settings
dialog and removed the "Embed Fonts" option from the general section
(moved to the new section).
- * kdeprintfax: fixed disabled background for "Comment" widget, use QBrush
+ * tdeprintfax: fixed disabled background for "Comment" widget, use QBrush
instead of QColor. OK with styles like Liquid.
-28/03/2002 Michael Goffioul <kdeprint@swing.be>
+28/03/2002 Michael Goffioul <tdeprint@swing.be>
* general: added a user feedback mechanism in the form of a dialog showgin
status messages, including initialization, number of the page currently
generated, filtering and sending to the printer.
-29/03/2002 Michael Goffioul <kdeprint@swing.be>
+29/03/2002 Michael Goffioul <tdeprint@swing.be>
* general: enhanced the status feedback mechanism
. possibility to have multiple status boxes (one for each app)
. added an icon (eye-candy) and the document name being printed
@@ -545,7 +545,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
current plugin below the plugin combobox (ex: in CUPS, shows the current
server:port).
-02/04/2002 Michael Goffioul <kdeprint@swing.be>
+02/04/2002 Michael Goffioul <tdeprint@swing.be>
* general:
. fixed various conflicting shortcuts
. made KMVirtualManager inherit from KPReloadObject to force instance
@@ -555,14 +555,14 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
tab in the print dialog. It contain a 2-columns table where custom tags
can be added. Read-only in job editing mode (hope to change that soon).
-03/04/2002 Michael Goffioul <kdeprint@swing.be>
+03/04/2002 Michael Goffioul <tdeprint@swing.be>
* manager: show instances as children of the real printer in the tree view.
No instance management is possible from the tree view itself. The user
still has to use the "Instances" tab.
* ioslave: added support for print jobs browsing, per printer or for all
printers together (-> print:/jobs)
-04/04/2002 Michael Goffioul <kdeprint@swing.be>
+04/04/2002 Michael Goffioul <tdeprint@swing.be>
* ioslave: added support to view the driver of a printer in HTML form
(print:/printers/lp1?driver)
* CUPS: allows editing of page-ranges for pending jobs, work around
@@ -573,11 +573,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
work with gpr (from GNUlpr)
. added support for "bool" directives in Foomatic drivers
-23/05/2002 Michael Goffioul <kdeprint@swing.be>
+23/05/2002 Michael Goffioul <tdeprint@swing.be>
* job manager: added the possibility to control the username for jobs
filtering, and the possibility to limit the number of jobs shown.
-16/08/2002 Michael Goffioul <kdeprint@swing.be>
+16/08/2002 Michael Goffioul <tdeprint@swing.be>
* filters/command: added the possibility to have comments about a specific
command, including clickable URL's. Modified the command selector to use
those comments.
@@ -589,31 +589,31 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be>
even on first dialog showing (call slotPrinterSelected after setting
the output file name).
-20/08/2002 Michael Goffioul <kdeprint@swing.be>
+20/08/2002 Michael Goffioul <tdeprint@swing.be>
* print dialog:
. added a method to disable a page in the main dialog
. make the filename persistent in the SaveFile dialog
. use a rename dialog if the output file already exists
-26/08/2002 Michael Goffioul <kdeprint@swing.be>
+26/08/2002 Michael Goffioul <tdeprint@swing.be>
* general: added a generic PS driver to (missing for too long)
-02/09/2002 Michael Goffioul <kdeprint@swing.be>
+02/09/2002 Michael Goffioul <tdeprint@swing.be>
* print dialog: added graphical interface to the poster XML command
(still to be committed)
* manager: added a condensed toolbar with actions grouped by topics in
sub-menus.
-03/09/2002 Michael Goffioul <kdeprint@swing.be>
+03/09/2002 Michael Goffioul <tdeprint@swing.be>
* print dialog: enabled preview even in standalone mode, either the
internal PS viewer or any other registered app will be used,
according to the user preferences.
-04/09/2002 Michael Goffioul <kdeprint@swing.be>
+04/09/2002 Michael Goffioul <tdeprint@swing.be>
* commands: make unavailability of a command more visual by showing a
red text, and disabling the OK button of the current dialog (only
if needed).
-05/09/2002 Michael Goffioul <kdeprint@swing.be>
+05/09/2002 Michael Goffioul <tdeprint@swing.be>
* CUPS: shows all possible URI detected by CUPS when selecting the "Others"
printer type in the wizard, like the web interface is doing.
diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am
index 8b63447e..fecf25c6 100644
--- a/kdeprint/Makefile.am
+++ b/kdeprint/Makefile.am
@@ -6,14 +6,14 @@ endif
SUBDIRS = . management lpdunix $(CUPSSUBDIR) lpr rlpr ext filters pics tools tests
-INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes)
-kde_module_LTLIBRARIES = kded_kdeprintd.la
+kde_module_LTLIBRARIES = kded_tdeprintd.la
-kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp
-kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la
-kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#kded_kdeprintd_la_METASOURCES = AUTO
+kded_tdeprintd_la_SOURCES = tdeprintd.skel tdeprintd.cpp kprintprocess.cpp
+kded_tdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la
+kded_tdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+#kded_tdeprintd_la_METASOURCES = AUTO
lib_LTLIBRARIES = libtdeprint.la
@@ -23,7 +23,7 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \
kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp \
kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp \
- kmspecialmanager.cpp kdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \
+ kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \
kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kmfactory.skel kxmlcommand.cpp \
util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp \
kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \
@@ -38,8 +38,8 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \
kmuimanager.h kmvirtualmanager.h driveritem.h droptionview.h \
driverview.h kprintpreview.h kprinterimpl.h kprintdialog.h \
kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.h \
- kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h kdeprintd.h \
- kpfilterpage.h kmspecialmanager.h kdeprintcheck.h plugincombobox.h \
+ kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h tdeprintd.h \
+ kpfilterpage.h kmspecialmanager.h tdeprintcheck.h plugincombobox.h \
kfilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \
util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \
marginvaluewidget.h kpmarginpage.h messagewindow.h \
@@ -47,9 +47,9 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \
include_HEADERS = kprinter.h kprintaction.h
-kdeprint_HEADERS = kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h \
+tdeprint_HEADERS = kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h \
driver.h kmjobmanager.h kmjob.h
-kdeprintdir = $(includedir)/kdeprint
+tdeprintdir = $(includedir)/tdeprint
EXTRA_DIST = fooparser.y fooscanner.l kprintpreviewui.rc
@@ -61,22 +61,22 @@ uidatadir = $(kde_confdir)/ui
# Test page
printdata_DATA = testprint.ps specials.desktop
-printdatadir = $(kde_datadir)/kdeprint
+printdatadir = $(kde_datadir)/tdeprint
# Services
servicesdir = $(kde_servicesdir)/kded
-services_DATA = kdeprintd.desktop
+services_DATA = tdeprintd.desktop
# Config file
configdir = $(kde_confdir)
-config_DATA = kdeprintrc
+config_DATA = tdeprintrc
# parser and scanner
fooparser:
rm -f fooparser.cpp.h
- bison -v -d -p kdeprint_foomatic2 $(srcdir)/fooparser.y -o $(srcdir)/fooparser.cpp
+ bison -v -d -p tdeprint_foomatic2 $(srcdir)/fooparser.y -o $(srcdir)/fooparser.cpp
if test -f "$(srcdir)/fooparser.hpp"; then mv $(srcdir)/fooparser.hpp $(srcdir)/fooparser.cpp.h; fi
- flex -o$(srcdir)/fooscanner.cpp -Pkdeprint_foomatic2 $(srcdir)/fooscanner.l
+ flex -o$(srcdir)/fooscanner.cpp -Ptdeprint_foomatic2 $(srcdir)/fooscanner.l
echo "#ifndef fooparser_cpp_h" > $(srcdir)/fooparser.cpp.hh
echo "#define fooparser_cpp_h" >> $(srcdir)/fooparser.cpp.hh
cat $(srcdir)/fooparser.cpp.h >> $(srcdir)/fooparser.cpp.hh
@@ -85,30 +85,30 @@ fooparser:
ppdparser:
rm -f ppdparser.cpp.h
- bison -v -d -p kdeprint_ppd $(srcdir)/ppdparser.y -o $(srcdir)/ppdparser.cpp
+ bison -v -d -p tdeprint_ppd $(srcdir)/ppdparser.y -o $(srcdir)/ppdparser.cpp
if test -f "$(srcdir)/ppdparser.hpp"; then mv $(srcdir)/ppdparser.hpp $(srcdir)/ppdparser.cpp.h; fi
- flex -o$(srcdir)/ppdscanner.cpp -Pkdeprint_ppd $(srcdir)/ppdscanner.l
+ flex -o$(srcdir)/ppdscanner.cpp -Ptdeprint_ppd $(srcdir)/ppdscanner.l
echo "#ifndef ppdparser_cpp_h" > $(srcdir)/ppdparser.cpp.hh
echo "#define ppdparser_cpp_h" >> $(srcdir)/ppdparser.cpp.hh
cat $(srcdir)/ppdparser.cpp.h >> $(srcdir)/ppdparser.cpp.hh
echo "#endif" >> $(srcdir)/ppdparser.cpp.hh
mv $(srcdir)/ppdparser.cpp.hh $(srcdir)/ppdparser.cpp.h
-noinst_DATA = kdeprint
+noinst_DATA = tdeprint
-kdeprint:
- $(LN_S) $(srcdir)/management kdeprint
+tdeprint:
+ $(LN_S) $(srcdir)/management tdeprint
# convenience static library
noinst_LIBRARIES = libdriverparse.a
libdriverparse_a_SOURCES = driverparse.c
-update_DATA = kdeprintrc.upd
+update_DATA = tdeprintrc.upd
updatedir = $(kde_datadir)/kconf_update
messages: rc.cpp
$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp
- $(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/kdeprint.pot
+ $(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/tdeprint.pot
include ../admin/Doxyfile.am
diff --git a/kdeprint/TODO b/kdeprint/TODO
index 8531c038..7c67dccd 100644
--- a/kdeprint/TODO
+++ b/kdeprint/TODO
@@ -16,14 +16,14 @@ WISHES
- Possibility to specify a different input slot for first page???
-- add "Subject" or "Regarding" to kdeprintfax interface: look first
+- add "Subject" or "Regarding" to tdeprintfax interface: look first
if this is possible in efax and/or hylafax
- add the possibility to view a printjob file (if possible)
- restarting server: use of "ps" in a subshell to get the pid, possibility
of authentification (put this into separate program that would restart
- itself using kdesu).
+ itself using tdesu).
- CUPS: a "Printer/Server Debugging Helper" would be nice: you could
vary the LogLevel there, restart the server, provide a viewer
diff --git a/kdeprint/cups/CMakeLists.txt b/kdeprint/cups/CMakeLists.txt
index c9f33655..2166cc08 100644
--- a/kdeprint/cups/CMakeLists.txt
+++ b/kdeprint/cups/CMakeLists.txt
@@ -20,17 +20,17 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore/network
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore/network
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
- ${CMAKE_SOURCE_DIR}/kdeprint
- ${CMAKE_SOURCE_DIR}/kdeprint/management
+ ${CMAKE_SOURCE_DIR}/tdeprint
+ ${CMAKE_SOURCE_DIR}/tdeprint/management
)
link_directories(
@@ -40,13 +40,13 @@ link_directories(
##### other data ################################
-install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins )
-install( FILES preview.png preview-mini.png DESTINATION ${DATA_INSTALL_DIR}/kdeprint )
+install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins )
+install( FILES preview.png preview-mini.png DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
-#### kdeprint_cups ##############################
+#### tdeprint_cups ##############################
-set( target kdeprint_cups )
+set( target tdeprint_cups )
set( ${target}_SRCS
cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp
@@ -62,7 +62,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeprint_management-shared ${CUPS_LIBRARIES}
+ LINK tdeprint_management-shared ${CUPS_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -77,7 +77,7 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK driverparse-static kdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES}
+ LINK driverparse-static tdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
@@ -92,6 +92,6 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK kdefakes-shared ${CUPS_LIBRARIES}
+ LINK tdefakes-shared ${CUPS_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdeprint/cups/Makefile.am b/kdeprint/cups/Makefile.am
index ed45a175..6f3d7ede 100644
--- a/kdeprint/cups/Makefile.am
+++ b/kdeprint/cups/Makefile.am
@@ -2,11 +2,11 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE
SUBDIRS = cupsdconf2
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management -I$(top_srcdir)/kdecore/network $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes)
-kde_module_LTLIBRARIES = kdeprint_cups.la
+kde_module_LTLIBRARIES = tdeprint_cups.la
-kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcupsjobmanager.cpp \
+tdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcupsjobmanager.cpp \
kmcupsmanager.cpp kmcupsuimanager.cpp kmpropbanners.cpp kmwbanners.cpp kmwipp.cpp \
kmwippselect.cpp kcupsprinterimpl.cpp kmcupsconfigwidget.cpp \
kmconfigcups.cpp kmconfigcupsdir.cpp kmwippprinter.cpp kmwfax.cpp kmwquota.cpp \
@@ -14,9 +14,9 @@ kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups
imagepreview.cpp imageposition.cpp kpimagepage.cpp \
kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
kptagspage.cpp
-kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
-kdeprint_cups_la_METASOURCES = AUTO
+tdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+tdeprint_cups_la_METASOURCES = AUTO
noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
kmpropbanners.h kmwbanners.h kmwipp.h kmwippselect.h kcupsprinterimpl.h \
@@ -27,18 +27,18 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmc
bin_PROGRAMS = make_driver_db_cups cupsdoprint
make_driver_db_cups_SOURCES = make_driver_db_cups.c
-make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libtdefakes.la $(LIBDL) $(LIBZ)
+make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/tdecore/libtdefakes.la $(LIBDL) $(LIBZ)
make_driver_db_cups_LDFLAGS = $(all_libraries)
cupsdoprint_SOURCES = cupsdoprint.c
-cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libtdefakes.la
+cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/tdecore/libtdefakes.la
cupsdoprint_LDFLAGS = $(all_libraries)
entry_DATA = cups.print
-entrydir = $(kde_datadir)/kdeprint/plugins
+entrydir = $(kde_datadir)/tdeprint/plugins
misc_DATA = preview.png preview-mini.png
-miscdir = $(kde_datadir)/kdeprint
+miscdir = $(kde_datadir)/tdeprint
EXTRA_DIST = postscript.ppd.gz
diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp
index f12653cb..ca40a10a 100644
--- a/kdeprint/cups/cupsaddsmb2.cpp
+++ b/kdeprint/cups/cupsaddsmb2.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsaddsmb2.h b/kdeprint/cups/cupsaddsmb2.h
index 266a50c6..84166f53 100644
--- a/kdeprint/cups/cupsaddsmb2.h
+++ b/kdeprint/cups/cupsaddsmb2.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/CMakeLists.txt b/kdeprint/cups/cupsdconf2/CMakeLists.txt
index 914b1844..ceee1bc4 100644
--- a/kdeprint/cups/cupsdconf2/CMakeLists.txt
+++ b/kdeprint/cups/cupsdconf2/CMakeLists.txt
@@ -14,9 +14,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
@@ -31,7 +31,7 @@ link_directories(
install( FILES
kde_logo.png cups_logo.png cupsd.conf.template
- DESTINATION ${DATA_INSTALL_DIR}/kdeprint )
+ DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
#### cupsdconf ##################################
@@ -48,7 +48,7 @@ set( ${target}_SRCS
cups-util.c qdirmultilineedit.cpp sizewidget.cpp main.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kio-shared ${CUPS_LIBRARIES}
)
diff --git a/kdeprint/cups/cupsdconf2/Makefile.am b/kdeprint/cups/cupsdconf2/Makefile.am
index 83426a5b..434af6a3 100644
--- a/kdeprint/cups/cupsdconf2/Makefile.am
+++ b/kdeprint/cups/cupsdconf2/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includ
bin_PROGRAMS =
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = cupsdconf.la
+tdeinit_LTLIBRARIES = cupsdconf.la
# library creation
cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \
@@ -26,7 +26,7 @@ noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplas
# Data
cupsdconfdata_DATA = kde_logo.png cups_logo.png cupsd.conf.template
-cupsdconfdatadir = $(kde_datadir)/kdeprint
+cupsdconfdatadir = $(kde_datadir)/tdeprint
# Translations
messages:
diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp
index 7e4f1bdd..fab6a6fb 100644
--- a/kdeprint/cups/cupsdconf2/addressdialog.cpp
+++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/addressdialog.h b/kdeprint/cups/cupsdconf2/addressdialog.h
index 7d241a08..7fdb6fb6 100644
--- a/kdeprint/cups/cupsdconf2/addressdialog.h
+++ b/kdeprint/cups/cupsdconf2/addressdialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/browsedialog.cpp b/kdeprint/cups/cupsdconf2/browsedialog.cpp
index 4cfc6099..b337eb88 100644
--- a/kdeprint/cups/cupsdconf2/browsedialog.cpp
+++ b/kdeprint/cups/cupsdconf2/browsedialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/browsedialog.h b/kdeprint/cups/cupsdconf2/browsedialog.h
index e75357e1..8db12bc3 100644
--- a/kdeprint/cups/cupsdconf2/browsedialog.h
+++ b/kdeprint/cups/cupsdconf2/browsedialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cups-util.h b/kdeprint/cups/cupsdconf2/cups-util.h
index 1daf4050..9c23c0c5 100644
--- a/kdeprint/cups/cupsdconf2/cups-util.h
+++ b/kdeprint/cups/cupsdconf2/cups-util.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsd.conf.template b/kdeprint/cups/cupsdconf2/cupsd.conf.template
index ae1a4c36..08d4b942 100644
--- a/kdeprint/cups/cupsdconf2/cupsd.conf.template
+++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template
@@ -5,7 +5,7 @@
# in KDEPrint. The predecessors to KDEPrint in former KDE releases
# were KUPS and QtCUPS; they are deprecated and no longer maintained.
#
-# Author: Michael Goffioul <kdeprint@swing.be>
+# Author: Michael Goffioul <tdeprint@swing.be>
#
# Web site: http://printing.kde.org/
#
diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index 5ae67109..4b056cdb 100644
--- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -36,7 +36,7 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
{
setPageLabel(i18n("Browsing"));
setHeader(i18n("Browsing Settings"));
- setPixmap("kdeprint_printer_remote");
+ setPixmap("tdeprint_printer_remote");
browseinterval_ = new KIntNumInput(this);
browseport_ = new KIntNumInput(this);
diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
index 6658e39c..bdbff184 100644
--- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
index 0e761378..d17c8bd0 100644
--- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -114,7 +114,7 @@ bool CupsdComment::loadComments()
{
comments_.setAutoDelete(true);
comments_.clear();
- TQFile f(locate("data", "kdeprint/cupsd.conf.template"));
+ TQFile f(locate("data", "tdeprint/cupsd.conf.template"));
if (f.exists() && f.open(IO_ReadOnly))
{
Comment *comm;
diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.h b/kdeprint/cups/cupsdconf2/cupsdcomment.h
index 3bfc67e1..35f9e051 100644
--- a/kdeprint/cups/cupsdconf2/cupsdcomment.h
+++ b/kdeprint/cups/cupsdconf2/cupsdcomment.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp
index 78ec9ec7..0cd041d4 100644
--- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line)
bool CupsdConf::loadAvailableResources()
{
- KConfig conf("kdeprintrc");
+ KConfig conf("tdeprintrc");
conf.setGroup("CUPS");
TQString host = conf.readEntry("Host",cupsServer());
int port = conf.readNumEntry("Port",ippPort());
@@ -876,9 +876,9 @@ TQString CupsResource::typeToIconName(int type)
case RESOURCE_GLOBAL:
return TQString("folder");
case RESOURCE_PRINTER:
- return TQString("kdeprint_printer");
+ return TQString("tdeprint_printer");
case RESOURCE_CLASS:
- return TQString("kdeprint_printer_class");
+ return TQString("tdeprint_printer_class");
}
return TQString("folder");
}
diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.h b/kdeprint/cups/cupsdconf2/cupsdconf.h
index 33a2ecd7..70b4f591 100644
--- a/kdeprint/cups/cupsdconf2/cupsdconf.h
+++ b/kdeprint/cups/cupsdconf2/cupsdconf.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp
index fb59986c..e6338eb8 100644
--- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -113,7 +113,7 @@ const char* getPassword(const char*)
CupsdDialog::CupsdDialog(TQWidget *parent, const char *name)
: KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help"))
{
- KGlobal::iconLoader()->addAppDir("kdeprint");
+ KGlobal::iconLoader()->addAppDir("tdeprint");
KGlobal::locale()->insertCatalogue("cupsdconf");
setShowIconsInTreeList(true);
@@ -208,7 +208,7 @@ bool CupsdDialog::restartServer(TQString& msg)
{
bool success = false;
KProcess proc;
- proc << "kdesu" << "-c" << "/etc/init.d/cupsys restart";
+ proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart";
success = proc.start( KProcess::Block ) && proc.normalExit();
if( !success )
msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);
diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.h b/kdeprint/cups/cupsdconf2/cupsddialog.h
index ed8a3361..85eee172 100644
--- a/kdeprint/cups/cupsdconf2/cupsddialog.h
+++ b/kdeprint/cups/cupsdconf2/cupsddialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp
index 05d8314e..268465a7 100644
--- a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsddirpage.h b/kdeprint/cups/cupsdconf2/cupsddirpage.h
index 6056f79c..571c79f2 100644
--- a/kdeprint/cups/cupsdconf2/cupsddirpage.h
+++ b/kdeprint/cups/cupsdconf2/cupsddirpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
index a47fae05..79c8a940 100644
--- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h
index 1e32e92b..18fc5d40 100644
--- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp
index 8cb20679..f12f82f1 100644
--- a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.h b/kdeprint/cups/cupsdconf2/cupsdjobspage.h
index 0b6f5dbf..abbbd140 100644
--- a/kdeprint/cups/cupsdconf2/cupsdjobspage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp
index f7de3678..61a89f93 100644
--- a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.h b/kdeprint/cups/cupsdconf2/cupsdlogpage.h
index bad88963..618f612b 100644
--- a/kdeprint/cups/cupsdconf2/cupsdlogpage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
index c56d5e14..9edca586 100644
--- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h
index 62ed5662..be46c280 100644
--- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdpage.cpp b/kdeprint/cups/cupsdconf2/cupsdpage.cpp
index e4a47bf1..68bdde7a 100644
--- a/kdeprint/cups/cupsdconf2/cupsdpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdpage.h b/kdeprint/cups/cupsdconf2/cupsdpage.h
index f6c8b932..aadbd54b 100644
--- a/kdeprint/cups/cupsdconf2/cupsdpage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index 5be68030..092e1a7e 100644
--- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h
index 5f20b2dc..5e97c1cf 100644
--- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index bd99546a..cfd73143 100644
--- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.h b/kdeprint/cups/cupsdconf2/cupsdserverpage.h
index 50164f11..f1f9eed2 100644
--- a/kdeprint/cups/cupsdconf2/cupsdserverpage.h
+++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp
index a0a34db8..c26b65fd 100644
--- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -37,11 +37,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
main_->addLayout(sub_);
TQLabel *cupslogo_ = new TQLabel(this);
- TQString logopath = locate("data", TQString("kdeprint/cups_logo.png"));
+ TQString logopath = locate("data", TQString("tdeprint/cups_logo.png"));
cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
cupslogo_->tqsetAlignment(Qt::AlignCenter);
TQLabel *kupslogo_ = new TQLabel(this);
- logopath = locate("data", TQString("kdeprint/kde_logo.png"));
+ logopath = locate("data", TQString("tdeprint/kde_logo.png"));
kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
kupslogo_->tqsetAlignment(Qt::AlignCenter);
diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.h b/kdeprint/cups/cupsdconf2/cupsdsplash.h
index 9acf2739..f484958d 100644
--- a/kdeprint/cups/cupsdconf2/cupsdsplash.h
+++ b/kdeprint/cups/cupsdconf2/cupsdsplash.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp
index 9acbb23a..754c9659 100644
--- a/kdeprint/cups/cupsdconf2/editlist.cpp
+++ b/kdeprint/cups/cupsdconf2/editlist.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/editlist.h b/kdeprint/cups/cupsdconf2/editlist.h
index 177cddce..a0fc7ee0 100644
--- a/kdeprint/cups/cupsdconf2/editlist.h
+++ b/kdeprint/cups/cupsdconf2/editlist.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp
index 416efa24..7e1858cc 100644
--- a/kdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/locationdialog.h b/kdeprint/cups/cupsdconf2/locationdialog.h
index 26a4c43f..f0c182f4 100644
--- a/kdeprint/cups/cupsdconf2/locationdialog.h
+++ b/kdeprint/cups/cupsdconf2/locationdialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/main.cpp b/kdeprint/cups/cupsdconf2/main.cpp
index cc0918f4..f3c317af 100644
--- a/kdeprint/cups/cupsdconf2/main.cpp
+++ b/kdeprint/cups/cupsdconf2/main.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp
index 18f27db5..18cade9f 100644
--- a/kdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/kdeprint/cups/cupsdconf2/portdialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/portdialog.h b/kdeprint/cups/cupsdconf2/portdialog.h
index 44b91d13..42dd7037 100644
--- a/kdeprint/cups/cupsdconf2/portdialog.h
+++ b/kdeprint/cups/cupsdconf2/portdialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp
index 46e70a41..7cf0ea74 100644
--- a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp
+++ b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.h b/kdeprint/cups/cupsdconf2/qdirlineedit.h
index 85e9603f..d852897c 100644
--- a/kdeprint/cups/cupsdconf2/qdirlineedit.h
+++ b/kdeprint/cups/cupsdconf2/qdirlineedit.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index b473d2a6..e677da98 100644
--- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h
index f3929366..c3765362 100644
--- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h
+++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp
index d77fe5aa..742702e4 100644
--- a/kdeprint/cups/cupsdconf2/sizewidget.cpp
+++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdconf2/sizewidget.h b/kdeprint/cups/cupsdconf2/sizewidget.h
index 56818b9a..000fb22b 100644
--- a/kdeprint/cups/cupsdconf2/sizewidget.h
+++ b/kdeprint/cups/cupsdconf2/sizewidget.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsdoprint.c b/kdeprint/cups/cupsdoprint.c
index 743042b2..a12a2adf 100644
--- a/kdeprint/cups/cupsdoprint.c
+++ b/kdeprint/cups/cupsdoprint.c
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -87,7 +87,7 @@ static const char* getPasswordCB(const char* prompt)
char *_user = shell_quote( cupsUser() ), *_passwd = NULL;
FILE *output;
- snprintf( buf, sizeof( buf )-1, "dcop kded kdeprintd requestPassword %s %s %d %d",
+ snprintf( buf, sizeof( buf )-1, "dcop kded tdeprintd requestPassword %s %s %d %d",
_user,
cupsServer(),
ippPort(),
diff --git a/kdeprint/cups/cupsinfos.cpp b/kdeprint/cups/cupsinfos.cpp
index 5c967d7b..1fae8e0d 100644
--- a/kdeprint/cups/cupsinfos.cpp
+++ b/kdeprint/cups/cupsinfos.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/cupsinfos.h b/kdeprint/cups/cupsinfos.h
index 416e441c..5f74d363 100644
--- a/kdeprint/cups/cupsinfos.h
+++ b/kdeprint/cups/cupsinfos.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/image.cpp b/kdeprint/cups/image.cpp
index 9e32ce77..ce56bb4b 100644
--- a/kdeprint/cups/image.cpp
+++ b/kdeprint/cups/image.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp
index 5f08fcd6..70a84ba7 100644
--- a/kdeprint/cups/imageposition.cpp
+++ b/kdeprint/cups/imageposition.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -46,7 +46,7 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name)
position_ = Center;
setMinimumSize(tqsizeHint());
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
- pix_.load(locate("data", "kdeprint/preview-mini.png"));
+ pix_.load(locate("data", "tdeprint/preview-mini.png"));
}
ImagePosition::~ImagePosition()
diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h
index 406e9695..6d664536 100644
--- a/kdeprint/cups/imageposition.h
+++ b/kdeprint/cups/imageposition.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp
index 16a6271c..2290f6a9 100644
--- a/kdeprint/cups/imagepreview.cpp
+++ b/kdeprint/cups/imagepreview.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h
index ff9da9fb..12a57ddb 100644
--- a/kdeprint/cups/imagepreview.h
+++ b/kdeprint/cups/imagepreview.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/ippreportdlg.cpp b/kdeprint/cups/ippreportdlg.cpp
index b7ef270b..5fa54e11 100644
--- a/kdeprint/cups/ippreportdlg.cpp
+++ b/kdeprint/cups/ippreportdlg.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/ippreportdlg.h b/kdeprint/cups/ippreportdlg.h
index 8e3eea8c..e61ccd7b 100644
--- a/kdeprint/cups/ippreportdlg.h
+++ b/kdeprint/cups/ippreportdlg.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/ipprequest.cpp b/kdeprint/cups/ipprequest.cpp
index 354d46cf..16cbe330 100644
--- a/kdeprint/cups/ipprequest.cpp
+++ b/kdeprint/cups/ipprequest.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -154,7 +154,7 @@ void IppRequest::init()
request_ = 0;
}
request_ = ippNew();
- //kdDebug(500) << "kdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl;
+ //kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl;
TQCString langstr = KGlobal::locale()->language().latin1();
cups_lang_t* lang = cupsLangGet(langstr.data());
// default charset to UTF-8 (ugly hack)
diff --git a/kdeprint/cups/ipprequest.h b/kdeprint/cups/ipprequest.h
index 1265ee96..ba8b2f08 100644
--- a/kdeprint/cups/ipprequest.h
+++ b/kdeprint/cups/ipprequest.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp
index 4bcf96e6..e016e995 100644
--- a/kdeprint/cups/kcupsprinterimpl.cpp
+++ b/kdeprint/cups/kcupsprinterimpl.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kcupsprinterimpl.h b/kdeprint/cups/kcupsprinterimpl.h
index f2eeab88..b86db8aa 100644
--- a/kdeprint/cups/kcupsprinterimpl.h
+++ b/kdeprint/cups/kcupsprinterimpl.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmconfigcups.cpp b/kdeprint/cups/kmconfigcups.cpp
index c23f5d54..7e03dae0 100644
--- a/kdeprint/cups/kmconfigcups.cpp
+++ b/kdeprint/cups/kmconfigcups.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmconfigcups.h b/kdeprint/cups/kmconfigcups.h
index 52dac657..c0f1ab2b 100644
--- a/kdeprint/cups/kmconfigcups.h
+++ b/kdeprint/cups/kmconfigcups.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmconfigcupsdir.cpp b/kdeprint/cups/kmconfigcupsdir.cpp
index fc1d7d39..fbec34f2 100644
--- a/kdeprint/cups/kmconfigcupsdir.cpp
+++ b/kdeprint/cups/kmconfigcupsdir.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmconfigcupsdir.h b/kdeprint/cups/kmconfigcupsdir.h
index a6fe8d9b..352388c9 100644
--- a/kdeprint/cups/kmconfigcupsdir.h
+++ b/kdeprint/cups/kmconfigcupsdir.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp
index 5242cd24..482680bd 100644
--- a/kdeprint/cups/kmcupsconfigwidget.cpp
+++ b/kdeprint/cups/kmcupsconfigwidget.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmcupsconfigwidget.h b/kdeprint/cups/kmcupsconfigwidget.h
index 804fc22f..7eee42d8 100644
--- a/kdeprint/cups/kmcupsconfigwidget.h
+++ b/kdeprint/cups/kmcupsconfigwidget.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmcupsfactory.cpp b/kdeprint/cups/kmcupsfactory.cpp
index 93e179f4..47384eab 100644
--- a/kdeprint/cups/kmcupsfactory.cpp
+++ b/kdeprint/cups/kmcupsfactory.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -26,5 +26,5 @@
#include <kgenericfactory.h>
typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products;
-K_EXPORT_COMPONENT_FACTORY( kdeprint_cups, KGenericFactory< Products >( "ppdtranslations" ) )
+K_EXPORT_COMPONENT_FACTORY( tdeprint_cups, KGenericFactory< Products >( "ppdtranslations" ) )
diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp
index 1daa22b4..58de0818 100644
--- a/kdeprint/cups/kmcupsjobmanager.cpp
+++ b/kdeprint/cups/kmcupsjobmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -285,7 +285,7 @@ TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *c
TQValueList<KAction*> list;
KAction *act(0);
- list << (act = new PluginAction(0, i18n("&Job IPP Report"), "kdeprint_report", 0, coll, "plugin_ipp"));
+ list << (act = new PluginAction(0, i18n("&Job IPP Report"), "tdeprint_report", 0, coll, "plugin_ipp"));
act->setGroup("plugin");
list << (act = new PluginAction(1, i18n("&Increase Priority"), "up", 0, coll, "plugin_prioup"));
act->setGroup("plugin");
diff --git a/kdeprint/cups/kmcupsjobmanager.h b/kdeprint/cups/kmcupsjobmanager.h
index cba3371d..7e8a75a5 100644
--- a/kdeprint/cups/kmcupsjobmanager.h
+++ b/kdeprint/cups/kmcupsjobmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp
index 3027f3ac..8db6bdc6 100644
--- a/kdeprint/cups/kmcupsmanager.cpp
+++ b/kdeprint/cups/kmcupsmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -846,9 +846,9 @@ TQStringList KMCupsManager::detectLocalPrinters()
void KMCupsManager::createPluginActions(KActionCollection *coll)
{
- KAction *act = new KAction(i18n("&Export Driver..."), "kdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
+ KAction *act = new KAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
act->setGroup("plugin");
- act = new KAction(i18n("&Printer IPP Report"), "kdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
+ act = new KAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
act->setGroup("plugin");
}
diff --git a/kdeprint/cups/kmcupsmanager.h b/kdeprint/cups/kmcupsmanager.h
index 132decb3..d574bb68 100644
--- a/kdeprint/cups/kmcupsmanager.h
+++ b/kdeprint/cups/kmcupsmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmcupsuimanager.cpp b/kdeprint/cups/kmcupsuimanager.cpp
index 9cefccac..c3dfcb1a 100644
--- a/kdeprint/cups/kmcupsuimanager.cpp
+++ b/kdeprint/cups/kmcupsuimanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmcupsuimanager.h b/kdeprint/cups/kmcupsuimanager.h
index 88c2c962..6ad0f574 100644
--- a/kdeprint/cups/kmcupsuimanager.h
+++ b/kdeprint/cups/kmcupsuimanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmpropbanners.cpp b/kdeprint/cups/kmpropbanners.cpp
index 4380e650..22098cdf 100644
--- a/kdeprint/cups/kmpropbanners.cpp
+++ b/kdeprint/cups/kmpropbanners.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmpropbanners.h b/kdeprint/cups/kmpropbanners.h
index 6756763e..770419dc 100644
--- a/kdeprint/cups/kmpropbanners.h
+++ b/kdeprint/cups/kmpropbanners.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmpropquota.cpp b/kdeprint/cups/kmpropquota.cpp
index 9f5ff844..9df6cbcb 100644
--- a/kdeprint/cups/kmpropquota.cpp
+++ b/kdeprint/cups/kmpropquota.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmpropquota.h b/kdeprint/cups/kmpropquota.h
index 4142c117..8ebeb323 100644
--- a/kdeprint/cups/kmpropquota.h
+++ b/kdeprint/cups/kmpropquota.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmpropusers.cpp b/kdeprint/cups/kmpropusers.cpp
index 17314904..65a9e4db 100644
--- a/kdeprint/cups/kmpropusers.cpp
+++ b/kdeprint/cups/kmpropusers.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -37,7 +37,7 @@ KMPropUsers::KMPropUsers(TQWidget *parent, const char *name)
m_title = i18n("Users");
m_header = i18n("Users Access Settings");
- m_pixmap = "kdeprint_printer_users";
+ m_pixmap = "tdeprint_printer_users";
}
KMPropUsers::~KMPropUsers()
diff --git a/kdeprint/cups/kmpropusers.h b/kdeprint/cups/kmpropusers.h
index 4ab1fab9..35e935ad 100644
--- a/kdeprint/cups/kmpropusers.h
+++ b/kdeprint/cups/kmpropusers.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp
index 9e930ac0..c221f69d 100644
--- a/kdeprint/cups/kmwbanners.cpp
+++ b/kdeprint/cups/kmwbanners.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwbanners.h b/kdeprint/cups/kmwbanners.h
index 7340e555..6f865084 100644
--- a/kdeprint/cups/kmwbanners.h
+++ b/kdeprint/cups/kmwbanners.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwfax.cpp b/kdeprint/cups/kmwfax.cpp
index 127232d2..352081f6 100644
--- a/kdeprint/cups/kmwfax.cpp
+++ b/kdeprint/cups/kmwfax.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwfax.h b/kdeprint/cups/kmwfax.h
index 8fc846a7..1a822165 100644
--- a/kdeprint/cups/kmwfax.h
+++ b/kdeprint/cups/kmwfax.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwipp.cpp b/kdeprint/cups/kmwipp.cpp
index 4d32ae2a..119da629 100644
--- a/kdeprint/cups/kmwipp.cpp
+++ b/kdeprint/cups/kmwipp.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwipp.h b/kdeprint/cups/kmwipp.h
index 42e36814..33d02629 100644
--- a/kdeprint/cups/kmwipp.h
+++ b/kdeprint/cups/kmwipp.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwippprinter.cpp b/kdeprint/cups/kmwippprinter.cpp
index 90fad0e9..0a0c7b67 100644
--- a/kdeprint/cups/kmwippprinter.cpp
+++ b/kdeprint/cups/kmwippprinter.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -62,7 +62,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
m_info->setPaper(tqcolorGroup().background());
m_info->setMinimumHeight(100);
m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>"));
- m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "kdeprint_report"), this);
+ m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "tdeprint_report"), this);
m_ippreport->setEnabled(false);
m_scanner = new NetworkScanner( 631, this );
@@ -140,7 +140,7 @@ void KMWIppPrinter::slotScanFinished()
else
name = it.current()->Name;
TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port));
- item->setPixmap(0,SmallIcon("kdeprint_printer"));
+ item->setPixmap(0,SmallIcon("tdeprint_printer"));
}
}
diff --git a/kdeprint/cups/kmwippprinter.h b/kdeprint/cups/kmwippprinter.h
index aff29fdf..5d9d33f7 100644
--- a/kdeprint/cups/kmwippprinter.h
+++ b/kdeprint/cups/kmwippprinter.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwippselect.cpp b/kdeprint/cups/kmwippselect.cpp
index 0d89e911..5c9cad35 100644
--- a/kdeprint/cups/kmwippselect.cpp
+++ b/kdeprint/cups/kmwippselect.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -84,7 +84,7 @@ void KMWIppSelect::initPrinter(KMPrinter *p)
while (attr)
{
if (attr->name && strcmp(attr->name,"printer-name") == 0)
- m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text));
+ m_list->insertItem(SmallIcon("tdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text));
attr = attr->next;
}
m_list->sort();
diff --git a/kdeprint/cups/kmwippselect.h b/kdeprint/cups/kmwippselect.h
index 26ce6e56..8d1711e8 100644
--- a/kdeprint/cups/kmwippselect.h
+++ b/kdeprint/cups/kmwippselect.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp
index 68a6c453..596f6199 100644
--- a/kdeprint/cups/kmwother.cpp
+++ b/kdeprint/cups/kmwother.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -97,7 +97,7 @@ void KMWOther::initPrinter(KMPrinter *p)
if ( cl == "network" )
parent->setPixmap( 0, SmallIcon( "network" ) );
else if ( cl == "direct" )
- parent->setPixmap( 0, SmallIcon( "kdeprint_computer" ) );
+ parent->setPixmap( 0, SmallIcon( "tdeprint_computer" ) );
else if ( cl == "serial" )
parent->setPixmap( 0, SmallIcon( "usb" ) );
else
diff --git a/kdeprint/cups/kmwother.h b/kdeprint/cups/kmwother.h
index e4bc72d5..eba5ac2b 100644
--- a/kdeprint/cups/kmwother.h
+++ b/kdeprint/cups/kmwother.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwquota.cpp b/kdeprint/cups/kmwquota.cpp
index 703a9510..67245fb2 100644
--- a/kdeprint/cups/kmwquota.cpp
+++ b/kdeprint/cups/kmwquota.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwquota.h b/kdeprint/cups/kmwquota.h
index 6f1ce066..d8895c80 100644
--- a/kdeprint/cups/kmwquota.h
+++ b/kdeprint/cups/kmwquota.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwusers.cpp b/kdeprint/cups/kmwusers.cpp
index f42250d6..714f6f4d 100644
--- a/kdeprint/cups/kmwusers.cpp
+++ b/kdeprint/cups/kmwusers.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kmwusers.h b/kdeprint/cups/kmwusers.h
index 9b6faeb6..cae8844a 100644
--- a/kdeprint/cups/kmwusers.h
+++ b/kdeprint/cups/kmwusers.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kphpgl2page.cpp b/kdeprint/cups/kphpgl2page.cpp
index 0d15a838..080cdf45 100644
--- a/kdeprint/cups/kphpgl2page.cpp
+++ b/kdeprint/cups/kphpgl2page.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kphpgl2page.h b/kdeprint/cups/kphpgl2page.h
index ecbc85c8..397efb1a 100644
--- a/kdeprint/cups/kphpgl2page.h
+++ b/kdeprint/cups/kphpgl2page.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp
index d669bc47..d3e43838 100644
--- a/kdeprint/cups/kpimagepage.cpp
+++ b/kdeprint/cups/kpimagepage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -275,7 +275,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
m_hue->setEnabled(useColor);
m_saturation->setEnabled(useColor);
- TQImage img(locate("data", "kdeprint/preview.png"));
+ TQImage img(locate("data", "tdeprint/preview.png"));
m_preview->setImage(img);
KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox);
diff --git a/kdeprint/cups/kpimagepage.h b/kdeprint/cups/kpimagepage.h
index d0cfe094..1a6bc6e4 100644
--- a/kdeprint/cups/kpimagepage.h
+++ b/kdeprint/cups/kpimagepage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kpschedulepage.cpp b/kdeprint/cups/kpschedulepage.cpp
index a43fd04d..4d8bab4d 100644
--- a/kdeprint/cups/kpschedulepage.cpp
+++ b/kdeprint/cups/kpschedulepage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kpschedulepage.h b/kdeprint/cups/kpschedulepage.h
index eccfb570..4be11fab 100644
--- a/kdeprint/cups/kpschedulepage.h
+++ b/kdeprint/cups/kpschedulepage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp
index 0e2d93ea..d91a8b42 100644
--- a/kdeprint/cups/kptagspage.cpp
+++ b/kdeprint/cups/kptagspage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h
index 599ecebb..ac99072e 100644
--- a/kdeprint/cups/kptagspage.h
+++ b/kdeprint/cups/kptagspage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp
index cec0f6c2..0bee387c 100644
--- a/kdeprint/cups/kptextpage.cpp
+++ b/kdeprint/cups/kptextpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -331,7 +331,7 @@ void KPTextPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
void KPTextPage::slotPrettyChanged(int ID)
{
- TQString iconstr = (ID == 0 ? "kdeprint_nup1" : "kdeprint_prettyprint");
+ TQString iconstr = (ID == 0 ? "tdeprint_nup1" : "tdeprint_prettyprint");
m_prettypix->setPixmap(UserIcon(iconstr));
}
diff --git a/kdeprint/cups/kptextpage.h b/kdeprint/cups/kptextpage.h
index 3289bf00..504e2d5c 100644
--- a/kdeprint/cups/kptextpage.h
+++ b/kdeprint/cups/kptextpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/driver.cpp b/kdeprint/driver.cpp
index 26423a85..072f125c 100644
--- a/kdeprint/driver.cpp
+++ b/kdeprint/driver.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/driver.h b/kdeprint/driver.h
index a2ccab8a..7064e533 100644
--- a/kdeprint/driver.h
+++ b/kdeprint/driver.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/driveritem.cpp b/kdeprint/driveritem.cpp
index 8bbfff6a..b6531fef 100644
--- a/kdeprint/driveritem.cpp
+++ b/kdeprint/driveritem.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/driveritem.h b/kdeprint/driveritem.h
index b9469be2..506cbe34 100644
--- a/kdeprint/driveritem.h
+++ b/kdeprint/driveritem.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/driverparse.h b/kdeprint/driverparse.h
index 73c41be6..775c8118 100644
--- a/kdeprint/driverparse.h
+++ b/kdeprint/driverparse.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/driverview.cpp b/kdeprint/driverview.cpp
index 1ede9338..f7feabb0 100644
--- a/kdeprint/driverview.cpp
+++ b/kdeprint/driverview.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/driverview.h b/kdeprint/driverview.h
index 421786c5..4ec06c5f 100644
--- a/kdeprint/driverview.h
+++ b/kdeprint/driverview.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/droptionview.cpp b/kdeprint/droptionview.cpp
index f6ed93ff..2ba4d179 100644
--- a/kdeprint/droptionview.cpp
+++ b/kdeprint/droptionview.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/droptionview.h b/kdeprint/droptionview.h
index a84724bd..70f60a81 100644
--- a/kdeprint/droptionview.h
+++ b/kdeprint/droptionview.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/ext/CMakeLists.txt b/kdeprint/ext/CMakeLists.txt
index 8c701056..9f4b2d62 100644
--- a/kdeprint/ext/CMakeLists.txt
+++ b/kdeprint/ext/CMakeLists.txt
@@ -17,11 +17,11 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
- ${CMAKE_SOURCE_DIR}/kdeprint
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
+ ${CMAKE_SOURCE_DIR}/tdeprint
)
link_directories(
@@ -31,12 +31,12 @@ link_directories(
##### other data ################################
-install( FILES ext.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins )
+install( FILES ext.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins )
-##### kdeprint_ext ##############################
+##### tdeprint_ext ##############################
-set( target kdeprint_ext )
+set( target tdeprint_ext )
set( ${target}_SRCS
kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp
@@ -45,6 +45,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeprint-shared
+ LINK tdeprint-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kdeprint/ext/Makefile.am b/kdeprint/ext/Makefile.am
index 1cb50d9f..66e547c9 100644
--- a/kdeprint/ext/Makefile.am
+++ b/kdeprint/ext/Makefile.am
@@ -1,15 +1,15 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes)
-kde_module_LTLIBRARIES = kdeprint_ext.la
+kde_module_LTLIBRARIES = tdeprint_ext.la
-kdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
-kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
-kdeprint_ext_la_METASOURCES = AUTO
+tdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
+tdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+tdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
+tdeprint_ext_la_METASOURCES = AUTO
noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
entry_DATA = ext.print
-entrydir = $(kde_datadir)/kdeprint/plugins
+entrydir = $(kde_datadir)/tdeprint/plugins
diff --git a/kdeprint/ext/kextprinterimpl.cpp b/kdeprint/ext/kextprinterimpl.cpp
index c9265749..c976f54e 100644
--- a/kdeprint/ext/kextprinterimpl.cpp
+++ b/kdeprint/ext/kextprinterimpl.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/ext/kextprinterimpl.h b/kdeprint/ext/kextprinterimpl.h
index 65359359..169e06bf 100644
--- a/kdeprint/ext/kextprinterimpl.h
+++ b/kdeprint/ext/kextprinterimpl.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/ext/kmextfactory.cpp b/kdeprint/ext/kmextfactory.cpp
index 3360774f..de8c58df 100644
--- a/kdeprint/ext/kmextfactory.cpp
+++ b/kdeprint/ext/kmextfactory.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -24,5 +24,5 @@
#include <kgenericfactory.h>
typedef K_TYPELIST_3( KMExtManager, KMExtUiManager, KExtPrinterImpl ) Products;
-K_EXPORT_COMPONENT_FACTORY( kdeprint_ext, KGenericFactory< Products > )
+K_EXPORT_COMPONENT_FACTORY( tdeprint_ext, KGenericFactory< Products > )
diff --git a/kdeprint/ext/kmextmanager.cpp b/kdeprint/ext/kmextmanager.cpp
index 017142a1..598dd664 100644
--- a/kdeprint/ext/kmextmanager.cpp
+++ b/kdeprint/ext/kmextmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/ext/kmextmanager.h b/kdeprint/ext/kmextmanager.h
index 8811f952..c7faab6c 100644
--- a/kdeprint/ext/kmextmanager.h
+++ b/kdeprint/ext/kmextmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/ext/kmextuimanager.cpp b/kdeprint/ext/kmextuimanager.cpp
index ea698b8c..2fa20084 100644
--- a/kdeprint/ext/kmextuimanager.cpp
+++ b/kdeprint/ext/kmextuimanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/ext/kmextuimanager.h b/kdeprint/ext/kmextuimanager.h
index 671d8e76..bca161c6 100644
--- a/kdeprint/ext/kmextuimanager.h
+++ b/kdeprint/ext/kmextuimanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/filters/CMakeLists.txt b/kdeprint/filters/CMakeLists.txt
index a19bb1f9..2d36e16b 100644
--- a/kdeprint/filters/CMakeLists.txt
+++ b/kdeprint/filters/CMakeLists.txt
@@ -18,6 +18,6 @@ install( FILES
psbook2.xml psbook.desktop psbook.xml psselect.desktop
psselect.xml ps2pdf.desktop ps2pdf.xml pdf2ps.desktop
pdf2ps.xml poster.desktop poster.xml
- DESTINATION ${DATA_INSTALL_DIR}/kdeprint/filters )
+ DESTINATION ${DATA_INSTALL_DIR}/tdeprint/filters )
install( PROGRAMS imagetops DESTINATION ${BIN_INSTALL_DIR} )
diff --git a/kdeprint/filters/Makefile.am b/kdeprint/filters/Makefile.am
index 43adaa5d..f9c9f912 100644
--- a/kdeprint/filters/Makefile.am
+++ b/kdeprint/filters/Makefile.am
@@ -1,4 +1,4 @@
-filtersdir = $(kde_datadir)/kdeprint/filters
+filtersdir = $(kde_datadir)/tdeprint/filters
filters_DATA = enscript.desktop enscript.xml\
psnup.desktop psnup.xml \
imagetops.desktop imagetops.xml \
diff --git a/kdeprint/foomatic/Makefile.am b/kdeprint/foomatic/Makefile.am
index a35882fb..7a57fd40 100644
--- a/kdeprint/foomatic/Makefile.am
+++ b/kdeprint/foomatic/Makefile.am
@@ -1,13 +1,13 @@
-INCLUDES = -I$(top_srcdir)/kdeprint $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeprint $(all_includes)
-kde_module_LTLIBRARIES = kdeprint_foomatic.la
+kde_module_LTLIBRARIES = tdeprint_foomatic.la
-kdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \
+tdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \
kmfoomaticmanager.cpp \
kfoomaticprinterimpl.cpp
-kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la
-kdeprint_foomatic_la_METASOURCES = AUTO
+tdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+tdeprint_foomatic_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la
+tdeprint_foomatic_la_METASOURCES = AUTO
noinst_HEADERS = kmfoomaticmanager.h \
kfoomaticprinterimpl.h
@@ -17,4 +17,4 @@ bin_PROGRAMS = make_driver_db_foomatic
make_driver_db_foomatic_SOURCES = make_driver_db_foomatic.c
entry_DATA = foomatic.print
-entrydir = $(kde_datadir)/kdeprint/plugins
+entrydir = $(kde_datadir)/tdeprint/plugins
diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.cpp b/kdeprint/foomatic/kfoomaticprinterimpl.cpp
index 7e47a505..d47a5e13 100644
--- a/kdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/kdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.h b/kdeprint/foomatic/kfoomaticprinterimpl.h
index 74dfdc8f..9d4a2715 100644
--- a/kdeprint/foomatic/kfoomaticprinterimpl.h
+++ b/kdeprint/foomatic/kfoomaticprinterimpl.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/foomatic/kmfoomaticfactory.cpp b/kdeprint/foomatic/kmfoomaticfactory.cpp
index 0355b1dd..660e5faf 100644
--- a/kdeprint/foomatic/kmfoomaticfactory.cpp
+++ b/kdeprint/foomatic/kmfoomaticfactory.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -23,5 +23,5 @@
#include <kgenericfactory.h>
typedef K_TYPELIST_2( KMFoomaticManager, KFoomaticPrinterImpl ) Products;
-K_EXPORT_COMPONENT_FACTORY( kdeprint_foomatic, KGenericFactory< Products > )
+K_EXPORT_COMPONENT_FACTORY( tdeprint_foomatic, KGenericFactory< Products > )
diff --git a/kdeprint/foomatic/kmfoomaticmanager.cpp b/kdeprint/foomatic/kmfoomaticmanager.cpp
index 749bf160..53049852 100644
--- a/kdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/kdeprint/foomatic/kmfoomaticmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/foomatic/kmfoomaticmanager.h b/kdeprint/foomatic/kmfoomaticmanager.h
index 4bf74371..f3796904 100644
--- a/kdeprint/foomatic/kmfoomaticmanager.h
+++ b/kdeprint/foomatic/kmfoomaticmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/foomatic/make_driver_db_foomatic.c b/kdeprint/foomatic/make_driver_db_foomatic.c
index 0419473f..986a2444 100644
--- a/kdeprint/foomatic/make_driver_db_foomatic.c
+++ b/kdeprint/foomatic/make_driver_db_foomatic.c
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/foomatic2loader.cpp b/kdeprint/foomatic2loader.cpp
index d2fb5b17..6add1337 100644
--- a/kdeprint/foomatic2loader.cpp
+++ b/kdeprint/foomatic2loader.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -26,8 +26,8 @@
#include <kdebug.h>
#include <klocale.h>
-void kdeprint_foomatic2scanner_init( TQIODevice* );
-void kdeprint_foomatic2scanner_terminate();
+void tdeprint_foomatic2scanner_init( TQIODevice* );
+void tdeprint_foomatic2scanner_terminate();
Foomatic2Loader::Foomatic2Loader()
{
@@ -41,10 +41,10 @@ bool Foomatic2Loader::read( TQIODevice *d )
{
bool result = true;
m_foodata.clear();
- kdeprint_foomatic2scanner_init( d );
- if ( kdeprint_foomatic2parse( this ) != 0 )
+ tdeprint_foomatic2scanner_init( d );
+ if ( tdeprint_foomatic2parse( this ) != 0 )
result = false;
- kdeprint_foomatic2scanner_terminate();
+ tdeprint_foomatic2scanner_terminate();
return result;
}
diff --git a/kdeprint/foomatic2loader.h b/kdeprint/foomatic2loader.h
index fe32ee8f..19cfc9d9 100644
--- a/kdeprint/foomatic2loader.h
+++ b/kdeprint/foomatic2loader.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -46,7 +46,7 @@ public:
private:
TQMap<TQString,TQVariant> m_foodata;
- friend int kdeprint_foomatic2parse( void* );
+ friend int tdeprint_foomatic2parse( void* );
DrBase* createValue( const TQString&, const TQMap<TQString,TQVariant>& ) const;
DrBase* createOption( const TQMap<TQString,TQVariant>& ) const;
};
diff --git a/kdeprint/fooparser.cpp b/kdeprint/fooparser.cpp
index 09ba34bf..e919616a 100644
--- a/kdeprint/fooparser.cpp
+++ b/kdeprint/fooparser.cpp
@@ -4,13 +4,13 @@
#define YYBISON 1 /* Identify Bison output. */
-#define yyparse kdeprint_foomatic2parse
-#define yylex kdeprint_foomatic2lex
-#define yyerror kdeprint_foomatic2error
-#define yylval kdeprint_foomatic2lval
-#define yychar kdeprint_foomatic2char
-#define yydebug kdeprint_foomatic2debug
-#define yynerrs kdeprint_foomatic2nerrs
+#define yyparse tdeprint_foomatic2parse
+#define yylex tdeprint_foomatic2lex
+#define yyerror tdeprint_foomatic2error
+#define yylval tdeprint_foomatic2lval
+#define yychar tdeprint_foomatic2char
+#define yydebug tdeprint_foomatic2debug
+#define yynerrs tdeprint_foomatic2nerrs
#define VAR 257
#define STRING 258
#define NUMBER 259
@@ -22,7 +22,7 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/fooparser.cpp.h b/kdeprint/fooparser.cpp.h
index 9c8ec018..dd694b5d 100644
--- a/kdeprint/fooparser.cpp.h
+++ b/kdeprint/fooparser.cpp.h
@@ -11,5 +11,5 @@
#define QUOTED 262
-extern YYSTYPE kdeprint_foomatic2lval;
+extern YYSTYPE tdeprint_foomatic2lval;
#endif
diff --git a/kdeprint/fooparser.y b/kdeprint/fooparser.y
index 1aaa4cf7..20626ce5 100644
--- a/kdeprint/fooparser.y
+++ b/kdeprint/fooparser.y
@@ -1,7 +1,7 @@
%{
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/fooscanner.cpp b/kdeprint/fooscanner.cpp
index cab7426a..3cdd4feb 100644
--- a/kdeprint/fooscanner.cpp
+++ b/kdeprint/fooscanner.cpp
@@ -1,19 +1,19 @@
-#define yy_create_buffer kdeprint_foomatic2_create_buffer
-#define yy_delete_buffer kdeprint_foomatic2_delete_buffer
-#define yy_scan_buffer kdeprint_foomatic2_scan_buffer
-#define yy_scan_string kdeprint_foomatic2_scan_string
-#define yy_scan_bytes kdeprint_foomatic2_scan_bytes
-#define yy_flex_debug kdeprint_foomatic2_flex_debug
-#define yy_init_buffer kdeprint_foomatic2_init_buffer
-#define yy_flush_buffer kdeprint_foomatic2_flush_buffer
-#define yy_load_buffer_state kdeprint_foomatic2_load_buffer_state
-#define yy_switch_to_buffer kdeprint_foomatic2_switch_to_buffer
-#define yyin kdeprint_foomatic2in
-#define yyleng kdeprint_foomatic2leng
-#define yylex kdeprint_foomatic2lex
-#define yyout kdeprint_foomatic2out
-#define yyrestart kdeprint_foomatic2restart
-#define yytext kdeprint_foomatic2text
+#define yy_create_buffer tdeprint_foomatic2_create_buffer
+#define yy_delete_buffer tdeprint_foomatic2_delete_buffer
+#define yy_scan_buffer tdeprint_foomatic2_scan_buffer
+#define yy_scan_string tdeprint_foomatic2_scan_string
+#define yy_scan_bytes tdeprint_foomatic2_scan_bytes
+#define yy_flex_debug tdeprint_foomatic2_flex_debug
+#define yy_init_buffer tdeprint_foomatic2_init_buffer
+#define yy_flush_buffer tdeprint_foomatic2_flush_buffer
+#define yy_load_buffer_state tdeprint_foomatic2_load_buffer_state
+#define yy_switch_to_buffer tdeprint_foomatic2_switch_to_buffer
+#define yyin tdeprint_foomatic2in
+#define yyleng tdeprint_foomatic2leng
+#define yylex tdeprint_foomatic2lex
+#define yyout tdeprint_foomatic2out
+#define yyrestart tdeprint_foomatic2restart
+#define yytext tdeprint_foomatic2text
#line 19 "./fooscanner.cpp"
/* A lexical scanner generated by flex */
@@ -427,7 +427,7 @@ char *yytext;
#line 2 "./fooscanner.l"
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -449,13 +449,13 @@ char *yytext;
#define YYSTYPE QVariant
#include "fooparser.cpp.h"
-#define yylval kdeprint_foomatic2lval
+#define yylval tdeprint_foomatic2lval
#define YY_INPUT( buf, result, max_size ) \
{ \
- if ( kdeprint_foomatic2scanner_device ) \
+ if ( tdeprint_foomatic2scanner_device ) \
{ \
- result = kdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \
+ result = tdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \
if ( result < 0 ) \
result = 0; \
} \
@@ -463,7 +463,7 @@ char *yytext;
result = 0; \
}
-TQIODevice* kdeprint_foomatic2scanner_device = NULL;
+TQIODevice* tdeprint_foomatic2scanner_device = NULL;
#line 468 "./fooscanner.cpp"
/* Macros after this point can all be overridden by user definitions in
@@ -1696,12 +1696,12 @@ int main()
#line 73 "./fooscanner.l"
-void kdeprint_foomatic2scanner_init( TQIODevice *d )
+void tdeprint_foomatic2scanner_init( TQIODevice *d )
{
- kdeprint_foomatic2scanner_device = d;
+ tdeprint_foomatic2scanner_device = d;
}
-void kdeprint_foomatic2scanner_terminate()
+void tdeprint_foomatic2scanner_terminate()
{
- kdeprint_foomatic2scanner_device = NULL;
+ tdeprint_foomatic2scanner_device = NULL;
}
diff --git a/kdeprint/fooscanner.l b/kdeprint/fooscanner.l
index b93ab3bb..ddd5bb97 100644
--- a/kdeprint/fooscanner.l
+++ b/kdeprint/fooscanner.l
@@ -1,7 +1,7 @@
%{
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -23,13 +23,13 @@
#define YYSTYPE QVariant
#include "fooparser.cpp.h"
-#define yylval kdeprint_foomatic2lval
+#define yylval tdeprint_foomatic2lval
#define YY_INPUT( buf, result, max_size ) \
{ \
- if ( kdeprint_foomatic2scanner_device ) \
+ if ( tdeprint_foomatic2scanner_device ) \
{ \
- result = kdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \
+ result = tdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \
if ( result < 0 ) \
result = 0; \
} \
@@ -37,7 +37,7 @@
result = 0; \
}
-QIODevice* kdeprint_foomatic2scanner_device = NULL;
+QIODevice* tdeprint_foomatic2scanner_device = NULL;
%}
%option noyywrap
@@ -72,12 +72,12 @@ D [[:digit:]]
%%
-void kdeprint_foomatic2scanner_init( QIODevice *d )
+void tdeprint_foomatic2scanner_init( QIODevice *d )
{
- kdeprint_foomatic2scanner_device = d;
+ tdeprint_foomatic2scanner_device = d;
}
-void kdeprint_foomatic2scanner_terminate()
+void tdeprint_foomatic2scanner_terminate()
{
- kdeprint_foomatic2scanner_device = NULL;
+ tdeprint_foomatic2scanner_device = NULL;
}
diff --git a/kdeprint/kdeprintcheck.cpp b/kdeprint/kdeprintcheck.cpp
index 2cccde6d..1ace082a 100644
--- a/kdeprint/kdeprintcheck.cpp
+++ b/kdeprint/kdeprintcheck.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -36,7 +36,7 @@
* - run:/<execname> -> check for a running executable
*/
-#include "kdeprintcheck.h"
+#include "tdeprintcheck.h"
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/kdeprint/kdeprintcheck.h b/kdeprint/kdeprintcheck.h
index f538dc2a..ae1264a9 100644
--- a/kdeprint/kdeprintcheck.h
+++ b/kdeprint/kdeprintcheck.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kdeprintd.cpp b/kdeprint/kdeprintd.cpp
index e607629c..d6237b2b 100644
--- a/kdeprint/kdeprintd.cpp
+++ b/kdeprint/kdeprintd.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kdeprintd.h"
+#include "tdeprintd.h"
#include "kprintprocess.h"
#include <tqfile.h>
@@ -42,7 +42,7 @@
extern "C"
{
- KDE_EXPORT KDEDModule *create_kdeprintd(const TQCString& name)
+ KDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name)
{
return new KDEPrintd(name);
}
@@ -123,7 +123,7 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla
KURL url( re.cap( 1 ) );
if ( !url.isLocalFile() )
{
- TQString tmpFilename = locateLocal( "tmp", "kdeprint_" + kapp->randomString( 8 ) );
+ TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) );
command.replace( re, KProcess::quote( tmpFilename ) );
proc->setOutput( re.cap( 1 ) );
proc->setTempOutput( tmpFilename );
@@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files)
i18n("Provide root's Password"),
"provideRootsPassword") == KMessageBox::Continue)
{
- cmd = ("kdesu -c " + KProcess::quote(cmd));
+ cmd = ("tdesu -c " + KProcess::quote(cmd));
break;
}
else
@@ -312,4 +312,4 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons
kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl;
}
-#include "kdeprintd.moc"
+#include "tdeprintd.moc"
diff --git a/kdeprint/kdeprintd.desktop b/kdeprint/kdeprintd.desktop
index b30434c4..45cf8ece 100644
--- a/kdeprint/kdeprintd.desktop
+++ b/kdeprint/kdeprintd.desktop
@@ -3,8 +3,8 @@ Type=Service
ServiceTypes=KDEDModule
X-KDE-ModuleType=Library
-X-KDE-Library=kdeprintd
-X-KDE-FactoryName=kdeprintd
+X-KDE-Library=tdeprintd
+X-KDE-FactoryName=tdeprintd
X-KDE-Kded-autoload=false
X-KDE-Kded-load-on-demand=true
diff --git a/kdeprint/kdeprintd.h b/kdeprint/kdeprintd.h
index 48fcdd02..597ffbc5 100644
--- a/kdeprint/kdeprintd.h
+++ b/kdeprint/kdeprintd.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kdeprintrc.upd b/kdeprint/kdeprintrc.upd
index 6ac48a7c..faf6abab 100644
--- a/kdeprint/kdeprintrc.upd
+++ b/kdeprint/kdeprintrc.upd
@@ -1,5 +1,5 @@
Id=kde-3.1-toolbar
-File=kdeprintrc
+File=tdeprintrc
Group=General
Options=copy
Key=ViewToolBar,ViewMenuBar
diff --git a/kdeprint/kfilelist.cpp b/kdeprint/kfilelist.cpp
index 85117a92..1f67851c 100644
--- a/kdeprint/kfilelist.cpp
+++ b/kdeprint/kfilelist.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kfilelist.h b/kdeprint/kfilelist.h
index 8a7ecd50..03b7977d 100644
--- a/kdeprint/kfilelist.h
+++ b/kdeprint/kfilelist.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmdbentry.cpp b/kdeprint/kmdbentry.cpp
index 9402dd02..34a0b60b 100644
--- a/kdeprint/kmdbentry.cpp
+++ b/kdeprint/kmdbentry.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmdbentry.h b/kdeprint/kmdbentry.h
index 6de72c5b..cccec92b 100644
--- a/kdeprint/kmdbentry.h
+++ b/kdeprint/kmdbentry.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmfactory.cpp b/kdeprint/kmfactory.cpp
index 5c31cf5a..3206d3ce 100644
--- a/kdeprint/kmfactory.cpp
+++ b/kdeprint/kmfactory.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
#include "kprinterimpl.h"
#include "kprinter.h"
#include "kpreloadobject.h"
-#include "kdeprintcheck.h"
+#include "tdeprintcheck.h"
#include "kxmlcommand.h"
#include <tqdir.h>
@@ -113,8 +113,8 @@ KMFactory::KMFactory()
if ( !ok )
settings.writeEntry( "/qt/embedFonts", true );
- KGlobal::iconLoader()->addAppDir("kdeprint");
- KGlobal::locale()->insertCatalogue("kdeprint");
+ KGlobal::iconLoader()->addAppDir("tdeprint");
+ KGlobal::locale()->insertCatalogue("tdeprint");
// create DCOP signal connection
connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false);
@@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst)
if (sys.isEmpty())
// load default configured print plugin
sys = printSystem();
- TQString libname = TQString::tqfromLatin1("kdeprint_%1").arg(sys);
+ TQString libname = TQString::tqfromLatin1("tdeprint_%1").arg(sys);
m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname));
if (!m_factory)
{
@@ -228,7 +228,7 @@ KConfig* KMFactory::printConfig(const TQString& group)
{
if (!m_printconfig)
{
- m_printconfig = new KConfig("kdeprintrc");
+ m_printconfig = new KConfig("tdeprintrc");
Q_CHECK_PTR(m_printconfig);
}
if (!group.isEmpty())
@@ -295,7 +295,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst)
TQValueList<KMFactory::PluginInfo> KMFactory::pluginList()
{
- TQDir d(locate("data", "kdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files);
+ TQDir d(locate("data", "tdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files);
TQValueList<PluginInfo> list;
for (uint i=0; i<d.count(); i++)
{
@@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name)
{
TQString path(name);
if (path[0] != '/')
- path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name));
+ path = locate("data", TQString::tqfromLatin1("tdeprint/plugins/%1.print").arg(name));
KSimpleConfig conf(path);
PluginInfo info;
@@ -339,7 +339,7 @@ void KMFactory::registerObject(KPReloadObject *obj, bool priority)
m_objects.prepend(obj);
else
m_objects.append(obj);
- kdDebug(500) << "kdeprint: registering " << (void*)obj << ", number of objects = " << m_objects.count() << endl;
+ kdDebug(500) << "tdeprint: registering " << (void*)obj << ", number of objects = " << m_objects.count() << endl;
}
}
@@ -347,7 +347,7 @@ void KMFactory::unregisterObject(KPReloadObject *obj)
{
// remove object from list (not deleted as autoDelete is false)
m_objects.removeRef(obj);
- kdDebug(500) << "kdeprint: unregistering " << (void*)obj << ", number of objects = " << m_objects.count() << endl;
+ kdDebug(500) << "tdeprint: unregistering " << (void*)obj << ", number of objects = " << m_objects.count() << endl;
}
TQString KMFactory::autoDetect()
@@ -414,14 +414,14 @@ void KMFactory::saveConfig()
TQPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQString& user, const TQString& host, int port )
{
- DCOPRef kdeprintd( "kded", "kdeprintd" );
+ DCOPRef tdeprintd( "kded", "tdeprintd" );
/**
* We do not use an internal event loop for 2 potential problems:
* - the MessageWindow modality (appearing afterwards, it pops up on top
* of the password dialog)
* - KMTimer should be stopped, but it's unavailable from this object
*/
- DCOPReply reply = kdeprintd.call( "requestPassword", user, host, port, seqNbr );
+ DCOPReply reply = tdeprintd.call( "requestPassword", user, host, port, seqNbr );
if ( reply.isValid() )
{
TQString replyString = reply;
@@ -440,14 +440,14 @@ TQPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQStrin
void KMFactory::initPassword( const TQString& user, const TQString& password, const TQString& host, int port )
{
- DCOPRef kdeprintd( "kded", "kdeprintd" );
+ DCOPRef tdeprintd( "kded", "tdeprintd" );
/**
* We do not use an internal event loop for 2 potential problems:
* - the MessageWindow modality (appearing afterwards, it pops up on top
* of the password dialog)
* - KMTimer should be stopped, but it's unavailable from this object
*/
- kdeprintd.call( "initPassword", user, password, host, port );
+ tdeprintd.call( "initPassword", user, password, host, port );
}
#include "kmfactory.moc"
diff --git a/kdeprint/kmfactory.h b/kdeprint/kmfactory.h
index 326e5ea8..168385f6 100644
--- a/kdeprint/kmfactory.h
+++ b/kdeprint/kmfactory.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kmjob.cpp b/kdeprint/kmjob.cpp
index 5c904538..ce7e9599 100644
--- a/kdeprint/kmjob.cpp
+++ b/kdeprint/kmjob.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -78,7 +78,7 @@ TQString KMJob::pixmap()
return TQString::tqfromLatin1("exec");
// normal case
- QString str("kdeprint_job");
+ QString str("tdeprint_job");
switch (m_state)
{
case KMJob::Printing:
diff --git a/kdeprint/kmjob.h b/kdeprint/kmjob.h
index 379f7cfd..d8fed5e8 100644
--- a/kdeprint/kmjob.h
+++ b/kdeprint/kmjob.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
#include <tqstring.h>
#include <tqvaluevector.h>
-#include <kdeprint/kmobject.h>
+#include <tdeprint/kmobject.h>
#include <kdelibs_export.h>
/**
diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp
index 3449e1bb..918c14ff 100644
--- a/kdeprint/kmjobmanager.cpp
+++ b/kdeprint/kmjobmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmjobmanager.h b/kdeprint/kmjobmanager.h
index 8b95bf7a..89cabaa7 100644
--- a/kdeprint/kmjobmanager.h
+++ b/kdeprint/kmjobmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp
index 4fdc70f7..01ca0dc7 100644
--- a/kdeprint/kmmanager.cpp
+++ b/kdeprint/kmmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname)
if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213)
{
f.close();
- destname = locateLocal("tmp","kdeprint_") + KApplication::randomString(8);
+ destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8);
f.setName(destname);
if (f.open(IO_WriteOnly))
@@ -422,7 +422,7 @@ TQString KMManager::testPage()
conf->setGroup("General");
QString tpage = conf->readPathEntry("TestPage");
if (tpage.isEmpty())
- tpage = locate("data","kdeprint/testprint.ps");
+ tpage = locate("data","tdeprint/testprint.ps");
return tpage;
}
diff --git a/kdeprint/kmmanager.h b/kdeprint/kmmanager.h
index ecdacba0..df78adcd 100644
--- a/kdeprint/kmmanager.h
+++ b/kdeprint/kmmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
#warning internal header, do not use except if you are a KDEPrint developer
#endif
-#include <kdeprint/kmprinter.h>
+#include <tdeprint/kmprinter.h>
#include <tqobject.h>
#include <tqstring.h>
diff --git a/kdeprint/kmobject.h b/kdeprint/kmobject.h
index 57824cd0..5b9358c4 100644
--- a/kdeprint/kmobject.h
+++ b/kdeprint/kmobject.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kmprinter.cpp b/kdeprint/kmprinter.cpp
index 5749a47c..b18116ef 100644
--- a/kdeprint/kmprinter.cpp
+++ b/kdeprint/kmprinter.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -90,7 +90,7 @@ TQString KMPrinter::pixmap()
{
if (!m_pixmap.isEmpty()) return m_pixmap;
- QString str("kdeprint_printer");
+ QString str("tdeprint_printer");
if (!isValid()) str.append("_defect");
else
{
diff --git a/kdeprint/kmprinter.h b/kdeprint/kmprinter.h
index 7f527fb2..c6c2995e 100644
--- a/kdeprint/kmprinter.h
+++ b/kdeprint/kmprinter.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -29,7 +29,7 @@
#include <tqptrlist.h>
#include <kurl.h>
#include <tqmap.h>
-#include <kdeprint/kmobject.h>
+#include <tdeprint/kmobject.h>
class KMDBEntry;
class DrMain;
diff --git a/kdeprint/kmspecialmanager.cpp b/kdeprint/kmspecialmanager.cpp
index ba742fc7..6da7f4ed 100644
--- a/kdeprint/kmspecialmanager.cpp
+++ b/kdeprint/kmspecialmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -20,7 +20,7 @@
#include "kmspecialmanager.h"
#include "kmmanager.h"
#include "kmprinter.h"
-#include "kdeprintcheck.h"
+#include "tdeprintcheck.h"
#include "kxmlcommand.h"
#include "driver.h"
@@ -46,11 +46,11 @@ bool KMSpecialManager::savePrinters()
QString confname;
if (getuid() == 0)
{
- confname = locate("data", "kdeprint/specials.desktop");
+ confname = locate("data", "tdeprint/specials.desktop");
if (confname.startsWith(KGlobal::dirs()->localkdedir()))
{
// seems there's a problem here
- m_mgr->setErrorMsg(i18n("A file share/kdeprint/specials.desktop was found in your "
+ m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your "
"local KDE directory. This file probably comes from a previous KDE "
"release and should be removed in order to manage global pseudo "
"printers."));
@@ -58,7 +58,7 @@ bool KMSpecialManager::savePrinters()
}
}
else
- confname = locateLocal("data","kdeprint/specials.desktop");
+ confname = locateLocal("data","tdeprint/specials.desktop");
KSimpleConfig conf(confname);
@@ -108,7 +108,7 @@ bool KMSpecialManager::loadPrinters()
bool result(true);
TQString localDir = KGlobal::dirs()->localkdedir();
- TQStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/specials.desktop");
+ TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop");
// local files should processed last, so we need to reorder the list
// and put local files at the end
TQStringList orderedFiles;
diff --git a/kdeprint/kmspecialmanager.h b/kdeprint/kmspecialmanager.h
index 47adec6b..b42aea1d 100644
--- a/kdeprint/kmspecialmanager.h
+++ b/kdeprint/kmspecialmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmthreadjob.cpp b/kdeprint/kmthreadjob.cpp
index 0fe277ee..fcee4877 100644
--- a/kdeprint/kmthreadjob.cpp
+++ b/kdeprint/kmthreadjob.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob()
TQString KMThreadJob::jobFile()
{
- QString f = locateLocal("data","kdeprint/printjobs");
+ QString f = locateLocal("data","tdeprint/printjobs");
return f;
}
diff --git a/kdeprint/kmthreadjob.h b/kdeprint/kmthreadjob.h
index b4eedfbf..5bded627 100644
--- a/kdeprint/kmthreadjob.h
+++ b/kdeprint/kmthreadjob.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmuimanager.cpp b/kdeprint/kmuimanager.cpp
index 78f5c209..962653dd 100644
--- a/kdeprint/kmuimanager.cpp
+++ b/kdeprint/kmuimanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmuimanager.h b/kdeprint/kmuimanager.h
index 478dbc0d..248ad4ed 100644
--- a/kdeprint/kmuimanager.h
+++ b/kdeprint/kmuimanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmvirtualmanager.cpp b/kdeprint/kmvirtualmanager.cpp
index 22ad5ec3..78757dec 100644
--- a/kdeprint/kmvirtualmanager.cpp
+++ b/kdeprint/kmvirtualmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kmvirtualmanager.h b/kdeprint/kmvirtualmanager.h
index 5725854e..1b7ab486 100644
--- a/kdeprint/kmvirtualmanager.h
+++ b/kdeprint/kmvirtualmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp
index 6d7a29c8..bc0e03e0 100644
--- a/kdeprint/kpcopiespage.cpp
+++ b/kdeprint/kpcopiespage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -270,7 +270,7 @@ void KPCopiesPage::slotRangeEntered()
void KPCopiesPage::slotCollateClicked()
{
- TQString s("kdeprint_");
+ TQString s("tdeprint_");
s.append((m_collate->isChecked() ? "collate" : "uncollate"));
if (m_order->isChecked()) s.append("_reverse");
m_collatepix->setPixmap(UserIcon(s));
diff --git a/kdeprint/kpcopiespage.h b/kdeprint/kpcopiespage.h
index 9aff7ef8..1e1532ce 100644
--- a/kdeprint/kpcopiespage.h
+++ b/kdeprint/kpcopiespage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -21,7 +21,7 @@
#define KPCOPIESPAGE_H
#include "kprintdialogpage.h"
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
class TQRadioButton;
class TQLineEdit;
diff --git a/kdeprint/kpdriverpage.cpp b/kdeprint/kpdriverpage.cpp
index a7dd2b61..18cfeb20 100644
--- a/kdeprint/kpdriverpage.cpp
+++ b/kdeprint/kpdriverpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpdriverpage.h b/kdeprint/kpdriverpage.h
index 90f3ebb2..5c3936e4 100644
--- a/kdeprint/kpdriverpage.h
+++ b/kdeprint/kpdriverpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpfileselectpage.cpp b/kdeprint/kpfileselectpage.cpp
index 54ccfdd6..f3131717 100644
--- a/kdeprint/kpfileselectpage.cpp
+++ b/kdeprint/kpfileselectpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpfileselectpage.h b/kdeprint/kpfileselectpage.h
index 518f5a10..11ed378f 100644
--- a/kdeprint/kpfileselectpage.h
+++ b/kdeprint/kpfileselectpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpfilterpage.cpp b/kdeprint/kpfilterpage.cpp
index fcea863a..b321b314 100644
--- a/kdeprint/kpfilterpage.cpp
+++ b/kdeprint/kpfilterpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpfilterpage.h b/kdeprint/kpfilterpage.h
index 83368e1d..72065b3f 100644
--- a/kdeprint/kpfilterpage.h
+++ b/kdeprint/kpfilterpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp
index ac7dfdae..98ab5d4a 100644
--- a/kdeprint/kpgeneralpage.cpp
+++ b/kdeprint/kpgeneralpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -696,11 +696,11 @@ void KPGeneralPage::slotOrientationChanged(int ID)
TQString iconstr;
switch (ID)
{
- case ORIENT_PORTRAIT_ID: iconstr = "kdeprint_portrait"; break;
- case ORIENT_LANDSCAPE_ID: iconstr = "kdeprint_landscape"; break;
- case ORIENT_REVPORTRAIT_ID: iconstr = "kdeprint_revportrait"; break;
- case ORIENT_REVLANDSCAPE_ID: iconstr = "kdeprint_revlandscape"; break;
- default: iconstr = "kdeprint_portrait"; break;
+ case ORIENT_PORTRAIT_ID: iconstr = "tdeprint_portrait"; break;
+ case ORIENT_LANDSCAPE_ID: iconstr = "tdeprint_landscape"; break;
+ case ORIENT_REVPORTRAIT_ID: iconstr = "tdeprint_revportrait"; break;
+ case ORIENT_REVLANDSCAPE_ID: iconstr = "tdeprint_revlandscape"; break;
+ default: iconstr = "tdeprint_portrait"; break;
}
m_orientpix->setPixmap(UserIcon(iconstr));
}
@@ -710,10 +710,10 @@ void KPGeneralPage::slotNupChanged(int ID)
TQString iconstr;
switch (ID)
{
- case NUP_1_ID: iconstr = "kdeprint_nup1"; break;
- case NUP_2_ID: iconstr = "kdeprint_nup2"; break;
- case NUP_4_ID: iconstr = "kdeprint_nup4"; break;
- default: iconstr = "kdeprint_nup1"; break;
+ case NUP_1_ID: iconstr = "tdeprint_nup1"; break;
+ case NUP_2_ID: iconstr = "tdeprint_nup2"; break;
+ case NUP_4_ID: iconstr = "tdeprint_nup4"; break;
+ default: iconstr = "tdeprint_nup1"; break;
}
m_nuppix->setPixmap(UserIcon(iconstr));
}
@@ -725,10 +725,10 @@ void KPGeneralPage::slotDuplexChanged(int ID)
TQString iconstr;
switch (ID)
{
- case DUPLEX_NONE_ID: iconstr = "kdeprint_duplex_none"; break;
- case DUPLEX_LONG_ID: iconstr = "kdeprint_duplex_long"; break;
- case DUPLEX_SHORT_ID: iconstr = "kdeprint_duplex_short"; break;
- default: iconstr = "kdeprint_duplex_none"; break;
+ case DUPLEX_NONE_ID: iconstr = "tdeprint_duplex_none"; break;
+ case DUPLEX_LONG_ID: iconstr = "tdeprint_duplex_long"; break;
+ case DUPLEX_SHORT_ID: iconstr = "tdeprint_duplex_short"; break;
+ default: iconstr = "tdeprint_duplex_none"; break;
}
m_duplexpix->setPixmap(UserIcon(iconstr));
}
diff --git a/kdeprint/kpgeneralpage.h b/kdeprint/kpgeneralpage.h
index 643b19b5..2a211ab0 100644
--- a/kdeprint/kpgeneralpage.h
+++ b/kdeprint/kpgeneralpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kpipeprocess.cpp b/kdeprint/kpipeprocess.cpp
index a3ef560c..daf3c290 100644
--- a/kdeprint/kpipeprocess.cpp
+++ b/kdeprint/kpipeprocess.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpipeprocess.h b/kdeprint/kpipeprocess.h
index 8cf3dbf3..0ead3da7 100644
--- a/kdeprint/kpipeprocess.h
+++ b/kdeprint/kpipeprocess.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpmarginpage.cpp b/kdeprint/kpmarginpage.cpp
index 309a3dfd..554679ee 100644
--- a/kdeprint/kpmarginpage.cpp
+++ b/kdeprint/kpmarginpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kpmarginpage.h b/kdeprint/kpmarginpage.h
index fd6da692..4d52686f 100644
--- a/kdeprint/kpmarginpage.h
+++ b/kdeprint/kpmarginpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpposterpage.cpp b/kdeprint/kpposterpage.cpp
index 1fa7a23b..d82e5b57 100644
--- a/kdeprint/kpposterpage.cpp
+++ b/kdeprint/kpposterpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpposterpage.h b/kdeprint/kpposterpage.h
index ec10a920..ce4858aa 100644
--- a/kdeprint/kpposterpage.h
+++ b/kdeprint/kpposterpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp
index 4bf10738..e2c28ebb 100644
--- a/kdeprint/kpqtpage.cpp
+++ b/kdeprint/kpqtpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
@@ -225,12 +225,12 @@ void KPQtPage::init()
void KPQtPage::slotOrientationChanged(int ID)
{
- m_orientpix->setPixmap(UserIcon((ID == ORIENT_PORTRAIT_ID ? "kdeprint_portrait" : "kdeprint_landscape")));
+ m_orientpix->setPixmap(UserIcon((ID == ORIENT_PORTRAIT_ID ? "tdeprint_portrait" : "tdeprint_landscape")));
}
void KPQtPage::slotColorModeChanged(int ID)
{
- m_colorpix->setPixmap(UserIcon((ID == COLORMODE_COLOR_ID ? "kdeprint_color" : "kdeprint_grayscale")));
+ m_colorpix->setPixmap(UserIcon((ID == COLORMODE_COLOR_ID ? "tdeprint_color" : "tdeprint_grayscale")));
}
void KPQtPage::slotNupChanged(int ID)
@@ -238,10 +238,10 @@ void KPQtPage::slotNupChanged(int ID)
QString pixstr;
switch (ID)
{
- case NUP_1: pixstr = "kdeprint_nup1"; break;
- case NUP_2: pixstr = "kdeprint_nup2"; break;
- case NUP_4: pixstr = "kdeprint_nup4"; break;
- case NUP_OTHER: pixstr = "kdeprint_nupother"; break;
+ case NUP_1: pixstr = "tdeprint_nup1"; break;
+ case NUP_2: pixstr = "tdeprint_nup2"; break;
+ case NUP_4: pixstr = "tdeprint_nup4"; break;
+ case NUP_OTHER: pixstr = "tdeprint_nupother"; break;
}
m_nuppix->setPixmap(UserIcon(pixstr));
}
diff --git a/kdeprint/kpqtpage.h b/kdeprint/kpqtpage.h
index 723f35e0..0ab4361f 100644
--- a/kdeprint/kpqtpage.h
+++ b/kdeprint/kpqtpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpreloadobject.cpp b/kdeprint/kpreloadobject.cpp
index 10acda92..af9e299c 100644
--- a/kdeprint/kpreloadobject.cpp
+++ b/kdeprint/kpreloadobject.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kpreloadobject.h b/kdeprint/kpreloadobject.h
index 3c8e87b3..09bbe97d 100644
--- a/kdeprint/kpreloadobject.h
+++ b/kdeprint/kpreloadobject.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp
index 4e62e791..e275ed55 100644
--- a/kdeprint/kprintaction.cpp
+++ b/kdeprint/kprintaction.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -20,7 +20,7 @@
#include "kprintaction.h"
#include <kprinter.h>
-#include <kdeprint/kmmanager.h>
+#include <tdeprint/kmmanager.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <klocale.h>
diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h
index eb23d6e3..f6ba35d3 100644
--- a/kdeprint/kprintaction.h
+++ b/kdeprint/kprintaction.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp
index ebdc6ae4..5cb56819 100644
--- a/kdeprint/kprintdialog.cpp
+++ b/kdeprint/kprintdialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -288,9 +288,9 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
m_printerlabel->setBuddy(d->m_printers);
d->m_properties = new KPushButton(KGuiItem(i18n("P&roperties"), "edit"), m_pbox);
TQWhatsThis::add( d->m_properties, whatsThisPrintJobProperties);
- d->m_options = new KPushButton(KGuiItem(i18n("System Op&tions"), "kdeprint_configmgr"), this);
+ d->m_options = new KPushButton(KGuiItem(i18n("System Op&tions"), "tdeprint_configmgr"), this);
TQWhatsThis::add(d->m_options,whatsThisSystemOptions);
- d->m_default = new KPushButton(KGuiItem(i18n("Set as &Default"), "kdeprint_defaultsoft"), m_pbox);
+ d->m_default = new KPushButton(KGuiItem(i18n("Set as &Default"), "tdeprint_defaultsoft"), m_pbox);
TQWhatsThis::add(d->m_default,whatsThisSetDefaultPrinter);
d->m_filter = new TQPushButton(m_pbox);
d->m_filter->setPixmap(SmallIcon("filter"));
@@ -914,7 +914,7 @@ void KPrintDialog::slotToggleFilter(bool on)
void KPrintDialog::slotHelp()
{
- kapp->invokeHelp(TQString::null, "kdeprint");
+ kapp->invokeHelp(TQString::null, "tdeprint");
}
void KPrintDialog::slotOutputFileSelected(const TQString& txt)
diff --git a/kdeprint/kprintdialog.h b/kdeprint/kprintdialog.h
index 0e4adfd6..77484ca5 100644
--- a/kdeprint/kprintdialog.h
+++ b/kdeprint/kprintdialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -26,7 +26,7 @@
#include <kdialog.h>
#include <tqptrlist.h>
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
class KPrinter;
class KPrintDialogPage;
diff --git a/kdeprint/kprintdialogpage.cpp b/kdeprint/kprintdialogpage.cpp
index 0bd86062..58861019 100644
--- a/kdeprint/kprintdialogpage.cpp
+++ b/kdeprint/kprintdialogpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kprintdialogpage.h b/kdeprint/kprintdialogpage.h
index 1802eb6e..d9b44b6e 100644
--- a/kdeprint/kprintdialogpage.h
+++ b/kdeprint/kprintdialogpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@ class DrMain;
* "kde-appname-optionname" for internal reasons.
*
* \code
- * #include <kdeprint/kprintdialogpage.h>
+ * #include <tdeprint/kprintdialogpage.h>
*
* class MyDialogPage : public KPrintDialogPage
* {
diff --git a/kdeprint/kprinter.cpp b/kdeprint/kprinter.cpp
index edd92445..67d27699 100644
--- a/kdeprint/kprinter.cpp
+++ b/kdeprint/kprinter.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -409,7 +409,7 @@ bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer)
args << "-d";
args << printerName();
args << "--noshow";
- kapp->kdeinitExec("kjobviewer", args);
+ kapp->tdeinitExec("kjobviewer", args);
}
}
}
diff --git a/kdeprint/kprinter.h b/kdeprint/kprinter.h
index 7a6f2156..4910c23e 100644
--- a/kdeprint/kprinter.h
+++ b/kdeprint/kprinter.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
#include <kdemacros.h>
#include <kdelibs_export.h>
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
class KPrinterImpl;
class KPrintDialogPage;
@@ -78,7 +78,7 @@ class DrPageSize;
* of the print dialog to integrate application specific print options. This is done by subclassing
* KPrintDialogPage and adding the page using addDialogPage().
*
- * When compiling an application that uses KPrinter, you must link to -lkdeprint, which when
+ * When compiling an application that uses KPrinter, you must link to -ltdeprint, which when
* using the standard KDE build framework can be done by adding $(LIB_KDEPRINT) to _LDADD.
*
* @short The central interface class to access the KDE print system.
@@ -106,7 +106,7 @@ public:
* page selection will be enabled in the print dialog, otherwise it will be
* disabled. However some applications (word processor) can do page selection
* themselves, then it will be enabled in the print dialog, whatever the
- * print system used. But such an application has to tell kdeprint about its
+ * print system used. But such an application has to tell tdeprint about its
* feature:
* @li @p ApplicationSide: the application will do page selection
* @li @p SystemSide: page selection will be left to the print system, if available (default)
diff --git a/kdeprint/kprinterimpl.cpp b/kdeprint/kprinterimpl.cpp
index 7d0d9477..166ae720 100644
--- a/kdeprint/kprinterimpl.cpp
+++ b/kdeprint/kprinterimpl.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
@@ -194,7 +194,7 @@ void KPrinterImpl::broadcastOption(const TQString& key, const TQString& value)
int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool removeflag)
{
- kdDebug(500) << "kdeprint: print command: " << cmd << endl;
+ kdDebug(500) << "tdeprint: print command: " << cmd << endl;
int result = 0;
DCOPClient *dclient = kapp->dcopClient();
@@ -209,7 +209,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool
arg << cmd;
arg << files;
arg << removeflag;
- if (dclient->call( "kded", "kdeprintd", "print(TQString,TQStringList,bool)", data, replyType, replyData ))
+ if (dclient->call( "kded", "tdeprintd", "print(TQString,TQStringList,bool)", data, replyType, replyData ))
{
if (replyType == "int")
{
@@ -222,7 +222,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool
void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
{
- kdDebug(500) << "kdeprint: status message: " << msg << endl;
+ kdDebug(500) << "tdeprint: status message: " << msg << endl;
KConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("General");
if (!conf->readBoolEntry("ShowStatusMsg", true))
@@ -243,7 +243,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
arg << message;
arg << (int)getpid();
arg << kapp->caption();
- dclient->send( "kded", "kdeprintd", "statusMessage(TQString,int,TQString)", data );
+ dclient->send( "kded", "tdeprintd", "statusMessage(TQString,int,TQString)", data );
}
bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const TQStringList& files, bool flag)
@@ -278,7 +278,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T
{
TQString msg = i18n("Unable to start child print process. ");
if (pid == 0)
- msg += i18n("The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this server is running.");
+ msg += i18n("The KDE print server (<b>tdeprintd</b>) could not be contacted. Check that this server is running.");
else
msg += i18n("1 is the command that <files> is given to", "Check the command syntax:\n%1 <files>").arg(cmd);
printer->setErrorMessage(msg);
@@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile()
{
TQString f;
// be sure the file doesn't exist
- do f = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); while (TQFile::exists(f));
+ do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f));
return f;
}
@@ -372,7 +372,7 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
return -1;
}
}
- kdDebug(500) << "kdeprint: filter command: " << filtercmd << endl;
+ kdDebug(500) << "tdeprint: filter command: " << filtercmd << endl;
TQString rin("%in"), rout("%out"), rpsl("%psl"), rpsu("%psu");
TQString ps = pageSizeToPageName( printer->option( "kde-printsize" ).isEmpty() ? printer->pageSize() : ( KPrinter::PageSize )printer->option( "kde-printsize" ).toInt() );
@@ -508,7 +508,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
TQString::null,
i18n("Convert"),
i18n("Keep"),
- TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes)
+ TQString::tqfromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes)
{
// find the filter chain
TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);
diff --git a/kdeprint/kprinterimpl.h b/kdeprint/kprinterimpl.h
index b06d7770..618d9a42 100644
--- a/kdeprint/kprinterimpl.h
+++ b/kdeprint/kprinterimpl.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kprinterpropertydialog.cpp b/kdeprint/kprinterpropertydialog.cpp
index d2036bcf..1128a7d3 100644
--- a/kdeprint/kprinterpropertydialog.cpp
+++ b/kdeprint/kprinterpropertydialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kprinterpropertydialog.h b/kdeprint/kprinterpropertydialog.h
index 9264ea0d..98a37d8b 100644
--- a/kdeprint/kprinterpropertydialog.h
+++ b/kdeprint/kprinterpropertydialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kprintpreview.cpp b/kdeprint/kprintpreview.cpp
index 6d385c17..235472d1 100644
--- a/kdeprint/kprintpreview.cpp
+++ b/kdeprint/kprintpreview.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
@@ -106,7 +106,7 @@ public:
static KLibFactory* componentFactory()
{
- kdDebug(500) << "kdeprint: querying trader for 'application/postscript' service" << endl;
+ kdDebug(500) << "tdeprint: querying trader for 'application/postscript' service" << endl;
KLibFactory *factory(0);
factory = KLibLoader::self()->factory("libkghostviewpart");
if( factory )
@@ -147,7 +147,7 @@ static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOn
KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
: KDialogBase(parent, "PreviewDlg", true, i18n("Print Preview"), 0)
{
- kdDebug(500) << "kdeprint: creating preview dialog" << endl;
+ kdDebug(500) << "tdeprint: creating preview dialog" << endl;
d = new KPrintPreviewPrivate(this);
d->previewonly_ = previewOnly;
diff --git a/kdeprint/kprintpreview.h b/kdeprint/kprintpreview.h
index 9193bad3..5fd581fe 100644
--- a/kdeprint/kprintpreview.h
+++ b/kdeprint/kprintpreview.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/kdeprint/kprintprocess.cpp b/kdeprint/kprintprocess.cpp
index f18addde..fb1df284 100644
--- a/kdeprint/kprintprocess.cpp
+++ b/kdeprint/kprintprocess.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kprintprocess.h b/kdeprint/kprintprocess.h
index 13943d05..976b35af 100644
--- a/kdeprint/kprintprocess.h
+++ b/kdeprint/kprintprocess.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp
index 24c0e88d..81dc5d3d 100644
--- a/kdeprint/kxmlcommand.cpp
+++ b/kdeprint/kxmlcommand.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -20,7 +20,7 @@
#include "kxmlcommand.h"
#include "driver.h"
#include "kmfactory.h"
-#include "kdeprintcheck.h"
+#include "tdeprintcheck.h"
#include "driverview.h"
#include <tqfile.h>
@@ -199,7 +199,7 @@ void KXmlCommand::setComment( const TQString& s )
bool KXmlCommand::isValid()
{
- return (!locate("data", "kdeprint/filters/"+name()+".desktop").isEmpty());
+ return (!locate("data", "tdeprint/filters/"+name()+".desktop").isEmpty());
}
void KXmlCommand::check(bool use_xml)
@@ -218,7 +218,7 @@ void KXmlCommand::check(bool use_xml)
void KXmlCommand::loadDesktop()
{
- KSimpleConfig conf(locate("data", "kdeprint/filters/"+name()+".desktop"));
+ KSimpleConfig conf(locate("data", "tdeprint/filters/"+name()+".desktop"));
conf.setGroup("KDE Print Filter Entry");
d->m_description = conf.readEntry("Comment");
d->m_outputMime = conf.readEntry("MimeTypeOut");
@@ -229,7 +229,7 @@ void KXmlCommand::loadDesktop()
void KXmlCommand::saveDesktop()
{
- KSimpleConfig conf(locateLocal("data", "kdeprint/filters/"+name()+".desktop"));
+ KSimpleConfig conf(locateLocal("data", "tdeprint/filters/"+name()+".desktop"));
conf.setGroup("KDE Print Filter Entry");
conf.writeEntry("Comment", d->m_description);
conf.writeEntry("MimeTypeIn", d->m_inputMime);
@@ -240,7 +240,7 @@ void KXmlCommand::saveDesktop()
void KXmlCommand::loadXml()
{
- TQFile f(locate("data", "kdeprint/filters/"+name()+".xml"));
+ TQFile f(locate("data", "tdeprint/filters/"+name()+".xml"));
TQDomDocument doc;
if (f.open(IO_ReadOnly) && doc.setContent(&f) && doc.documentElement().tagName() == "kprintfilter")
{
@@ -425,7 +425,7 @@ void KXmlCommand::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
void KXmlCommand::saveXml()
{
- TQFile f(locateLocal("data", "kdeprint/filters/"+name()+".xml"));
+ TQFile f(locateLocal("data", "tdeprint/filters/"+name()+".xml"));
if (!f.open(IO_WriteOnly))
return;
@@ -576,7 +576,7 @@ KXmlCommand* KXmlCommandManager::loadCommand(const TQString& xmlId, bool check)
{
if (check)
{
- TQString desktopFile = locate("data", "kdeprint/filters/"+xmlId+".desktop");
+ TQString desktopFile = locate("data", "tdeprint/filters/"+xmlId+".desktop");
if (desktopFile.isEmpty())
return 0;
}
@@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList()
{
if (d->m_cmdlist.isEmpty())
{
- TQStringList dirs = KGlobal::dirs()->findDirs("data", "kdeprint/filters/");
+ TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/");
for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it)
{
diff --git a/kdeprint/kxmlcommand.h b/kdeprint/kxmlcommand.h
index e24266f4..a0ba90c5 100644
--- a/kdeprint/kxmlcommand.h
+++ b/kdeprint/kxmlcommand.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/Makefile.am b/kdeprint/lpd/Makefile.am
index 7230fba1..5c6559a2 100644
--- a/kdeprint/lpd/Makefile.am
+++ b/kdeprint/lpd/Makefile.am
@@ -1,18 +1,18 @@
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes)
-kde_module_LTLIBRARIES = kdeprint_lpd.la
+kde_module_LTLIBRARIES = tdeprint_lpd.la
-kdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \
+tdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \
lpdtools.cpp gschecker.cpp
-kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la
-kdeprint_lpd_la_METASOURCES = AUTO
+tdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+tdeprint_lpd_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la
+tdeprint_lpd_la_METASOURCES = AUTO
noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h
bin_PROGRAMS = make_driver_db_lpd
make_driver_db_lpd_SOURCES = make_driver_db_lpd.c
-make_driver_db_lpd_LDADD = $(top_builddir)/kdecore/libtdefakes.la
+make_driver_db_lpd_LDADD = $(top_builddir)/tdecore/libtdefakes.la
entry_DATA = lpd.print
-entrydir = $(kde_datadir)/kdeprint/plugins
+entrydir = $(kde_datadir)/tdeprint/plugins
diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp
index 23f6be0a..9fe6e290 100644
--- a/kdeprint/lpd/gschecker.cpp
+++ b/kdeprint/lpd/gschecker.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/gschecker.h b/kdeprint/lpd/gschecker.h
index 1814ca1d..c3c23a5b 100644
--- a/kdeprint/lpd/gschecker.h
+++ b/kdeprint/lpd/gschecker.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/klpdprinterimpl.cpp b/kdeprint/lpd/klpdprinterimpl.cpp
index 8b365cbd..59f04e74 100644
--- a/kdeprint/lpd/klpdprinterimpl.cpp
+++ b/kdeprint/lpd/klpdprinterimpl.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/klpdprinterimpl.h b/kdeprint/lpd/klpdprinterimpl.h
index 654c2606..a757d0c8 100644
--- a/kdeprint/lpd/klpdprinterimpl.h
+++ b/kdeprint/lpd/klpdprinterimpl.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/kmlpdfactory.cpp b/kdeprint/lpd/kmlpdfactory.cpp
index a1882c3c..05ee61bd 100644
--- a/kdeprint/lpd/kmlpdfactory.cpp
+++ b/kdeprint/lpd/kmlpdfactory.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
extern "C"
{
- void* init_kdeprint_lpd()
+ void* init_tdeprint_lpd()
{
return new KLpdFactory;
}
diff --git a/kdeprint/lpd/kmlpdfactory.h b/kdeprint/lpd/kmlpdfactory.h
index 924c48b8..ffc05af7 100644
--- a/kdeprint/lpd/kmlpdfactory.h
+++ b/kdeprint/lpd/kmlpdfactory.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp
index 54f6c312..a5612ad5 100644
--- a/kdeprint/lpd/kmlpdmanager.cpp
+++ b/kdeprint/lpd/kmlpdmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/kmlpdmanager.h b/kdeprint/lpd/kmlpdmanager.h
index 0af2d1e1..3c229101 100644
--- a/kdeprint/lpd/kmlpdmanager.h
+++ b/kdeprint/lpd/kmlpdmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/kmlpduimanager.cpp b/kdeprint/lpd/kmlpduimanager.cpp
index be243c68..fad3fcd5 100644
--- a/kdeprint/lpd/kmlpduimanager.cpp
+++ b/kdeprint/lpd/kmlpduimanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/kmlpduimanager.h b/kdeprint/lpd/kmlpduimanager.h
index 0483df18..7aca6ed1 100644
--- a/kdeprint/lpd/kmlpduimanager.h
+++ b/kdeprint/lpd/kmlpduimanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp
index ba96f31a..610e8ead 100644
--- a/kdeprint/lpd/lpdtools.cpp
+++ b/kdeprint/lpd/lpdtools.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/lpdtools.h b/kdeprint/lpd/lpdtools.h
index 3592437e..692dd0fa 100644
--- a/kdeprint/lpd/lpdtools.h
+++ b/kdeprint/lpd/lpdtools.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpd/make_driver_db_lpd.c b/kdeprint/lpd/make_driver_db_lpd.c
index e907dbf2..02aced96 100644
--- a/kdeprint/lpd/make_driver_db_lpd.c
+++ b/kdeprint/lpd/make_driver_db_lpd.c
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpdunix/CMakeLists.txt b/kdeprint/lpdunix/CMakeLists.txt
index 5816af6a..5b30cf46 100644
--- a/kdeprint/lpdunix/CMakeLists.txt
+++ b/kdeprint/lpdunix/CMakeLists.txt
@@ -18,12 +18,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
- ${CMAKE_SOURCE_DIR}/kdeprint
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
+ ${CMAKE_SOURCE_DIR}/tdeprint
)
link_directories(
@@ -33,12 +33,12 @@ link_directories(
##### other data ################################
-install( FILES lpdunix.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins )
+install( FILES lpdunix.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins )
-#### kdeprint_lpdunix ###########################
+#### tdeprint_lpdunix ###########################
-set( target kdeprint_lpdunix )
+set( target tdeprint_lpdunix )
set( ${target}_SRCS
kmlpdunixfactory.cpp kmlpdunixmanager.cpp
@@ -47,6 +47,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target}
SOURCES ${${target}_SRCS}
- LINK kdeprint-shared
+ LINK tdeprint-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kdeprint/lpdunix/Makefile.am b/kdeprint/lpdunix/Makefile.am
index 89b08d83..019ead75 100644
--- a/kdeprint/lpdunix/Makefile.am
+++ b/kdeprint/lpdunix/Makefile.am
@@ -1,15 +1,15 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes)
-kde_module_LTLIBRARIES = kdeprint_lpdunix.la
+kde_module_LTLIBRARIES = tdeprint_lpdunix.la
-kdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
-kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT)
-kdeprint_lpdunix_la_METASOURCES = AUTO
+tdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
+tdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+tdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT)
+tdeprint_lpdunix_la_METASOURCES = AUTO
noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
entry_DATA = lpdunix.print
-entrydir = $(kde_datadir)/kdeprint/plugins
+entrydir = $(kde_datadir)/tdeprint/plugins
diff --git a/kdeprint/lpdunix/klpdunixprinterimpl.cpp b/kdeprint/lpdunix/klpdunixprinterimpl.cpp
index 8a680ae6..9ba97efa 100644
--- a/kdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/kdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpdunix/klpdunixprinterimpl.h b/kdeprint/lpdunix/klpdunixprinterimpl.h
index cc16f10f..bbbda410 100644
--- a/kdeprint/lpdunix/klpdunixprinterimpl.h
+++ b/kdeprint/lpdunix/klpdunixprinterimpl.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpdunix/kmlpdunixfactory.cpp b/kdeprint/lpdunix/kmlpdunixfactory.cpp
index 8ebb19f2..70925a65 100644
--- a/kdeprint/lpdunix/kmlpdunixfactory.cpp
+++ b/kdeprint/lpdunix/kmlpdunixfactory.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -24,6 +24,6 @@
#include <kgenericfactory.h>
typedef K_TYPELIST_3( KMLpdUnixManager, KLpdUnixPrinterImpl, KMLpdUnixUiManager ) Products;
-K_EXPORT_COMPONENT_FACTORY( kdeprint_lpdunix, KGenericFactory< Products > )
+K_EXPORT_COMPONENT_FACTORY( tdeprint_lpdunix, KGenericFactory< Products > )
diff --git a/kdeprint/lpdunix/kmlpdunixmanager.cpp b/kdeprint/lpdunix/kmlpdunixmanager.cpp
index 8e757a70..afcd83b2 100644
--- a/kdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/kdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpdunix/kmlpdunixmanager.h b/kdeprint/lpdunix/kmlpdunixmanager.h
index 7abc9175..8716f835 100644
--- a/kdeprint/lpdunix/kmlpdunixmanager.h
+++ b/kdeprint/lpdunix/kmlpdunixmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpdunix/kmlpdunixuimanager.cpp b/kdeprint/lpdunix/kmlpdunixuimanager.cpp
index 5dc281c8..686dfecb 100644
--- a/kdeprint/lpdunix/kmlpdunixuimanager.cpp
+++ b/kdeprint/lpdunix/kmlpdunixuimanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpdunix/kmlpdunixuimanager.h b/kdeprint/lpdunix/kmlpdunixuimanager.h
index 23616e51..6e9e0d2e 100644
--- a/kdeprint/lpdunix/kmlpdunixuimanager.h
+++ b/kdeprint/lpdunix/kmlpdunixuimanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/CMakeLists.txt b/kdeprint/lpr/CMakeLists.txt
index 56de888b..c893411b 100644
--- a/kdeprint/lpr/CMakeLists.txt
+++ b/kdeprint/lpr/CMakeLists.txt
@@ -18,13 +18,13 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
- ${CMAKE_SOURCE_DIR}/kdeprint
- ${CMAKE_SOURCE_DIR}/kdeprint/management
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
+ ${CMAKE_SOURCE_DIR}/tdeprint
+ ${CMAKE_SOURCE_DIR}/tdeprint/management
)
link_directories(
@@ -36,18 +36,18 @@ link_directories(
install( FILES
printcapentry.h lprhandler.h lprsettings.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint/lpr )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint/lpr )
##### other data ################################
-install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins )
-install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/kdeprint )
+install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins )
+install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
-#### kdeprint_lpr ###############################
+#### tdeprint_lpr ###############################
-set( target kdeprint_lpr )
+set( target tdeprint_lpr )
set( ${target}_SRCS
printcapreader.cpp lprhandler.cpp matichandler.cpp
@@ -60,7 +60,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeprint_management-shared
+ LINK tdeprint_management-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -75,6 +75,6 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK driverparse-static kdefakes-shared ${DL_LIBRARIES}
+ LINK driverparse-static tdefakes-shared ${DL_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdeprint/lpr/Makefile.am b/kdeprint/lpr/Makefile.am
index cb40661f..a9039888 100644
--- a/kdeprint/lpr/Makefile.am
+++ b/kdeprint/lpr/Makefile.am
@@ -1,10 +1,10 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes)
-kde_module_LTLIBRARIES = kdeprint_lpr.la
+kde_module_LTLIBRARIES = tdeprint_lpr.la
-kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
+tdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
matichandler.cpp klprfactory.cpp kmlprmanager.cpp \
kmlpruimanager.cpp lpchelper.cpp lpqhelper.cpp \
kmlprjobmanager.cpp matichelper.cpp \
@@ -12,10 +12,10 @@ kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
lprsettings.cpp kmconfiglpr.cpp apshandler.cpp \
lprngtoolhandler.cpp \
editentrydialog.cpp
-kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la \
+tdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+tdeprint_lpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la \
$(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE)
-kdeprint_lpr_la_METASOURCES = AUTO
+tdeprint_lpr_la_METASOURCES = AUTO
noinst_HEADERS = printcapreader.h \
matichandler.h kmlprmanager.h \
@@ -25,16 +25,16 @@ noinst_HEADERS = printcapreader.h \
lprngtoolhandler.h \
editentrydialog.h
-kdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h
-kdeprintlprdir = $(includedir)/kdeprint/lpr
+tdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h
+tdeprintlprdir = $(includedir)/tdeprint/lpr
bin_PROGRAMS = make_driver_db_lpr
make_driver_db_lpr_SOURCES = make_driver_db_lpr.c
make_driver_db_lpr_LDFLAGS = $(all_libraries)
-make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libtdefakes.la ../libdriverparse.a $(LIBDL)
+make_driver_db_lpr_LDADD = $(top_builddir)/tdecore/libtdefakes.la ../libdriverparse.a $(LIBDL)
entry_DATA = lpr.print
-entrydir = $(kde_datadir)/kdeprint/plugins
+entrydir = $(kde_datadir)/tdeprint/plugins
miscdata_DATA = apsdriver1 apsdriver2 lprngtooldriver1
-miscdatadir = $(kde_datadir)/kdeprint
+miscdatadir = $(kde_datadir)/tdeprint
diff --git a/kdeprint/lpr/apshandler.cpp b/kdeprint/lpr/apshandler.cpp
index 641ff5e0..d4107d7c 100644
--- a/kdeprint/lpr/apshandler.cpp
+++ b/kdeprint/lpr/apshandler.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -196,7 +196,7 @@ DrMain* ApsHandler::loadDbDriver(const TQString& s)
DrMain* ApsHandler::loadApsDriver(bool config)
{
- DrMain *driver = loadToolDriver(locate("data", (config ? "kdeprint/apsdriver1" : "kdeprint/apsdriver2")));
+ DrMain *driver = loadToolDriver(locate("data", (config ? "tdeprint/apsdriver1" : "tdeprint/apsdriver2")));
if (driver)
driver->set("text", "APS Common Driver");
return driver;
diff --git a/kdeprint/lpr/apshandler.h b/kdeprint/lpr/apshandler.h
index 02ee79c9..db213d19 100644
--- a/kdeprint/lpr/apshandler.h
+++ b/kdeprint/lpr/apshandler.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/editentrydialog.cpp b/kdeprint/lpr/editentrydialog.cpp
index 9029a673..6c4ecc30 100644
--- a/kdeprint/lpr/editentrydialog.cpp
+++ b/kdeprint/lpr/editentrydialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/editentrydialog.h b/kdeprint/lpr/editentrydialog.h
index c5115262..f4359dd8 100644
--- a/kdeprint/lpr/editentrydialog.h
+++ b/kdeprint/lpr/editentrydialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/klprfactory.cpp b/kdeprint/lpr/klprfactory.cpp
index 86666981..4764dfc6 100644
--- a/kdeprint/lpr/klprfactory.cpp
+++ b/kdeprint/lpr/klprfactory.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -25,5 +25,5 @@
#include <kgenericfactory.h>
typedef K_TYPELIST_4( KMLprManager, KMLprUiManager, KMLprJobManager, KLprPrinterImpl ) Products;
-K_EXPORT_COMPONENT_FACTORY( kdeprint_lpr, KGenericFactory< Products > )
+K_EXPORT_COMPONENT_FACTORY( tdeprint_lpr, KGenericFactory< Products > )
diff --git a/kdeprint/lpr/klprprinterimpl.cpp b/kdeprint/lpr/klprprinterimpl.cpp
index 9f0956ff..70356f23 100644
--- a/kdeprint/lpr/klprprinterimpl.cpp
+++ b/kdeprint/lpr/klprprinterimpl.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/klprprinterimpl.h b/kdeprint/lpr/klprprinterimpl.h
index ca346ab8..508173f1 100644
--- a/kdeprint/lpr/klprprinterimpl.h
+++ b/kdeprint/lpr/klprprinterimpl.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/kmconfiglpr.cpp b/kdeprint/lpr/kmconfiglpr.cpp
index f9f51b46..f43a8da2 100644
--- a/kdeprint/lpr/kmconfiglpr.cpp
+++ b/kdeprint/lpr/kmconfiglpr.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/kmconfiglpr.h b/kdeprint/lpr/kmconfiglpr.h
index 1f88d9fb..7f3d5085 100644
--- a/kdeprint/lpr/kmconfiglpr.h
+++ b/kdeprint/lpr/kmconfiglpr.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/kmlprjobmanager.cpp b/kdeprint/lpr/kmlprjobmanager.cpp
index 67e7a400..85166366 100644
--- a/kdeprint/lpr/kmlprjobmanager.cpp
+++ b/kdeprint/lpr/kmlprjobmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/kmlprjobmanager.h b/kdeprint/lpr/kmlprjobmanager.h
index 83d65a29..d9a8eae3 100644
--- a/kdeprint/lpr/kmlprjobmanager.h
+++ b/kdeprint/lpr/kmlprjobmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/kmlprmanager.cpp b/kdeprint/lpr/kmlprmanager.cpp
index 64e59359..cf4dbbb9 100644
--- a/kdeprint/lpr/kmlprmanager.cpp
+++ b/kdeprint/lpr/kmlprmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -137,7 +137,7 @@ void KMLprManager::initHandlers()
insertHandler(new LPRngToolHandler(this));
// now load external handlers
- TQStringList l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.la");
+ TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la");
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
{
KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it));
@@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt)
void KMLprManager::createPluginActions(KActionCollection *coll)
{
- KAction *act = new KAction(i18n("&Edit printcap Entry..."), "kdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
+ KAction *act = new KAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
act->setGroup("plugin");
}
diff --git a/kdeprint/lpr/kmlprmanager.h b/kdeprint/lpr/kmlprmanager.h
index d95fb7db..34d38340 100644
--- a/kdeprint/lpr/kmlprmanager.h
+++ b/kdeprint/lpr/kmlprmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/kmlpruimanager.cpp b/kdeprint/lpr/kmlpruimanager.cpp
index ea48c9bf..655309e0 100644
--- a/kdeprint/lpr/kmlpruimanager.cpp
+++ b/kdeprint/lpr/kmlpruimanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/kmlpruimanager.h b/kdeprint/lpr/kmlpruimanager.h
index e7e015e2..561f9350 100644
--- a/kdeprint/lpr/kmlpruimanager.h
+++ b/kdeprint/lpr/kmlpruimanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lpchelper.cpp b/kdeprint/lpr/lpchelper.cpp
index 7cf0bfeb..c921a803 100644
--- a/kdeprint/lpr/lpchelper.cpp
+++ b/kdeprint/lpr/lpchelper.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lpchelper.h b/kdeprint/lpr/lpchelper.h
index 8f259006..b1e20f08 100644
--- a/kdeprint/lpr/lpchelper.h
+++ b/kdeprint/lpr/lpchelper.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lpqhelper.cpp b/kdeprint/lpr/lpqhelper.cpp
index 3bd1c514..30348f59 100644
--- a/kdeprint/lpr/lpqhelper.cpp
+++ b/kdeprint/lpr/lpqhelper.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lpqhelper.h b/kdeprint/lpr/lpqhelper.h
index 59965fb6..2c38566c 100644
--- a/kdeprint/lpr/lpqhelper.h
+++ b/kdeprint/lpr/lpqhelper.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lprhandler.cpp b/kdeprint/lpr/lprhandler.cpp
index d3fc4ee9..fcb838bb 100644
--- a/kdeprint/lpr/lprhandler.cpp
+++ b/kdeprint/lpr/lprhandler.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lprhandler.h b/kdeprint/lpr/lprhandler.h
index eaab2557..e0e66e14 100644
--- a/kdeprint/lpr/lprhandler.h
+++ b/kdeprint/lpr/lprhandler.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lprngtoolhandler.cpp b/kdeprint/lpr/lprngtoolhandler.cpp
index 2d94e9b1..1d76cf2f 100644
--- a/kdeprint/lpr/lprngtoolhandler.cpp
+++ b/kdeprint/lpr/lprngtoolhandler.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -163,7 +163,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool
return NULL;
}
- DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1"));
+ DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1"));
if (driver)
{
TQString model = prt->option("driverID");
@@ -183,7 +183,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool
DrMain* LPRngToolHandler::loadDbDriver(const TQString& s)
{
int p = s.find('/');
- DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1"));
+ DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1"));
if (driver)
driver->set("driverID", s.mid(p+1));
return driver;
@@ -231,7 +231,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr)
return opts;
if (m_dict.count() == 0)
- m_dict = loadChoiceDict(locate("data", "kdeprint/lprngtooldriver1"));
+ m_dict = loadChoiceDict(locate("data", "tdeprint/lprngtooldriver1"));
TQString unknown;
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
diff --git a/kdeprint/lpr/lprngtoolhandler.h b/kdeprint/lpr/lprngtoolhandler.h
index e8843dc6..49641ca3 100644
--- a/kdeprint/lpr/lprngtoolhandler.h
+++ b/kdeprint/lpr/lprngtoolhandler.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lprsettings.cpp b/kdeprint/lpr/lprsettings.cpp
index a1a632a0..0c1cec2a 100644
--- a/kdeprint/lpr/lprsettings.cpp
+++ b/kdeprint/lpr/lprsettings.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/lprsettings.h b/kdeprint/lpr/lprsettings.h
index 419ec46d..01abbeeb 100644
--- a/kdeprint/lpr/lprsettings.h
+++ b/kdeprint/lpr/lprsettings.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
#endif
#include <tqobject.h>
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
/**
* @internal
diff --git a/kdeprint/lpr/matichandler.cpp b/kdeprint/lpr/matichandler.cpp
index bd3307ad..ef2f1584 100644
--- a/kdeprint/lpr/matichandler.cpp
+++ b/kdeprint/lpr/matichandler.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/matichandler.h b/kdeprint/lpr/matichandler.h
index db376f26..e30eee39 100644
--- a/kdeprint/lpr/matichandler.h
+++ b/kdeprint/lpr/matichandler.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/matichelper.cpp b/kdeprint/lpr/matichelper.cpp
index 1da5f631..ec0041b7 100644
--- a/kdeprint/lpr/matichelper.cpp
+++ b/kdeprint/lpr/matichelper.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/matichelper.h b/kdeprint/lpr/matichelper.h
index 622dd06a..5a2b64fe 100644
--- a/kdeprint/lpr/matichelper.h
+++ b/kdeprint/lpr/matichelper.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/printcapentry.cpp b/kdeprint/lpr/printcapentry.cpp
index 3f3af643..9c83537e 100644
--- a/kdeprint/lpr/printcapentry.cpp
+++ b/kdeprint/lpr/printcapentry.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/printcapentry.h b/kdeprint/lpr/printcapentry.h
index a7f2cabc..f8ba9919 100644
--- a/kdeprint/lpr/printcapentry.h
+++ b/kdeprint/lpr/printcapentry.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/printcapreader.cpp b/kdeprint/lpr/printcapreader.cpp
index 72a6e290..00016c14 100644
--- a/kdeprint/lpr/printcapreader.cpp
+++ b/kdeprint/lpr/printcapreader.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/lpr/printcapreader.h b/kdeprint/lpr/printcapreader.h
index 51aac90d..2236e506 100644
--- a/kdeprint/lpr/printcapreader.h
+++ b/kdeprint/lpr/printcapreader.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/CMakeLists.txt b/kdeprint/management/CMakeLists.txt
index c9fe6a5a..0e12299e 100644
--- a/kdeprint/management/CMakeLists.txt
+++ b/kdeprint/management/CMakeLists.txt
@@ -18,16 +18,16 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
- ${CMAKE_SOURCE_DIR}/kdeprint
+ ${CMAKE_SOURCE_DIR}/tdeprint
)
link_directories(
@@ -40,19 +40,19 @@ link_directories(
install( FILES
kmmainview.h kmjobviewer.h kmprinterpage.h
kiconselectaction.h kmtimer.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint )
##### other data ################################
install( FILES
tileup.png tiledown.png side.png
- DESTINATION ${DATA_INSTALL_DIR}/kdeprint )
+ DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
-#### kdeprint_management ########################
+#### tdeprint_management ########################
-set( target kdeprint_management )
+set( target tdeprint_management )
set( ${target}_SRCS
kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp
@@ -77,7 +77,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 4.2.0
- LINK kdeprint-shared
+ LINK tdeprint-shared
DESTINATION ${LIB_INSTALL_DIR}
)
@@ -87,12 +87,12 @@ tde_add_library( ${target} SHARED AUTOMOC
set( target libtdeprint_management_module )
set( ${target}_SRCS
- kdeprint_management_module.cpp
+ tdeprint_management_module.cpp
)
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeprint_management-shared
+ LINK tdeprint_management-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -105,7 +105,7 @@ set( ${target}_SRCS
kaddprinterwizard.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeprint-shared
+ LINK tdeprint-shared
)
diff --git a/kdeprint/management/Makefile.am b/kdeprint/management/Makefile.am
index 0cc693b6..34f8de93 100644
--- a/kdeprint/management/Makefile.am
+++ b/kdeprint/management/Makefile.am
@@ -1,10 +1,10 @@
AM_CPPFLAGS = -D_KDEPRINT_COMPILE
-INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
lib_LTLIBRARIES = libtdeprint_management.la
kde_module_LTLIBRARIES = libtdeprint_management_module.la
-kdeinit_LTLIBRARIES = kaddprinterwizard.la
+tdeinit_LTLIBRARIES = kaddprinterwizard.la
bin_PROGRAMS =
kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
@@ -29,12 +29,12 @@ libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-und
libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
libtdeprint_management_la_METASOURCES = AUTO
-libtdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp
+libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp
libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
-kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
-kdeprintdir = $(includedir)/kdeprint
+tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
+tdeprintdir = $(includedir)/tdeprint
noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \
kminfopage.h kmmainview.h kmpages.h \
@@ -48,5 +48,5 @@ noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \
kmconfigfilter.h kmconfigfonts.h kmconfigjobs.h networkscanner.h
dataicon_DATA = tileup.png tiledown.png side.png
-dataicondir = $(kde_datadir)/kdeprint
+dataicondir = $(kde_datadir)/tdeprint
diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp
index 4163a87f..af04ee17 100644
--- a/kdeprint/management/cjanuswidget.cpp
+++ b/kdeprint/management/cjanuswidget.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h
index 6deec314..d33be149 100644
--- a/kdeprint/management/cjanuswidget.h
+++ b/kdeprint/management/cjanuswidget.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/jobitem.cpp b/kdeprint/management/jobitem.cpp
index 171a9165..a9ce2fe8 100644
--- a/kdeprint/management/jobitem.cpp
+++ b/kdeprint/management/jobitem.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/jobitem.h b/kdeprint/management/jobitem.h
index 31c7923d..580a1b84 100644
--- a/kdeprint/management/jobitem.h
+++ b/kdeprint/management/jobitem.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kdeprint_management_module.cpp b/kdeprint/management/kdeprint_management_module.cpp
index 70c7b4cf..8d4027f7 100644
--- a/kdeprint/management/kdeprint_management_module.cpp
+++ b/kdeprint/management/kdeprint_management_module.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* Copyright (C) 2004 Dominique Devriese <devriese@kde.org>
*
* This library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ extern "C"
{
KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent)
{
- return kdeprint_management_add_printer_wizard( parent );
+ return tdeprint_management_add_printer_wizard( parent );
}
KDEPRINT_EXPORT bool config_dialog(TQWidget *parent)
diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp
index c042213f..8bf4d5a1 100644
--- a/kdeprint/management/kiconselectaction.cpp
+++ b/kdeprint/management/kiconselectaction.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kiconselectaction.h b/kdeprint/management/kiconselectaction.h
index dfd6ea17..84bef60d 100644
--- a/kdeprint/management/kiconselectaction.h
+++ b/kdeprint/management/kiconselectaction.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp
index 65d4d34f..32fb7db1 100644
--- a/kdeprint/management/kmconfigcommand.cpp
+++ b/kdeprint/management/kmconfigcommand.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigcommand.h b/kdeprint/management/kmconfigcommand.h
index 2ec662d9..203e6fd3 100644
--- a/kdeprint/management/kmconfigcommand.h
+++ b/kdeprint/management/kmconfigcommand.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigdialog.cpp b/kdeprint/management/kmconfigdialog.cpp
index f2ddf7b5..3bd89a75 100644
--- a/kdeprint/management/kmconfigdialog.cpp
+++ b/kdeprint/management/kmconfigdialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigdialog.h b/kdeprint/management/kmconfigdialog.h
index ed60378c..de04bc15 100644
--- a/kdeprint/management/kmconfigdialog.h
+++ b/kdeprint/management/kmconfigdialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp
index 967a6790..29d5107e 100644
--- a/kdeprint/management/kmconfigfilter.cpp
+++ b/kdeprint/management/kmconfigfilter.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfilter.h b/kdeprint/management/kmconfigfilter.h
index b69f10c0..9571f0d5 100644
--- a/kdeprint/management/kmconfigfilter.h
+++ b/kdeprint/management/kmconfigfilter.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp
index e5f47de3..183d0b62 100644
--- a/kdeprint/management/kmconfigfonts.cpp
+++ b/kdeprint/management/kmconfigfonts.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfonts.h b/kdeprint/management/kmconfigfonts.h
index 1d1483ed..a93a26d7 100644
--- a/kdeprint/management/kmconfigfonts.h
+++ b/kdeprint/management/kmconfigfonts.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp
index 96e8668d..40d187c3 100644
--- a/kdeprint/management/kmconfiggeneral.cpp
+++ b/kdeprint/management/kmconfiggeneral.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfiggeneral.h b/kdeprint/management/kmconfiggeneral.h
index 23739a15..8fc6fa5a 100644
--- a/kdeprint/management/kmconfiggeneral.h
+++ b/kdeprint/management/kmconfiggeneral.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp
index f70b1a33..1088e1b3 100644
--- a/kdeprint/management/kmconfigjobs.cpp
+++ b/kdeprint/management/kmconfigjobs.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigjobs.h b/kdeprint/management/kmconfigjobs.h
index 73d6274b..34be5b1e 100644
--- a/kdeprint/management/kmconfigjobs.h
+++ b/kdeprint/management/kmconfigjobs.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpage.cpp b/kdeprint/management/kmconfigpage.cpp
index b31575d3..fb967e05 100644
--- a/kdeprint/management/kmconfigpage.cpp
+++ b/kdeprint/management/kmconfigpage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpage.h b/kdeprint/management/kmconfigpage.h
index 596b8c5e..d56fbde8 100644
--- a/kdeprint/management/kmconfigpage.h
+++ b/kdeprint/management/kmconfigpage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp
index aa030019..cd777ec7 100644
--- a/kdeprint/management/kmconfigpreview.cpp
+++ b/kdeprint/management/kmconfigpreview.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpreview.h b/kdeprint/management/kmconfigpreview.h
index 359fcb22..a9c826c9 100644
--- a/kdeprint/management/kmconfigpreview.h
+++ b/kdeprint/management/kmconfigpreview.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp
index 7bdefbe0..1a89d0a8 100644
--- a/kdeprint/management/kmdbcreator.cpp
+++ b/kdeprint/management/kmdbcreator.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h
index 8b076e51..319d270c 100644
--- a/kdeprint/management/kmdbcreator.h
+++ b/kdeprint/management/kmdbcreator.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp
index 973be686..6fbab45e 100644
--- a/kdeprint/management/kmdriverdb.cpp
+++ b/kdeprint/management/kmdriverdb.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB()
TQString KMDriverDB::dbFile()
{
// this calls insure missing directories creation
- TQString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
+ TQString filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
return filename;
}
diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h
index 3913d74e..c5af6d53 100644
--- a/kdeprint/management/kmdriverdb.h
+++ b/kdeprint/management/kmdriverdb.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp
index e8a00c44..e9c49020 100644
--- a/kdeprint/management/kmdriverdbwidget.cpp
+++ b/kdeprint/management/kmdriverdbwidget.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdbwidget.h b/kdeprint/management/kmdriverdbwidget.h
index 27d8dcb6..05b50536 100644
--- a/kdeprint/management/kmdriverdbwidget.h
+++ b/kdeprint/management/kmdriverdbwidget.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdialog.cpp b/kdeprint/management/kmdriverdialog.cpp
index 2e79a8c6..ef37e333 100644
--- a/kdeprint/management/kmdriverdialog.cpp
+++ b/kdeprint/management/kmdriverdialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdialog.h b/kdeprint/management/kmdriverdialog.h
index 8720213d..8b7b01c4 100644
--- a/kdeprint/management/kmdriverdialog.h
+++ b/kdeprint/management/kmdriverdialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp
index 7afaf153..1fa5a6da 100644
--- a/kdeprint/management/kmiconview.cpp
+++ b/kdeprint/management/kmiconview.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h
index 1c3aeb54..1fd6fbbd 100644
--- a/kdeprint/management/kmiconview.h
+++ b/kdeprint/management/kmiconview.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp
index c8c80117..ad43f1cc 100644
--- a/kdeprint/management/kminfopage.cpp
+++ b/kdeprint/management/kminfopage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminfopage.h b/kdeprint/management/kminfopage.h
index b0dd3a93..591fdbfe 100644
--- a/kdeprint/management/kminfopage.h
+++ b/kdeprint/management/kminfopage.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp
index a2d02454..25c03751 100644
--- a/kdeprint/management/kminstancepage.cpp
+++ b/kdeprint/management/kminstancepage.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminstancepage.h b/kdeprint/management/kminstancepage.h
index 3b893110..7a3075d7 100644
--- a/kdeprint/management/kminstancepage.h
+++ b/kdeprint/management/kminstancepage.h
@@ -1,6 +1,6 @@
/*
* Th