diff options
Diffstat (limited to 'kdeprint')
440 files changed, 1046 insertions, 1046 deletions
diff --git a/kdeprint/CMakeLists.txt b/kdeprint/CMakeLists.txt index fa77fd3b4..bdbacc0bb 100644 --- a/kdeprint/CMakeLists.txt +++ b/kdeprint/CMakeLists.txt @@ -26,12 +26,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile @@ -53,16 +53,16 @@ install( FILES kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h driver.h kmjobmanager.h kmjob.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint ) ##### other data ################################ install( FILES kprintpreviewui.rc DESTINATION ${CONFIG_INSTALL_DIR}/ui ) -install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) -install( FILES kdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES kdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} ) -install( FILES kdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( FILES testprint.ps specials.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) +install( FILES tdeprintd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( FILES tdeprintrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES tdeprintrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) ##### driverparse ############################### @@ -74,25 +74,25 @@ tde_add_library( ${target} STATIC_PIC ) -##### kded_kdeprintd ############################ +##### kded_tdeprintd ############################ -set( target kded_kdeprintd ) +set( target kded_tdeprintd ) set( ${target}_SRCS - kdeprintd.cpp kprintprocess.cpp kdeprintd.skel + tdeprintd.cpp kprintprocess.cpp tdeprintd.skel ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared kdeinit_kded-shared + LINK kio-shared tdeinit_kded-shared DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${PLUGIN_INSTALL_DIR} ) -#### kdeprint ################################### +#### tdeprint ################################### -set( target kdeprint ) +set( target tdeprint ) set( ${target}_SRCS kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp @@ -103,7 +103,7 @@ set( ${target}_SRCS kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp kmspecialmanager.cpp - kdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp + tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp diff --git a/kdeprint/ChangeLog b/kdeprint/ChangeLog index 182044501..5ce11bd36 100644 --- a/kdeprint/ChangeLog +++ b/kdeprint/ChangeLog @@ -1,10 +1,10 @@ -Since 2.2 release, Michael Goffioul <kdeprint@swing.be> +Since 2.2 release, Michael Goffioul <tdeprint@swing.be> * automatic filtering: if the input file format is not directly supported - by the print spooler, kdeprint will try to convert the file to the + by the print spooler, tdeprint will try to convert the file to the primary supported input format (usually PostScript). To achieve this, - kdeprint uses the available filters (defined in XML files) and tries to + tdeprint uses the available filters (defined in XML files) and tries to build up a filter chain. - * mime type checking: when building a filter chain, kdeprint checks that + * mime type checking: when building a filter chain, tdeprint checks that each output format is supported as an input by the next filter * possibility to specify input file from the print dialog in StandAlone mode (like XPP) @@ -20,7 +20,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * print dialog: possibility to select the files to print in standalone mode (like XPP). -27/08/2001 Michael Goffioul <kdeprint@swing.be> +27/08/2001 Michael Goffioul <tdeprint@swing.be> * implementation of "Schedule" tab in print dialog for the CUPS plugin (job-hold-until attribute). * Printer aliases are now handled gracefully in the LPR plugin (they @@ -29,30 +29,30 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> setOption("kde-isspecial", "1"); setOption("kde-special-command", cmd); -28/08/2001 Michael Goffioul <kdeprint@swing.be> +28/08/2001 Michael Goffioul <tdeprint@swing.be> * implementation of KPrintAction, which provides a quick access to a class of printers (special, regular or both). An application just needs to create a KPrintAction anc connect to print(KPrinter*). -31/08/2001 Michael Goffioul <kdeprint@swing.be> +31/08/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: fix crash for Qt3 port, must check if attr->name is NULL before comparing it with strcmp or strncmp. -12/09/2001 Michael Goffioul <kdeprint@swing.be> +12/09/2001 Michael Goffioul <tdeprint@swing.be> * Management library: set all toolbars non movable to avoid move handles -13/09/2001 Michael Goffioul <kdeprint@swing.be> +13/09/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: fix multiple showing of password dialog for password- protected printers (timer is now blocked when the password dialog is shown) -14/09/2001 Michael Goffioul <kdeprint@swing.be> +14/09/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: configuration wizard rewritten using the structure of ESP PrintPro: more consistent, less pages and widgets. Not used as default config wizard yet. * QList -> QPtrList -25/09/2001 Michael Goffioul <kdeprint@swing.be> +25/09/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: made the new configuration wizard as default one. * other QList -> QPtrList fixes (committed to CVS) * Avoid to call plugin functions "completePrinter<xxx>" for pseudo @@ -64,21 +64,21 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * Wizard: fix buffer overflow when adding a remote LPD queue having a lot of jobs waiting -03/10/2001 Michael Goffioul <kdeprint@swing.be> +03/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: make use of GET/PUT request to handle configuration file. Possibility to admin a remote CUPS server (if allowed) * CUPS plugin: added "/jobs" in the available resources list -09/10/2001 Michael Goffioul <kdeprint@swing.be> +09/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: added 2 missing pages in stand-alone mode, "Image" and "Text". -10/10/2001 Michael Goffioul <kdeprint@swing.be> +10/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: "HP-GL/2" page added * General: added a GUI to configure the preview program, into the config dialog of the print manager -12/10/2001 Michael Goffioul <kdeprint@swing.be> +12/10/2001 Michael Goffioul <tdeprint@swing.be> * general: added the possibility for a plugin to add new actions to the toolbar and context menu (main use = export driver in CUPS). @@ -86,16 +86,16 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> through samba. Threaded operation with progress bar to notify the user. Graphical equivalent to cupsaddsmb from cups-1.1.11. -16/10/2001 Michael Goffioul <kdeprint@swing.be> +16/10/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: removed the "file" backend as it doesn't seem to be available since a couple of releases, and added a "Other" page to the wizard for any third-party backend (like pdf). -18/10/2001 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: don't hardcode program path, use the $PATH variable +18/10/2001 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: don't hardcode program path, use the $PATH variable first to find the program. Default to /usr/bin if not found. -02/11/2001 Michael Goffioul <kdeprint@swing.be> +02/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: . fix for remote printers when there's also a local printer with the same name: the printer-uri-supported @@ -104,22 +104,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> as well as detected IPP printers on the network (in the wizard) -05/11/2001 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: added possibility to view files being faxed and +05/11/2001 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: added possibility to view files being faxed and file action (remove and view) are enabled only when needed. * KPrinter: when printing to a file, support encoding and spaces in file names + system --> KProcess. -07/11/2001 Michael Goffioul <kdeprint@swing.be> - * kdeprint: fixed some problems: - . collate entirely handled by kdeprint, even in the case +07/11/2001 Michael Goffioul <tdeprint@swing.be> + * tdeprint: fixed some problems: + . collate entirely handled by tdeprint, even in the case of page selection on application-side. . set KPrinter object in KPrintDialog before adding other dialog pages (some pages may need it) * wizard: changed button layout and added a side graphic. Not committed as the graphic comes from HP driver (copyright). -08/11/2001 Michael Goffioul <kdeprint@swing.be> +08/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: . complete IPP report for job added . implementation of dynamically added plugin menus for @@ -127,24 +127,24 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . printer infos are now retrieved from the correct host for remote printers and classes (idem for IPP report) * general: implementation of a DCOP signal communication to - synchronize all kdeprint apps, a plugin change in one app is + synchronize all tdeprint apps, a plugin change in one app is notified to all other opened apps (via DCOP). * kicker extension: made extension aware of plugin change in other apps (using new DCOP signal comm). -09/11/2001 Michael Goffioul <kdeprint@swing.be> +09/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS plugin: added the possibility to list jobs on remote printers. No management is allowed on remote jobs (yet?). -10/11/2001 Michael Goffioul <kdeprint@swing.be> +10/11/2001 Michael Goffioul <tdeprint@swing.be> * general: use KShellProcess::quote() for any quoting. Normally, all quoting problem should be fixed now. -12/11/2001 Michael Goffioul <kdeprint@swing.be> +12/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS: redesigned the "cups-add-smb" dialog to make it more user-driendly. -13/11/2001 Michael GOffioul <kdeprint@swing.be> +13/11/2001 Michael GOffioul <tdeprint@swing.be> * general: implementation of a KActiveLabel class to embed active links in labels. Clicking on it "exec" the associated URL. * general: make use of KActiveLabel in the first page of the @@ -154,7 +154,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> correctly when scanning the network (however it should be avoided as smbspool seems to be unable to handle it). -14/11/2001 Michael Goffioul <kdeprint@swing.be> +14/11/2001 Michael Goffioul <tdeprint@swing.be> * ioslave: uploaded new templates from Chris (which adds support for pseudo printers * manager: modified RootOnly message for better consistency between @@ -168,13 +168,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . added hiding mechanism to make the dialog more compact (show/hide button can probably be improved) -15/11/2001 Michael Goffioul <kdeprint@swing.be> +15/11/2001 Michael Goffioul <tdeprint@swing.be> * CUPS: drivers are now downloaded from the actual server for remote printers. This allows to have access to all options set for any printer (even remote ones). However remote printer's drivers are kept read-only. -16/11/2001 Michael Goffioul <kdeprint@swing.be> +16/11/2001 Michael Goffioul <tdeprint@swing.be> * print dialog: instances are now presented in a tree structure in the combo box -> cleaner view. * general: ported the use of a global instance file to 2.2 branch @@ -185,7 +185,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> numerical option and update the corresponding enum one with the closest value. -21/11/2001 Michael Goffioul <kdeprint@swing.be> +21/11/2001 Michael Goffioul <tdeprint@swing.be> * job viewer: clicking on 'x' button only hide the job viewer but doesn't quit the app. To quit, either use menu item (from window or system tray) or accel when job viewer is visible. @@ -193,13 +193,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> it is always centered on its parent now. It also have the dialog buttons in title bar (no minimize). -23/11/2001 Michael Goffioul <kdeprint@swing.be> +23/11/2001 Michael Goffioul <tdeprint@swing.be> * job management: the job management has been re-engineered to follow the paradigm "1 window == 1 queue". There's still the possibility to view jobs for all printers within a single window. This should enhance the usability of job management tools (I hope). -26/11/2001 Michael Goffioul <kdeprint@swing.be> +26/11/2001 Michael Goffioul <tdeprint@swing.be> * job management: job type (active/completed) is now handled on a printer basis instead of a global property of the manager. This allows different windows to show different job type, and also ease the @@ -214,21 +214,21 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> This new mechanism should also be applied to print management dynamic actions (more consistent). -28/11/2001 Michael Goffioul <kdeprint@swing.be> +28/11/2001 Michael Goffioul <tdeprint@swing.be> * special printers: added the possibility to have configurable options in pseudo-printers. Options are described in an additional XML file (like filters) and configured through an "Advanced" tab in the property dialog. TODO: graphical configuration widget + apply KXmlCommand to normal filters. -29/11/2001 Michael Goffioul <kdeprint@swing.be> +29/11/2001 Michael Goffioul <tdeprint@swing.be> * general: fixed sorting of options in driver view. They should be shown in order of appearance now. * general: make use of the new KXmlCommand class for filters too. * filters: removed the "Page Size" from the options of enscript filter, this is taken from the KPrinter object now. -04/12/2001 Michael Goffioul <kdeprint@swing.be> +04/12/2001 Michael Goffioul <tdeprint@swing.be> * general: finalized the new XML command mechanism: . graphical command builder . pseudo-printers and filters are completely based on new XML @@ -236,14 +236,14 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> previous mechanism are not used). . KPrintFilter and KMFilterManager are now obsolete and replaced by KXmlCommand and KXmlCommandManager respectively. - * kdeprintfax: made the log window a "real" log window. It is dynamically + * tdeprintfax: made the log window a "real" log window. It is dynamically refreshed on new debug output arrival (suggested by user). -10/12/2001 Michael Goffioul <kdeprint@swing.be> +10/12/2001 Michael Goffioul <tdeprint@swing.be> * general: make use of "Detail" mechanism of KDialogBase in XML command editor. -11/12/2001 Michael Goffioul <kdeprint@swing.be> +11/12/2001 Michael Goffioul <tdeprint@swing.be> * instances: for root, instances are saved in global file /etc/cups/lpoptions. This allows to easily create global instances (just be root and create the instance). @@ -251,17 +251,17 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> file, such that root is able to manage global pseudo printers. Locale pseudo printers still override global ones if they have the same name. -12/12/2001 Michael Goffioul <kdeprint@swing.be> +12/12/2001 Michael Goffioul <tdeprint@swing.be> * general: added error messages when the printer list cannot be retrieved in print manager and print dialog. With CUPS, if the server is not running, an error message is shown to the user. * CUPS: disabled all backends if no server is running. -13/12/2001 Michael Goffioul <kdeprint@swing.be> +13/12/2001 Michael Goffioul <tdeprint@swing.be> * general: preleminary support for external printer tool. Only escputil at this moment. -03/01/2002 Michael Goffioul <kdeprint@swing.be> +03/01/2002 Michael Goffioul <tdeprint@swing.be> * general: . added a "ID name" label to the first dialog for command editing . put "View Printer Infos" in front of orientation and view type @@ -273,12 +273,12 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . added a WhatsThis help to the "Instances" tab briefly explaining what's an instance. -09/01/2002 Michael Goffioul <kdeprint@swing.be> +09/01/2002 Michael Goffioul <tdeprint@swing.be> * general: when filtering, the file type is checked against supported formats. If the format is not supported, a warning is issued and the user has the possibility to auto-convert the file to a supported format. Consequence: you can now safely perform page selection on any - file type with any printer and any spooler, kdeprint will try to convert + file type with any printer and any spooler, tdeprint will try to convert the file to PS. * preview dialog: rewrote the code in a cleaner way, avoiding the use of a non toplevel main window. Preview dialog looks simpler now. New @@ -293,10 +293,10 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> Netscape. If files are given on the command line, this option is forced unset. . added a "--nodialog" option for quick print. - . added the persistent feature (with some code rewrite in kdeprint + . added the persistent feature (with some code rewrite in tdeprint library) -10/01/2002 Michael Goffioul <kdeprint@swing.be> +10/01/2002 Michael Goffioul <tdeprint@swing.be> * general: added (temporary) workaround for drawing problems in fixed toolbars, until a real fix gets implemented: static_cast<QWidget*>(tb)->layout()->setMargin(1); @@ -304,18 +304,18 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: added KPrinter::autoConfigure(), to automatically configure a KPrinter object without the need for a print dialog. -14/01/2002 Michael Goffioul <kdeprint@swing.be> +14/01/2002 Michael Goffioul <tdeprint@swing.be> * slave: made case-insensitive for backward compatibility (old URLs may come from history). Now print:/Classes should work OK. * CUPS: moved the IPP report to an separate dialog and added the possibility to print the result. -15/01/2002 Michael Goffioul <kdeprint@swing.be> +15/01/2002 Michael Goffioul <tdeprint@swing.be> * started the implementation of a new LPR/LPRng plugin: this implementation is designed to be modular to provide support for various systems like Foomatic, APSFilter, GNUlpr or Printtool(RH). -17/01/2002 Michael Goffioul <kdeprint@swing.be> +17/01/2002 Michael Goffioul <tdeprint@swing.be> * LPR: first implementation of a job manager. Make use of asynchronous lpc and lpq processes. Major problem: delay between new state and screen update due to the fact that data are started to be updated when @@ -326,22 +326,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> the default basename for output file. * test: updated to Qt3 and demonstrate the use of the DocFileName feature -21/01/2002 Michael Goffioul <kdeprint@swing.be> +21/01/2002 Michael Goffioul <tdeprint@swing.be> * LPR: added basic implementation of a KPrinterImpl object -> plugin is functional (though far from complete...) -22/01/2002 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: make use of new address book (libkabc) instead of the old +22/01/2002 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: make use of new address book (libkabc) instead of the old one (libkab). -29/01/2002 Michael Goffioul <kdeprint@swing.be> +29/01/2002 Michael Goffioul <tdeprint@swing.be> * LPR: enhancement of the APSFilter handler. Still missing: setup the options in the print command line * wizard: removed the garbage '&' in last page * general: added SMB util functions -> to be used whenever it's possible (CUPS plugin, Foomatic handler => TO BE DONE) -30/01/2002 Michael Goffioul <kdeprint@swing.be> +30/01/2002 Michael Goffioul <tdeprint@swing.be> * general: use QGuardedPtr to keep KPrinterImpl object in KPrinter, this should avoid some crashes. * LPR: @@ -350,7 +350,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . fix problem with rmote lpd queues: force lp=<empty string> in printcap entry -07/02/2002 Michael Goffioul <kdeprint@swing.be> +07/02/2002 Michael Goffioul <tdeprint@swing.be> * job viewer: fix crash when switching the print plugin elsewhere and there's some jobs shown + fix refresh problem when switching plugin * general: fix small bug when removing a filter in "Filters" page @@ -358,12 +358,12 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> problem with non-docked vertical toolbars. Use plain QPushButton instead, but this has some drawing problems in HighColor style. -11/02/2002 Michael Goffioul <kdeprint@swing.be> +11/02/2002 Michael Goffioul <tdeprint@swing.be> * LPR: added support for LPRngTool+IFHP (not complete yet though) * general: various fixes for crashes, inconsistencies, ... -12/02/2002 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: added %email to possible command tags. The e-mail address +12/02/2002 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: added %email to possible command tags. The e-mail address is retrieved from standard settings in KControl module. The tag can also be used in the "Name" field of the options dialog * LPR: completion of the LPRngTool handler + implementation of dynamic @@ -375,7 +375,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * CUPS: configuration tool now handles gracefully unrecognized options, a warning is issued, and they are restored as-is on file saving. -13/02/2002 Michael Goffioul <kdeprint@swing.be> +13/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: added support for job-billing and page-label, and put them along with the scredule option into a single "Advanced" tab. * CUPS: added job billing info to the job viewer @@ -383,23 +383,23 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> dialog * general: allow multi selection in the file list of print dialog -14/02/2002 Michael Goffioul <kdeprint@swing.be> +14/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: added the possibility to edit job attributes on-the-fly using a dialog similar to the printer properties dialog. Still the be fixed: page ranges (problem with option encoding in CUPS). -15/02/2002 Michael Goffioul <kdeprint@swing.be> +15/02/2002 Michael Goffioul <tdeprint@swing.be> * general: fixed infinite recursion bug in KIconSelectAction * CUPS: temporarily disabled edition of page-ranges as it seems CUPS is buggy. I should find a workaround. * general (CUPS): enable some actions for jobs on remote hosts. It seems to work OK between my local LM-8.1 and a remote LM-7.2. -16/02/2002 Michael Goffioul <kdeprint@swing.be> +16/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: added direct Foomatic driver support (no need the all PPD package from foomatic anymore, driver are loaded directly from Foomatic) -17/02/2002 Michael GOffioul <kdeprint@swing.be> +17/02/2002 Michael GOffioul <tdeprint@swing.be> * preview: . better algorithm to find a preview object . more comprehensive error report @@ -407,11 +407,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: added the backend stuff for printer filtering, needs GUI -> allows to only show a selected set of printers -18/02/2002 Michael Goffioul <kdeprint@swing.be> +18/02/2002 Michael Goffioul <tdeprint@swing.be> * general: simple printer filtering mechanism based on printer name and location regexp. Graphical configuration for printer name. -19/02/2002 Michael Goffioul <kdeprint@swing.be> +19/02/2002 Michael Goffioul <tdeprint@swing.be> * general: . completion of the printer filtering mechanism (added location string filter) @@ -420,16 +420,16 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . possibility to open the main option dialog from print dialog (for example to change the filter or default preview program) . added icon on push buttons when useful - . changed plugin names to kdeprint_* (stripped the leading "lib") + . changed plugin names to tdeprint_* (stripped the leading "lib") -20/02/2002 Michael Goffioul <kdeprint@swing.be> +20/02/2002 Michael Goffioul <tdeprint@swing.be> * slave: prevent konqueror to consider a trailing slash as a directory specification (simply add a config entry in protocol file) * general: large UI standardization by making use of KDialogBase along with KGuiItem * kicker menu: possibility to open main Options Dialog from the menu -21/02/2002 Michael Goffioul <kdeprint@swing.be> +21/02/2002 Michael Goffioul <tdeprint@swing.be> * general: splitted the printer state into enable/disable and start/stop and modified the GUI to reflect this * general: removed the KMManager::configure(), obsoleted by the complete @@ -437,22 +437,22 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * kicker extension: extension of the menu plugin to allow access to the server configuration tool as well as the "kprinter" utility. -25/02/2002 Michael Goffioul <kdeprint@swing.be> +25/02/2002 Michael Goffioul <tdeprint@swing.be> * LPR: added printer testing support -26/02/2002 Michael Goffioul <kdeprint@swing.be> +26/02/2002 Michael Goffioul <tdeprint@swing.be> * general: printer filtering specs are now ORed instead of ANDed * general: changed "Advanced" to "Driver Settings" * CUPS: fixed RIPCache problem, added support for possible suffixes -27/02/2002 Michael Goffioul <kdeprint@swing.be> +27/02/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: workaround to allow special characters in login/password without breaking security. Possible now to use safely chars like '@' and '/' in login. * general: added a check box in the config dialog to enable/disable font embedding into PS data (compatible with Qt settings). -28/02/2002 Michael Goffioul <kdeprint@swing.be> +28/02/2002 Michael Goffioul <tdeprint@swing.be> * general: job viewer updated correctly on plugin reload -> additional columns and "history" action state * general: internal *Settings objects are synchonized on config changes @@ -460,11 +460,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: improved feedback to user when creating driver DB * CUPS: speed optimization when creating driver DB (simple hack to avoid to parse the entire PPD file each time => much better) - * kdeprintfax: added "-n" and "-f %email" by default for the Hylafax + * tdeprintfax: added "-n" and "-f %email" by default for the Hylafax system * general: various small UI improvements (suggested by Thomas) -02/03/2002 Michael Goffioul <kdeprint@swing.be> +02/03/2002 Michael Goffioul <tdeprint@swing.be> * general: modified the driver structure to support dynamic options as in SuSE * LPR: more management support for SuSE handler -> drver settings can @@ -472,7 +472,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: needed stuff to provide translations for filters (Coolo will now extract the strings from XML files for translators) -10/03/2002 Michael Goffioul <kdeprint@swing.be> +10/03/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: allow any integer value for RIPCache + don't upload the cupsd.conf with wrong settings @@ -480,7 +480,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * KDE-3 RELEASE * ***************** -(CeBIT) Michael Goffioul <kdeprint@swing.be> +(CeBIT) Michael Goffioul <tdeprint@swing.be> * Fix various crashes: . when changing the CUPS server (notify registered object before reloading) @@ -491,7 +491,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: started generealization of a margin widget to configure the margins of the KPrinter object -25/03/2002 Michael Goffioul <kdeprint@swing.be> +25/03/2002 Michael Goffioul <tdeprint@swing.be> * general: do not use pointers in various views, to avoid dangling pointers (and crashes) when changing something (plugin, config file, ...). This makes the aboutToReload functions quite useless, but it has to @@ -502,13 +502,13 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> * general: added help button to the wizard and the print dialog. They are connected to the main help (should probably add an anchor to go directly to the associated part). - * kdeprintfax: more support/sync with standard addressbook: - . possibility to start the ab editor from kdeprintfax + * tdeprintfax: more support/sync with standard addressbook: + . possibility to start the ab editor from tdeprintfax . make use of the "Organization" field as enterprise . fix problem with empty phone number (ex: no business fax). -26/03/2002 Michael Goffioul <kdeprint@swing.be> - * kdeprintfax: +26/03/2002 Michael Goffioul <tdeprint@swing.be> + * tdeprintfax: . added support for Mgetty-sendfax . added support for page size in filters . make use of the localized page size as default @@ -518,19 +518,19 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> . bugfix in logview: behaves safely when closed using the title bar button -27/03/2002 Michael Goffioul <kdeprint@swing.be> +27/03/2002 Michael Goffioul <tdeprint@swing.be> * general: created a separate "Fonts" section in the KDEPrint settings dialog and removed the "Embed Fonts" option from the general section (moved to the new section). - * kdeprintfax: fixed disabled background for "Comment" widget, use QBrush + * tdeprintfax: fixed disabled background for "Comment" widget, use QBrush instead of QColor. OK with styles like Liquid. -28/03/2002 Michael Goffioul <kdeprint@swing.be> +28/03/2002 Michael Goffioul <tdeprint@swing.be> * general: added a user feedback mechanism in the form of a dialog showgin status messages, including initialization, number of the page currently generated, filtering and sending to the printer. -29/03/2002 Michael Goffioul <kdeprint@swing.be> +29/03/2002 Michael Goffioul <tdeprint@swing.be> * general: enhanced the status feedback mechanism . possibility to have multiple status boxes (one for each app) . added an icon (eye-candy) and the document name being printed @@ -545,7 +545,7 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> current plugin below the plugin combobox (ex: in CUPS, shows the current server:port). -02/04/2002 Michael Goffioul <kdeprint@swing.be> +02/04/2002 Michael Goffioul <tdeprint@swing.be> * general: . fixed various conflicting shortcuts . made KMVirtualManager inherit from KPReloadObject to force instance @@ -555,14 +555,14 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> tab in the print dialog. It contain a 2-columns table where custom tags can be added. Read-only in job editing mode (hope to change that soon). -03/04/2002 Michael Goffioul <kdeprint@swing.be> +03/04/2002 Michael Goffioul <tdeprint@swing.be> * manager: show instances as children of the real printer in the tree view. No instance management is possible from the tree view itself. The user still has to use the "Instances" tab. * ioslave: added support for print jobs browsing, per printer or for all printers together (-> print:/jobs) -04/04/2002 Michael Goffioul <kdeprint@swing.be> +04/04/2002 Michael Goffioul <tdeprint@swing.be> * ioslave: added support to view the driver of a printer in HTML form (print:/printers/lp1?driver) * CUPS: allows editing of page-ranges for pending jobs, work around @@ -573,11 +573,11 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> work with gpr (from GNUlpr) . added support for "bool" directives in Foomatic drivers -23/05/2002 Michael Goffioul <kdeprint@swing.be> +23/05/2002 Michael Goffioul <tdeprint@swing.be> * job manager: added the possibility to control the username for jobs filtering, and the possibility to limit the number of jobs shown. -16/08/2002 Michael Goffioul <kdeprint@swing.be> +16/08/2002 Michael Goffioul <tdeprint@swing.be> * filters/command: added the possibility to have comments about a specific command, including clickable URL's. Modified the command selector to use those comments. @@ -589,31 +589,31 @@ Since 2.2 release, Michael Goffioul <kdeprint@swing.be> even on first dialog showing (call slotPrinterSelected after setting the output file name). -20/08/2002 Michael Goffioul <kdeprint@swing.be> +20/08/2002 Michael Goffioul <tdeprint@swing.be> * print dialog: . added a method to disable a page in the main dialog . make the filename persistent in the SaveFile dialog . use a rename dialog if the output file already exists -26/08/2002 Michael Goffioul <kdeprint@swing.be> +26/08/2002 Michael Goffioul <tdeprint@swing.be> * general: added a generic PS driver to (missing for too long) -02/09/2002 Michael Goffioul <kdeprint@swing.be> +02/09/2002 Michael Goffioul <tdeprint@swing.be> * print dialog: added graphical interface to the poster XML command (still to be committed) * manager: added a condensed toolbar with actions grouped by topics in sub-menus. -03/09/2002 Michael Goffioul <kdeprint@swing.be> +03/09/2002 Michael Goffioul <tdeprint@swing.be> * print dialog: enabled preview even in standalone mode, either the internal PS viewer or any other registered app will be used, according to the user preferences. -04/09/2002 Michael Goffioul <kdeprint@swing.be> +04/09/2002 Michael Goffioul <tdeprint@swing.be> * commands: make unavailability of a command more visual by showing a red text, and disabling the OK button of the current dialog (only if needed). -05/09/2002 Michael Goffioul <kdeprint@swing.be> +05/09/2002 Michael Goffioul <tdeprint@swing.be> * CUPS: shows all possible URI detected by CUPS when selecting the "Others" printer type in the wizard, like the web interface is doing. diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am index 8b63447e1..fecf25c64 100644 --- a/kdeprint/Makefile.am +++ b/kdeprint/Makefile.am @@ -6,14 +6,14 @@ endif SUBDIRS = . management lpdunix $(CUPSSUBDIR) lpr rlpr ext filters pics tools tests -INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes) +INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes) -kde_module_LTLIBRARIES = kded_kdeprintd.la +kde_module_LTLIBRARIES = kded_tdeprintd.la -kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp -kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la -kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version -#kded_kdeprintd_la_METASOURCES = AUTO +kded_tdeprintd_la_SOURCES = tdeprintd.skel tdeprintd.cpp kprintprocess.cpp +kded_tdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la +kded_tdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version +#kded_tdeprintd_la_METASOURCES = AUTO lib_LTLIBRARIES = libtdeprint.la @@ -23,7 +23,7 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \ kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp \ kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp \ - kmspecialmanager.cpp kdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \ + kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \ kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kmfactory.skel kxmlcommand.cpp \ util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp \ kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \ @@ -38,8 +38,8 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \ kmuimanager.h kmvirtualmanager.h driveritem.h droptionview.h \ driverview.h kprintpreview.h kprinterimpl.h kprintdialog.h \ kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.h \ - kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h kdeprintd.h \ - kpfilterpage.h kmspecialmanager.h kdeprintcheck.h plugincombobox.h \ + kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h tdeprintd.h \ + kpfilterpage.h kmspecialmanager.h tdeprintcheck.h plugincombobox.h \ kfilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \ util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \ marginvaluewidget.h kpmarginpage.h messagewindow.h \ @@ -47,9 +47,9 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \ include_HEADERS = kprinter.h kprintaction.h -kdeprint_HEADERS = kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h \ +tdeprint_HEADERS = kprintdialogpage.h kpreloadobject.h kmmanager.h kmprinter.h kmobject.h kprintdialog.h \ driver.h kmjobmanager.h kmjob.h -kdeprintdir = $(includedir)/kdeprint +tdeprintdir = $(includedir)/tdeprint EXTRA_DIST = fooparser.y fooscanner.l kprintpreviewui.rc @@ -61,22 +61,22 @@ uidatadir = $(kde_confdir)/ui # Test page printdata_DATA = testprint.ps specials.desktop -printdatadir = $(kde_datadir)/kdeprint +printdatadir = $(kde_datadir)/tdeprint # Services servicesdir = $(kde_servicesdir)/kded -services_DATA = kdeprintd.desktop +services_DATA = tdeprintd.desktop # Config file configdir = $(kde_confdir) -config_DATA = kdeprintrc +config_DATA = tdeprintrc # parser and scanner fooparser: rm -f fooparser.cpp.h - bison -v -d -p kdeprint_foomatic2 $(srcdir)/fooparser.y -o $(srcdir)/fooparser.cpp + bison -v -d -p tdeprint_foomatic2 $(srcdir)/fooparser.y -o $(srcdir)/fooparser.cpp if test -f "$(srcdir)/fooparser.hpp"; then mv $(srcdir)/fooparser.hpp $(srcdir)/fooparser.cpp.h; fi - flex -o$(srcdir)/fooscanner.cpp -Pkdeprint_foomatic2 $(srcdir)/fooscanner.l + flex -o$(srcdir)/fooscanner.cpp -Ptdeprint_foomatic2 $(srcdir)/fooscanner.l echo "#ifndef fooparser_cpp_h" > $(srcdir)/fooparser.cpp.hh echo "#define fooparser_cpp_h" >> $(srcdir)/fooparser.cpp.hh cat $(srcdir)/fooparser.cpp.h >> $(srcdir)/fooparser.cpp.hh @@ -85,30 +85,30 @@ fooparser: ppdparser: rm -f ppdparser.cpp.h - bison -v -d -p kdeprint_ppd $(srcdir)/ppdparser.y -o $(srcdir)/ppdparser.cpp + bison -v -d -p tdeprint_ppd $(srcdir)/ppdparser.y -o $(srcdir)/ppdparser.cpp if test -f "$(srcdir)/ppdparser.hpp"; then mv $(srcdir)/ppdparser.hpp $(srcdir)/ppdparser.cpp.h; fi - flex -o$(srcdir)/ppdscanner.cpp -Pkdeprint_ppd $(srcdir)/ppdscanner.l + flex -o$(srcdir)/ppdscanner.cpp -Ptdeprint_ppd $(srcdir)/ppdscanner.l echo "#ifndef ppdparser_cpp_h" > $(srcdir)/ppdparser.cpp.hh echo "#define ppdparser_cpp_h" >> $(srcdir)/ppdparser.cpp.hh cat $(srcdir)/ppdparser.cpp.h >> $(srcdir)/ppdparser.cpp.hh echo "#endif" >> $(srcdir)/ppdparser.cpp.hh mv $(srcdir)/ppdparser.cpp.hh $(srcdir)/ppdparser.cpp.h -noinst_DATA = kdeprint +noinst_DATA = tdeprint -kdeprint: - $(LN_S) $(srcdir)/management kdeprint +tdeprint: + $(LN_S) $(srcdir)/management tdeprint # convenience static library noinst_LIBRARIES = libdriverparse.a libdriverparse_a_SOURCES = driverparse.c -update_DATA = kdeprintrc.upd +update_DATA = tdeprintrc.upd updatedir = $(kde_datadir)/kconf_update messages: rc.cpp $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp - $(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/kdeprint.pot + $(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/tdeprint.pot include ../admin/Doxyfile.am diff --git a/kdeprint/TODO b/kdeprint/TODO index 8531c0380..7c67dccdb 100644 --- a/kdeprint/TODO +++ b/kdeprint/TODO @@ -16,14 +16,14 @@ WISHES - Possibility to specify a different input slot for first page??? -- add "Subject" or "Regarding" to kdeprintfax interface: look first +- add "Subject" or "Regarding" to tdeprintfax interface: look first if this is possible in efax and/or hylafax - add the possibility to view a printjob file (if possible) - restarting server: use of "ps" in a subshell to get the pid, possibility of authentification (put this into separate program that would restart - itself using kdesu). + itself using tdesu). - CUPS: a "Printer/Server Debugging Helper" would be nice: you could vary the LogLevel there, restart the server, provide a viewer diff --git a/kdeprint/cups/CMakeLists.txt b/kdeprint/cups/CMakeLists.txt index c9f336558..2166cc08f 100644 --- a/kdeprint/cups/CMakeLists.txt +++ b/kdeprint/cups/CMakeLists.txt @@ -20,17 +20,17 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore/network - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/network + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile - ${CMAKE_SOURCE_DIR}/kdeprint - ${CMAKE_SOURCE_DIR}/kdeprint/management + ${CMAKE_SOURCE_DIR}/tdeprint + ${CMAKE_SOURCE_DIR}/tdeprint/management ) link_directories( @@ -40,13 +40,13 @@ link_directories( ##### other data ################################ -install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) -install( FILES preview.png preview-mini.png DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) +install( FILES cups.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) +install( FILES preview.png preview-mini.png DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) -#### kdeprint_cups ############################## +#### tdeprint_cups ############################## -set( target kdeprint_cups ) +set( target tdeprint_cups ) set( ${target}_SRCS cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp @@ -62,7 +62,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared ${CUPS_LIBRARIES} + LINK tdeprint_management-shared ${CUPS_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -77,7 +77,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static kdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES} + LINK driverparse-static tdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) @@ -92,6 +92,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdefakes-shared ${CUPS_LIBRARIES} + LINK tdefakes-shared ${CUPS_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/cups/Makefile.am b/kdeprint/cups/Makefile.am index ed45a175e..6f3d7edec 100644 --- a/kdeprint/cups/Makefile.am +++ b/kdeprint/cups/Makefile.am @@ -2,11 +2,11 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE SUBDIRS = cupsdconf2 -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management -I$(top_srcdir)/kdecore/network $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes) -kde_module_LTLIBRARIES = kdeprint_cups.la +kde_module_LTLIBRARIES = tdeprint_cups.la -kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcupsjobmanager.cpp \ +tdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcupsjobmanager.cpp \ kmcupsmanager.cpp kmcupsuimanager.cpp kmpropbanners.cpp kmwbanners.cpp kmwipp.cpp \ kmwippselect.cpp kcupsprinterimpl.cpp kmcupsconfigwidget.cpp \ kmconfigcups.cpp kmconfigcupsdir.cpp kmwippprinter.cpp kmwfax.cpp kmwquota.cpp \ @@ -14,9 +14,9 @@ kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups imagepreview.cpp imageposition.cpp kpimagepage.cpp \ kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \ kptagspage.cpp -kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) -kdeprint_cups_la_METASOURCES = AUTO +tdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) +tdeprint_cups_la_METASOURCES = AUTO noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \ kmpropbanners.h kmwbanners.h kmwipp.h kmwippselect.h kcupsprinterimpl.h \ @@ -27,18 +27,18 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmc bin_PROGRAMS = make_driver_db_cups cupsdoprint make_driver_db_cups_SOURCES = make_driver_db_cups.c -make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libtdefakes.la $(LIBDL) $(LIBZ) +make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/tdecore/libtdefakes.la $(LIBDL) $(LIBZ) make_driver_db_cups_LDFLAGS = $(all_libraries) cupsdoprint_SOURCES = cupsdoprint.c -cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libtdefakes.la +cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/tdecore/libtdefakes.la cupsdoprint_LDFLAGS = $(all_libraries) entry_DATA = cups.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins misc_DATA = preview.png preview-mini.png -miscdir = $(kde_datadir)/kdeprint +miscdir = $(kde_datadir)/tdeprint EXTRA_DIST = postscript.ppd.gz diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp index f12653cbb..ca40a10a7 100644 --- a/kdeprint/cups/cupsaddsmb2.cpp +++ b/kdeprint/cups/cupsaddsmb2.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsaddsmb2.h b/kdeprint/cups/cupsaddsmb2.h index 266a50c6c..84166f53c 100644 --- a/kdeprint/cups/cupsaddsmb2.h +++ b/kdeprint/cups/cupsaddsmb2.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/CMakeLists.txt b/kdeprint/cups/cupsdconf2/CMakeLists.txt index 914b18446..ceee1bc47 100644 --- a/kdeprint/cups/cupsdconf2/CMakeLists.txt +++ b/kdeprint/cups/cupsdconf2/CMakeLists.txt @@ -14,9 +14,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile @@ -31,7 +31,7 @@ link_directories( install( FILES kde_logo.png cups_logo.png cupsd.conf.template - DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) #### cupsdconf ################################## @@ -48,7 +48,7 @@ set( ${target}_SRCS cups-util.c qdirmultilineedit.cpp sizewidget.cpp main.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared ${CUPS_LIBRARIES} ) diff --git a/kdeprint/cups/cupsdconf2/Makefile.am b/kdeprint/cups/cupsdconf2/Makefile.am index 83426a5b6..434af6a3c 100644 --- a/kdeprint/cups/cupsdconf2/Makefile.am +++ b/kdeprint/cups/cupsdconf2/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includ bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = cupsdconf.la +tdeinit_LTLIBRARIES = cupsdconf.la # library creation cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \ @@ -26,7 +26,7 @@ noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplas # Data cupsdconfdata_DATA = kde_logo.png cups_logo.png cupsd.conf.template -cupsdconfdatadir = $(kde_datadir)/kdeprint +cupsdconfdatadir = $(kde_datadir)/tdeprint # Translations messages: diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index 7e4f1bdd9..fab6a6fba 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/addressdialog.h b/kdeprint/cups/cupsdconf2/addressdialog.h index 7d241a080..7fdb6fb6f 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.h +++ b/kdeprint/cups/cupsdconf2/addressdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/browsedialog.cpp b/kdeprint/cups/cupsdconf2/browsedialog.cpp index 4cfc6099c..b337eb883 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/kdeprint/cups/cupsdconf2/browsedialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/browsedialog.h b/kdeprint/cups/cupsdconf2/browsedialog.h index e75357e1d..8db12bc34 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.h +++ b/kdeprint/cups/cupsdconf2/browsedialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cups-util.h b/kdeprint/cups/cupsdconf2/cups-util.h index 1daf4050e..9c23c0c5e 100644 --- a/kdeprint/cups/cupsdconf2/cups-util.h +++ b/kdeprint/cups/cupsdconf2/cups-util.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsd.conf.template b/kdeprint/cups/cupsdconf2/cupsd.conf.template index ae1a4c362..08d4b9425 100644 --- a/kdeprint/cups/cupsdconf2/cupsd.conf.template +++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template @@ -5,7 +5,7 @@ # in KDEPrint. The predecessors to KDEPrint in former KDE releases # were KUPS and QtCUPS; they are deprecated and no longer maintained. # -# Author: Michael Goffioul <kdeprint@swing.be> +# Author: Michael Goffioul <tdeprint@swing.be> # # Web site: http://printing.kde.org/ # diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 5ae671092..4b056cdb0 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,7 +36,7 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) { setPageLabel(i18n("Browsing")); setHeader(i18n("Browsing Settings")); - setPixmap("kdeprint_printer_remote"); + setPixmap("tdeprint_printer_remote"); browseinterval_ = new KIntNumInput(this); browseport_ = new KIntNumInput(this); diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h index 6658e39cd..bdbff1844 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp index 0e761378c..d17c8bd0c 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -114,7 +114,7 @@ bool CupsdComment::loadComments() { comments_.setAutoDelete(true); comments_.clear(); - TQFile f(locate("data", "kdeprint/cupsd.conf.template")); + TQFile f(locate("data", "tdeprint/cupsd.conf.template")); if (f.exists() && f.open(IO_ReadOnly)) { Comment *comm; diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.h b/kdeprint/cups/cupsdconf2/cupsdcomment.h index 3bfc67e15..35f9e0515 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.h +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index 78ec9ec78..0cd041d48 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line) bool CupsdConf::loadAvailableResources() { - KConfig conf("kdeprintrc"); + KConfig conf("tdeprintrc"); conf.setGroup("CUPS"); TQString host = conf.readEntry("Host",cupsServer()); int port = conf.readNumEntry("Port",ippPort()); @@ -876,9 +876,9 @@ TQString CupsResource::typeToIconName(int type) case RESOURCE_GLOBAL: return TQString("folder"); case RESOURCE_PRINTER: - return TQString("kdeprint_printer"); + return TQString("tdeprint_printer"); case RESOURCE_CLASS: - return TQString("kdeprint_printer_class"); + return TQString("tdeprint_printer_class"); } return TQString("folder"); } diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.h b/kdeprint/cups/cupsdconf2/cupsdconf.h index 33a2ecd79..70b4f591b 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.h +++ b/kdeprint/cups/cupsdconf2/cupsdconf.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index fb59986c5..e6338eb8c 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -113,7 +113,7 @@ const char* getPassword(const char*) CupsdDialog::CupsdDialog(TQWidget *parent, const char *name) : KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) { - KGlobal::iconLoader()->addAppDir("kdeprint"); + KGlobal::iconLoader()->addAppDir("tdeprint"); KGlobal::locale()->insertCatalogue("cupsdconf"); setShowIconsInTreeList(true); @@ -208,7 +208,7 @@ bool CupsdDialog::restartServer(TQString& msg) { bool success = false; KProcess proc; - proc << "kdesu" << "-c" << "/etc/init.d/cupsys restart"; + proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart"; success = proc.start( KProcess::Block ) && proc.normalExit(); if( !success ) msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.h b/kdeprint/cups/cupsdconf2/cupsddialog.h index ed8a33613..85eee172e 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.h +++ b/kdeprint/cups/cupsdconf2/cupsddialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp index 05d8314e5..268465a76 100644 --- a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsddirpage.h b/kdeprint/cups/cupsdconf2/cupsddirpage.h index 6056f79c4..571c79f21 100644 --- a/kdeprint/cups/cupsdconf2/cupsddirpage.h +++ b/kdeprint/cups/cupsdconf2/cupsddirpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index a47fae05b..79c8a9401 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h index 1e32e92bd..18fc5d405 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp index 8cb20679f..f12f82f1e 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.h b/kdeprint/cups/cupsdconf2/cupsdjobspage.h index 0b6f5dbf3..abbbd140d 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.h +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp index f7de36783..61a89f933 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.h b/kdeprint/cups/cupsdconf2/cupsdlogpage.h index bad889632..618f612be 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index c56d5e145..9edca5868 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h index 62ed56626..be46c280f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdpage.cpp b/kdeprint/cups/cupsdconf2/cupsdpage.cpp index e4a47bf1f..68bdde7a6 100644 --- a/kdeprint/cups/cupsdconf2/cupsdpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdpage.h b/kdeprint/cups/cupsdconf2/cupsdpage.h index f6c8b932b..aadbd54b9 100644 --- a/kdeprint/cups/cupsdconf2/cupsdpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 5be680300..092e1a7e5 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h index 5f20b2dcf..5e97c1cf8 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp index bd99546ae..cfd731430 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.h b/kdeprint/cups/cupsdconf2/cupsdserverpage.h index 50164f110..f1f9eed2f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp index a0a34db84..c26b65fd7 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -37,11 +37,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) main_->addLayout(sub_); TQLabel *cupslogo_ = new TQLabel(this); - TQString logopath = locate("data", TQString("kdeprint/cups_logo.png")); + TQString logopath = locate("data", TQString("tdeprint/cups_logo.png")); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); cupslogo_->tqsetAlignment(Qt::AlignCenter); TQLabel *kupslogo_ = new TQLabel(this); - logopath = locate("data", TQString("kdeprint/kde_logo.png")); + logopath = locate("data", TQString("tdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); kupslogo_->tqsetAlignment(Qt::AlignCenter); diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.h b/kdeprint/cups/cupsdconf2/cupsdsplash.h index 9acf27395..f484958d4 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.h +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp index 9acbb23a2..754c9659e 100644 --- a/kdeprint/cups/cupsdconf2/editlist.cpp +++ b/kdeprint/cups/cupsdconf2/editlist.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/editlist.h b/kdeprint/cups/cupsdconf2/editlist.h index 177cddceb..a0fc7ee0a 100644 --- a/kdeprint/cups/cupsdconf2/editlist.h +++ b/kdeprint/cups/cupsdconf2/editlist.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index 416efa249..7e1858cc7 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/locationdialog.h b/kdeprint/cups/cupsdconf2/locationdialog.h index 26a4c43f8..f0c182f42 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.h +++ b/kdeprint/cups/cupsdconf2/locationdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/main.cpp b/kdeprint/cups/cupsdconf2/main.cpp index cc0918f41..f3c317afd 100644 --- a/kdeprint/cups/cupsdconf2/main.cpp +++ b/kdeprint/cups/cupsdconf2/main.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp index 18f27db5b..18cade9fc 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.cpp +++ b/kdeprint/cups/cupsdconf2/portdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/portdialog.h b/kdeprint/cups/cupsdconf2/portdialog.h index 44b91d134..42dd7037b 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.h +++ b/kdeprint/cups/cupsdconf2/portdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp index 46e70a41f..7cf0ea74e 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.h b/kdeprint/cups/cupsdconf2/qdirlineedit.h index 85e9603f8..d852897c3 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index b473d2a61..e677da988 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h index f39293665..c3765362e 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp index d77fe5aaa..742702e48 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdconf2/sizewidget.h b/kdeprint/cups/cupsdconf2/sizewidget.h index 56818b9a1..000fb22bc 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.h +++ b/kdeprint/cups/cupsdconf2/sizewidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsdoprint.c b/kdeprint/cups/cupsdoprint.c index 743042b2a..a12a2adf8 100644 --- a/kdeprint/cups/cupsdoprint.c +++ b/kdeprint/cups/cupsdoprint.c @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -87,7 +87,7 @@ static const char* getPasswordCB(const char* prompt) char *_user = shell_quote( cupsUser() ), *_passwd = NULL; FILE *output; - snprintf( buf, sizeof( buf )-1, "dcop kded kdeprintd requestPassword %s %s %d %d", + snprintf( buf, sizeof( buf )-1, "dcop kded tdeprintd requestPassword %s %s %d %d", _user, cupsServer(), ippPort(), diff --git a/kdeprint/cups/cupsinfos.cpp b/kdeprint/cups/cupsinfos.cpp index 5c967d7b8..1fae8e0db 100644 --- a/kdeprint/cups/cupsinfos.cpp +++ b/kdeprint/cups/cupsinfos.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/cupsinfos.h b/kdeprint/cups/cupsinfos.h index 416e441cb..5f74d3636 100644 --- a/kdeprint/cups/cupsinfos.h +++ b/kdeprint/cups/cupsinfos.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/image.cpp b/kdeprint/cups/image.cpp index 9e32ce771..ce56bb4b9 100644 --- a/kdeprint/cups/image.cpp +++ b/kdeprint/cups/image.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp index 5f08fcd61..70a84ba7f 100644 --- a/kdeprint/cups/imageposition.cpp +++ b/kdeprint/cups/imageposition.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -46,7 +46,7 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name) position_ = Center; setMinimumSize(tqsizeHint()); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - pix_.load(locate("data", "kdeprint/preview-mini.png")); + pix_.load(locate("data", "tdeprint/preview-mini.png")); } ImagePosition::~ImagePosition() diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h index 406e96951..6d6645365 100644 --- a/kdeprint/cups/imageposition.h +++ b/kdeprint/cups/imageposition.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp index 16a6271cb..2290f6a96 100644 --- a/kdeprint/cups/imagepreview.cpp +++ b/kdeprint/cups/imagepreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h index ff9da9fb8..12a57ddb3 100644 --- a/kdeprint/cups/imagepreview.h +++ b/kdeprint/cups/imagepreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/ippreportdlg.cpp b/kdeprint/cups/ippreportdlg.cpp index b7ef270bd..5fa54e11e 100644 --- a/kdeprint/cups/ippreportdlg.cpp +++ b/kdeprint/cups/ippreportdlg.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/ippreportdlg.h b/kdeprint/cups/ippreportdlg.h index 8e3eea8c5..e61ccd7b7 100644 --- a/kdeprint/cups/ippreportdlg.h +++ b/kdeprint/cups/ippreportdlg.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/ipprequest.cpp b/kdeprint/cups/ipprequest.cpp index 354d46cf6..16cbe3308 100644 --- a/kdeprint/cups/ipprequest.cpp +++ b/kdeprint/cups/ipprequest.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -154,7 +154,7 @@ void IppRequest::init() request_ = 0; } request_ = ippNew(); - //kdDebug(500) << "kdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; + //kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; TQCString langstr = KGlobal::locale()->language().latin1(); cups_lang_t* lang = cupsLangGet(langstr.data()); // default charset to UTF-8 (ugly hack) diff --git a/kdeprint/cups/ipprequest.h b/kdeprint/cups/ipprequest.h index 1265ee966..ba8b2f081 100644 --- a/kdeprint/cups/ipprequest.h +++ b/kdeprint/cups/ipprequest.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp index 4bcf96e6e..e016e9954 100644 --- a/kdeprint/cups/kcupsprinterimpl.cpp +++ b/kdeprint/cups/kcupsprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kcupsprinterimpl.h b/kdeprint/cups/kcupsprinterimpl.h index f2eeab88f..b86db8aac 100644 --- a/kdeprint/cups/kcupsprinterimpl.h +++ b/kdeprint/cups/kcupsprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmconfigcups.cpp b/kdeprint/cups/kmconfigcups.cpp index c23f5d54c..7e03dae01 100644 --- a/kdeprint/cups/kmconfigcups.cpp +++ b/kdeprint/cups/kmconfigcups.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmconfigcups.h b/kdeprint/cups/kmconfigcups.h index 52dac657c..c0f1ab2ba 100644 --- a/kdeprint/cups/kmconfigcups.h +++ b/kdeprint/cups/kmconfigcups.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmconfigcupsdir.cpp b/kdeprint/cups/kmconfigcupsdir.cpp index fc1d7d399..fbec34f2a 100644 --- a/kdeprint/cups/kmconfigcupsdir.cpp +++ b/kdeprint/cups/kmconfigcupsdir.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmconfigcupsdir.h b/kdeprint/cups/kmconfigcupsdir.h index a6fe8d9ba..352388c99 100644 --- a/kdeprint/cups/kmconfigcupsdir.h +++ b/kdeprint/cups/kmconfigcupsdir.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp index 5242cd240..482680bd6 100644 --- a/kdeprint/cups/kmcupsconfigwidget.cpp +++ b/kdeprint/cups/kmcupsconfigwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmcupsconfigwidget.h b/kdeprint/cups/kmcupsconfigwidget.h index 804fc22f0..7eee42d80 100644 --- a/kdeprint/cups/kmcupsconfigwidget.h +++ b/kdeprint/cups/kmcupsconfigwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmcupsfactory.cpp b/kdeprint/cups/kmcupsfactory.cpp index 93e179f4c..47384eab6 100644 --- a/kdeprint/cups/kmcupsfactory.cpp +++ b/kdeprint/cups/kmcupsfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,5 +26,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_cups, KGenericFactory< Products >( "ppdtranslations" ) ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_cups, KGenericFactory< Products >( "ppdtranslations" ) ) diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp index 1daa22b42..58de0818a 100644 --- a/kdeprint/cups/kmcupsjobmanager.cpp +++ b/kdeprint/cups/kmcupsjobmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -285,7 +285,7 @@ TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *c TQValueList<KAction*> list; KAction *act(0); - list << (act = new PluginAction(0, i18n("&Job IPP Report"), "kdeprint_report", 0, coll, "plugin_ipp")); + list << (act = new PluginAction(0, i18n("&Job IPP Report"), "tdeprint_report", 0, coll, "plugin_ipp")); act->setGroup("plugin"); list << (act = new PluginAction(1, i18n("&Increase Priority"), "up", 0, coll, "plugin_prioup")); act->setGroup("plugin"); diff --git a/kdeprint/cups/kmcupsjobmanager.h b/kdeprint/cups/kmcupsjobmanager.h index cba3371dc..7e8a75a53 100644 --- a/kdeprint/cups/kmcupsjobmanager.h +++ b/kdeprint/cups/kmcupsjobmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index 3027f3ac7..8db6bdc6d 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -846,9 +846,9 @@ TQStringList KMCupsManager::detectLocalPrinters() void KMCupsManager::createPluginActions(KActionCollection *coll) { - KAction *act = new KAction(i18n("&Export Driver..."), "kdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); + KAction *act = new KAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new KAction(i18n("&Printer IPP Report"), "kdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new KAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } diff --git a/kdeprint/cups/kmcupsmanager.h b/kdeprint/cups/kmcupsmanager.h index 132decb34..d574bb686 100644 --- a/kdeprint/cups/kmcupsmanager.h +++ b/kdeprint/cups/kmcupsmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmcupsuimanager.cpp b/kdeprint/cups/kmcupsuimanager.cpp index 9cefccac3..c3dfcb1ac 100644 --- a/kdeprint/cups/kmcupsuimanager.cpp +++ b/kdeprint/cups/kmcupsuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmcupsuimanager.h b/kdeprint/cups/kmcupsuimanager.h index 88c2c962a..6ad0f574f 100644 --- a/kdeprint/cups/kmcupsuimanager.h +++ b/kdeprint/cups/kmcupsuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmpropbanners.cpp b/kdeprint/cups/kmpropbanners.cpp index 4380e6507..22098cdff 100644 --- a/kdeprint/cups/kmpropbanners.cpp +++ b/kdeprint/cups/kmpropbanners.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmpropbanners.h b/kdeprint/cups/kmpropbanners.h index 6756763e6..770419dc5 100644 --- a/kdeprint/cups/kmpropbanners.h +++ b/kdeprint/cups/kmpropbanners.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmpropquota.cpp b/kdeprint/cups/kmpropquota.cpp index 9f5ff8444..9df6cbcb2 100644 --- a/kdeprint/cups/kmpropquota.cpp +++ b/kdeprint/cups/kmpropquota.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmpropquota.h b/kdeprint/cups/kmpropquota.h index 4142c1179..8ebeb323b 100644 --- a/kdeprint/cups/kmpropquota.h +++ b/kdeprint/cups/kmpropquota.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmpropusers.cpp b/kdeprint/cups/kmpropusers.cpp index 173149047..65a9e4dbd 100644 --- a/kdeprint/cups/kmpropusers.cpp +++ b/kdeprint/cups/kmpropusers.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -37,7 +37,7 @@ KMPropUsers::KMPropUsers(TQWidget *parent, const char *name) m_title = i18n("Users"); m_header = i18n("Users Access Settings"); - m_pixmap = "kdeprint_printer_users"; + m_pixmap = "tdeprint_printer_users"; } KMPropUsers::~KMPropUsers() diff --git a/kdeprint/cups/kmpropusers.h b/kdeprint/cups/kmpropusers.h index 4ab1fab9d..35e935adb 100644 --- a/kdeprint/cups/kmpropusers.h +++ b/kdeprint/cups/kmpropusers.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp index 9e930ac0e..c221f69d7 100644 --- a/kdeprint/cups/kmwbanners.cpp +++ b/kdeprint/cups/kmwbanners.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwbanners.h b/kdeprint/cups/kmwbanners.h index 7340e5554..6f8650848 100644 --- a/kdeprint/cups/kmwbanners.h +++ b/kdeprint/cups/kmwbanners.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwfax.cpp b/kdeprint/cups/kmwfax.cpp index 127232d2e..352081f6c 100644 --- a/kdeprint/cups/kmwfax.cpp +++ b/kdeprint/cups/kmwfax.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwfax.h b/kdeprint/cups/kmwfax.h index 8fc846a7b..1a822165e 100644 --- a/kdeprint/cups/kmwfax.h +++ b/kdeprint/cups/kmwfax.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwipp.cpp b/kdeprint/cups/kmwipp.cpp index 4d32ae2a1..119da629a 100644 --- a/kdeprint/cups/kmwipp.cpp +++ b/kdeprint/cups/kmwipp.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwipp.h b/kdeprint/cups/kmwipp.h index 42e36814e..33d02629b 100644 --- a/kdeprint/cups/kmwipp.h +++ b/kdeprint/cups/kmwipp.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwippprinter.cpp b/kdeprint/cups/kmwippprinter.cpp index 90fad0e94..0a0c7b672 100644 --- a/kdeprint/cups/kmwippprinter.cpp +++ b/kdeprint/cups/kmwippprinter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -62,7 +62,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) m_info->setPaper(tqcolorGroup().background()); m_info->setMinimumHeight(100); m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>")); - m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "kdeprint_report"), this); + m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "tdeprint_report"), this); m_ippreport->setEnabled(false); m_scanner = new NetworkScanner( 631, this ); @@ -140,7 +140,7 @@ void KMWIppPrinter::slotScanFinished() else name = it.current()->Name; TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); - item->setPixmap(0,SmallIcon("kdeprint_printer")); + item->setPixmap(0,SmallIcon("tdeprint_printer")); } } diff --git a/kdeprint/cups/kmwippprinter.h b/kdeprint/cups/kmwippprinter.h index aff29fdfb..5d9d33f7a 100644 --- a/kdeprint/cups/kmwippprinter.h +++ b/kdeprint/cups/kmwippprinter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwippselect.cpp b/kdeprint/cups/kmwippselect.cpp index 0d89e9112..5c9cad356 100644 --- a/kdeprint/cups/kmwippselect.cpp +++ b/kdeprint/cups/kmwippselect.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -84,7 +84,7 @@ void KMWIppSelect::initPrinter(KMPrinter *p) while (attr) { if (attr->name && strcmp(attr->name,"printer-name") == 0) - m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("tdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text)); attr = attr->next; } m_list->sort(); diff --git a/kdeprint/cups/kmwippselect.h b/kdeprint/cups/kmwippselect.h index 26ce6e563..8d1711e8c 100644 --- a/kdeprint/cups/kmwippselect.h +++ b/kdeprint/cups/kmwippselect.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp index 68a6c4532..596f61990 100644 --- a/kdeprint/cups/kmwother.cpp +++ b/kdeprint/cups/kmwother.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -97,7 +97,7 @@ void KMWOther::initPrinter(KMPrinter *p) if ( cl == "network" ) parent->setPixmap( 0, SmallIcon( "network" ) ); else if ( cl == "direct" ) - parent->setPixmap( 0, SmallIcon( "kdeprint_computer" ) ); + parent->setPixmap( 0, SmallIcon( "tdeprint_computer" ) ); else if ( cl == "serial" ) parent->setPixmap( 0, SmallIcon( "usb" ) ); else diff --git a/kdeprint/cups/kmwother.h b/kdeprint/cups/kmwother.h index e4bc72d5f..eba5ac2b1 100644 --- a/kdeprint/cups/kmwother.h +++ b/kdeprint/cups/kmwother.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwquota.cpp b/kdeprint/cups/kmwquota.cpp index 703a9510f..67245fb20 100644 --- a/kdeprint/cups/kmwquota.cpp +++ b/kdeprint/cups/kmwquota.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwquota.h b/kdeprint/cups/kmwquota.h index 6f1ce0660..d8895c80d 100644 --- a/kdeprint/cups/kmwquota.h +++ b/kdeprint/cups/kmwquota.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwusers.cpp b/kdeprint/cups/kmwusers.cpp index f42250d68..714f6f4d4 100644 --- a/kdeprint/cups/kmwusers.cpp +++ b/kdeprint/cups/kmwusers.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kmwusers.h b/kdeprint/cups/kmwusers.h index 9b6faeb61..cae8844a6 100644 --- a/kdeprint/cups/kmwusers.h +++ b/kdeprint/cups/kmwusers.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kphpgl2page.cpp b/kdeprint/cups/kphpgl2page.cpp index 0d15a838d..080cdf453 100644 --- a/kdeprint/cups/kphpgl2page.cpp +++ b/kdeprint/cups/kphpgl2page.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kphpgl2page.h b/kdeprint/cups/kphpgl2page.h index ecbc85c88..397efb1a8 100644 --- a/kdeprint/cups/kphpgl2page.h +++ b/kdeprint/cups/kphpgl2page.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp index d669bc475..d3e438389 100644 --- a/kdeprint/cups/kpimagepage.cpp +++ b/kdeprint/cups/kpimagepage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -275,7 +275,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_hue->setEnabled(useColor); m_saturation->setEnabled(useColor); - TQImage img(locate("data", "kdeprint/preview.png")); + TQImage img(locate("data", "tdeprint/preview.png")); m_preview->setImage(img); KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); diff --git a/kdeprint/cups/kpimagepage.h b/kdeprint/cups/kpimagepage.h index d0cfe094f..1a6bc6e44 100644 --- a/kdeprint/cups/kpimagepage.h +++ b/kdeprint/cups/kpimagepage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kpschedulepage.cpp b/kdeprint/cups/kpschedulepage.cpp index a43fd04d3..4d8bab4d1 100644 --- a/kdeprint/cups/kpschedulepage.cpp +++ b/kdeprint/cups/kpschedulepage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kpschedulepage.h b/kdeprint/cups/kpschedulepage.h index eccfb570a..4be11fab9 100644 --- a/kdeprint/cups/kpschedulepage.h +++ b/kdeprint/cups/kpschedulepage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp index 0e2d93ea3..d91a8b427 100644 --- a/kdeprint/cups/kptagspage.cpp +++ b/kdeprint/cups/kptagspage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h index 599ecebbf..ac99072ec 100644 --- a/kdeprint/cups/kptagspage.h +++ b/kdeprint/cups/kptagspage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp index cec0f6c23..0bee387c6 100644 --- a/kdeprint/cups/kptextpage.cpp +++ b/kdeprint/cups/kptextpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -331,7 +331,7 @@ void KPTextPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) void KPTextPage::slotPrettyChanged(int ID) { - TQString iconstr = (ID == 0 ? "kdeprint_nup1" : "kdeprint_prettyprint"); + TQString iconstr = (ID == 0 ? "tdeprint_nup1" : "tdeprint_prettyprint"); m_prettypix->setPixmap(UserIcon(iconstr)); } diff --git a/kdeprint/cups/kptextpage.h b/kdeprint/cups/kptextpage.h index 3289bf007..504e2d5c2 100644 --- a/kdeprint/cups/kptextpage.h +++ b/kdeprint/cups/kptextpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/driver.cpp b/kdeprint/driver.cpp index 26423a858..072f125c6 100644 --- a/kdeprint/driver.cpp +++ b/kdeprint/driver.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/driver.h b/kdeprint/driver.h index a2ccab8a8..7064e5335 100644 --- a/kdeprint/driver.h +++ b/kdeprint/driver.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/driveritem.cpp b/kdeprint/driveritem.cpp index 8bbfff6a4..b6531fef2 100644 --- a/kdeprint/driveritem.cpp +++ b/kdeprint/driveritem.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/driveritem.h b/kdeprint/driveritem.h index b9469be23..506cbe34d 100644 --- a/kdeprint/driveritem.h +++ b/kdeprint/driveritem.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/driverparse.h b/kdeprint/driverparse.h index 73c41be6d..775c81187 100644 --- a/kdeprint/driverparse.h +++ b/kdeprint/driverparse.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/driverview.cpp b/kdeprint/driverview.cpp index 1ede93388..f7feabb06 100644 --- a/kdeprint/driverview.cpp +++ b/kdeprint/driverview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/driverview.h b/kdeprint/driverview.h index 421786c50..4ec06c5fa 100644 --- a/kdeprint/driverview.h +++ b/kdeprint/driverview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/droptionview.cpp b/kdeprint/droptionview.cpp index f6ed93fff..2ba4d1799 100644 --- a/kdeprint/droptionview.cpp +++ b/kdeprint/droptionview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/droptionview.h b/kdeprint/droptionview.h index a84724bd8..70f60a814 100644 --- a/kdeprint/droptionview.h +++ b/kdeprint/droptionview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/ext/CMakeLists.txt b/kdeprint/ext/CMakeLists.txt index 8c701056b..9f4b2d629 100644 --- a/kdeprint/ext/CMakeLists.txt +++ b/kdeprint/ext/CMakeLists.txt @@ -17,11 +17,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -31,12 +31,12 @@ link_directories( ##### other data ################################ -install( FILES ext.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) +install( FILES ext.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) -##### kdeprint_ext ############################## +##### tdeprint_ext ############################## -set( target kdeprint_ext ) +set( target tdeprint_ext ) set( ${target}_SRCS kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp @@ -45,6 +45,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/ext/Makefile.am b/kdeprint/ext/Makefile.am index 1cb50d9fb..66e547c9d 100644 --- a/kdeprint/ext/Makefile.am +++ b/kdeprint/ext/Makefile.am @@ -1,15 +1,15 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes) -kde_module_LTLIBRARIES = kdeprint_ext.la +kde_module_LTLIBRARIES = tdeprint_ext.la -kdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp -kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE) -kdeprint_ext_la_METASOURCES = AUTO +tdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp +tdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE) +tdeprint_ext_la_METASOURCES = AUTO noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h entry_DATA = ext.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/ext/kextprinterimpl.cpp b/kdeprint/ext/kextprinterimpl.cpp index c92657497..c976f54e0 100644 --- a/kdeprint/ext/kextprinterimpl.cpp +++ b/kdeprint/ext/kextprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/ext/kextprinterimpl.h b/kdeprint/ext/kextprinterimpl.h index 653593592..169e06bf4 100644 --- a/kdeprint/ext/kextprinterimpl.h +++ b/kdeprint/ext/kextprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/ext/kmextfactory.cpp b/kdeprint/ext/kmextfactory.cpp index 3360774fa..de8c58dfe 100644 --- a/kdeprint/ext/kmextfactory.cpp +++ b/kdeprint/ext/kmextfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,5 +24,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_3( KMExtManager, KMExtUiManager, KExtPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_ext, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_ext, KGenericFactory< Products > ) diff --git a/kdeprint/ext/kmextmanager.cpp b/kdeprint/ext/kmextmanager.cpp index 017142a14..598dd6648 100644 --- a/kdeprint/ext/kmextmanager.cpp +++ b/kdeprint/ext/kmextmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/ext/kmextmanager.h b/kdeprint/ext/kmextmanager.h index 8811f952d..c7faab6cf 100644 --- a/kdeprint/ext/kmextmanager.h +++ b/kdeprint/ext/kmextmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/ext/kmextuimanager.cpp b/kdeprint/ext/kmextuimanager.cpp index ea698b8cd..2fa200848 100644 --- a/kdeprint/ext/kmextuimanager.cpp +++ b/kdeprint/ext/kmextuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/ext/kmextuimanager.h b/kdeprint/ext/kmextuimanager.h index 671d8e76b..bca161c60 100644 --- a/kdeprint/ext/kmextuimanager.h +++ b/kdeprint/ext/kmextuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/filters/CMakeLists.txt b/kdeprint/filters/CMakeLists.txt index a19bb1f93..2d36e16bb 100644 --- a/kdeprint/filters/CMakeLists.txt +++ b/kdeprint/filters/CMakeLists.txt @@ -18,6 +18,6 @@ install( FILES psbook2.xml psbook.desktop psbook.xml psselect.desktop psselect.xml ps2pdf.desktop ps2pdf.xml pdf2ps.desktop pdf2ps.xml poster.desktop poster.xml - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/filters ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/filters ) install( PROGRAMS imagetops DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/filters/Makefile.am b/kdeprint/filters/Makefile.am index 43adaa5d2..f9c9f9120 100644 --- a/kdeprint/filters/Makefile.am +++ b/kdeprint/filters/Makefile.am @@ -1,4 +1,4 @@ -filtersdir = $(kde_datadir)/kdeprint/filters +filtersdir = $(kde_datadir)/tdeprint/filters filters_DATA = enscript.desktop enscript.xml\ psnup.desktop psnup.xml \ imagetops.desktop imagetops.xml \ diff --git a/kdeprint/foomatic/Makefile.am b/kdeprint/foomatic/Makefile.am index a35882fbc..7a57fd40e 100644 --- a/kdeprint/foomatic/Makefile.am +++ b/kdeprint/foomatic/Makefile.am @@ -1,13 +1,13 @@ -INCLUDES = -I$(top_srcdir)/kdeprint $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeprint $(all_includes) -kde_module_LTLIBRARIES = kdeprint_foomatic.la +kde_module_LTLIBRARIES = tdeprint_foomatic.la -kdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \ +tdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \ kmfoomaticmanager.cpp \ kfoomaticprinterimpl.cpp -kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la -kdeprint_foomatic_la_METASOURCES = AUTO +tdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_foomatic_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la +tdeprint_foomatic_la_METASOURCES = AUTO noinst_HEADERS = kmfoomaticmanager.h \ kfoomaticprinterimpl.h @@ -17,4 +17,4 @@ bin_PROGRAMS = make_driver_db_foomatic make_driver_db_foomatic_SOURCES = make_driver_db_foomatic.c entry_DATA = foomatic.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.cpp b/kdeprint/foomatic/kfoomaticprinterimpl.cpp index 7e47a505f..d47a5e134 100644 --- a/kdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/kdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.h b/kdeprint/foomatic/kfoomaticprinterimpl.h index 74dfdc8f4..9d4a27155 100644 --- a/kdeprint/foomatic/kfoomaticprinterimpl.h +++ b/kdeprint/foomatic/kfoomaticprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/foomatic/kmfoomaticfactory.cpp b/kdeprint/foomatic/kmfoomaticfactory.cpp index 0355b1dd6..660e5faff 100644 --- a/kdeprint/foomatic/kmfoomaticfactory.cpp +++ b/kdeprint/foomatic/kmfoomaticfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,5 +23,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_2( KMFoomaticManager, KFoomaticPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_foomatic, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_foomatic, KGenericFactory< Products > ) diff --git a/kdeprint/foomatic/kmfoomaticmanager.cpp b/kdeprint/foomatic/kmfoomaticmanager.cpp index 749bf160b..53049852b 100644 --- a/kdeprint/foomatic/kmfoomaticmanager.cpp +++ b/kdeprint/foomatic/kmfoomaticmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/foomatic/kmfoomaticmanager.h b/kdeprint/foomatic/kmfoomaticmanager.h index 4bf74371e..f3796904a 100644 --- a/kdeprint/foomatic/kmfoomaticmanager.h +++ b/kdeprint/foomatic/kmfoomaticmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/foomatic/make_driver_db_foomatic.c b/kdeprint/foomatic/make_driver_db_foomatic.c index 0419473f6..986a24447 100644 --- a/kdeprint/foomatic/make_driver_db_foomatic.c +++ b/kdeprint/foomatic/make_driver_db_foomatic.c @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/foomatic2loader.cpp b/kdeprint/foomatic2loader.cpp index d2fb5b17d..6add13378 100644 --- a/kdeprint/foomatic2loader.cpp +++ b/kdeprint/foomatic2loader.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,8 +26,8 @@ #include <kdebug.h> #include <klocale.h> -void kdeprint_foomatic2scanner_init( TQIODevice* ); -void kdeprint_foomatic2scanner_terminate(); +void tdeprint_foomatic2scanner_init( TQIODevice* ); +void tdeprint_foomatic2scanner_terminate(); Foomatic2Loader::Foomatic2Loader() { @@ -41,10 +41,10 @@ bool Foomatic2Loader::read( TQIODevice *d ) { bool result = true; m_foodata.clear(); - kdeprint_foomatic2scanner_init( d ); - if ( kdeprint_foomatic2parse( this ) != 0 ) + tdeprint_foomatic2scanner_init( d ); + if ( tdeprint_foomatic2parse( this ) != 0 ) result = false; - kdeprint_foomatic2scanner_terminate(); + tdeprint_foomatic2scanner_terminate(); return result; } diff --git a/kdeprint/foomatic2loader.h b/kdeprint/foomatic2loader.h index fe32ee8fa..19cfc9d9d 100644 --- a/kdeprint/foomatic2loader.h +++ b/kdeprint/foomatic2loader.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -46,7 +46,7 @@ public: private: TQMap<TQString,TQVariant> m_foodata; - friend int kdeprint_foomatic2parse( void* ); + friend int tdeprint_foomatic2parse( void* ); DrBase* createValue( const TQString&, const TQMap<TQString,TQVariant>& ) const; DrBase* createOption( const TQMap<TQString,TQVariant>& ) const; }; diff --git a/kdeprint/fooparser.cpp b/kdeprint/fooparser.cpp index 09ba34bf2..e919616ab 100644 --- a/kdeprint/fooparser.cpp +++ b/kdeprint/fooparser.cpp @@ -4,13 +4,13 @@ #define YYBISON 1 /* Identify Bison output. */ -#define yyparse kdeprint_foomatic2parse -#define yylex kdeprint_foomatic2lex -#define yyerror kdeprint_foomatic2error -#define yylval kdeprint_foomatic2lval -#define yychar kdeprint_foomatic2char -#define yydebug kdeprint_foomatic2debug -#define yynerrs kdeprint_foomatic2nerrs +#define yyparse tdeprint_foomatic2parse +#define yylex tdeprint_foomatic2lex +#define yyerror tdeprint_foomatic2error +#define yylval tdeprint_foomatic2lval +#define yychar tdeprint_foomatic2char +#define yydebug tdeprint_foomatic2debug +#define yynerrs tdeprint_foomatic2nerrs #define VAR 257 #define STRING 258 #define NUMBER 259 @@ -22,7 +22,7 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/fooparser.cpp.h b/kdeprint/fooparser.cpp.h index 9c8ec0180..dd694b5de 100644 --- a/kdeprint/fooparser.cpp.h +++ b/kdeprint/fooparser.cpp.h @@ -11,5 +11,5 @@ #define QUOTED 262 -extern YYSTYPE kdeprint_foomatic2lval; +extern YYSTYPE tdeprint_foomatic2lval; #endif diff --git a/kdeprint/fooparser.y b/kdeprint/fooparser.y index 1aaa4cf75..20626ce59 100644 --- a/kdeprint/fooparser.y +++ b/kdeprint/fooparser.y @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/fooscanner.cpp b/kdeprint/fooscanner.cpp index cab7426ab..3cdd4feb6 100644 --- a/kdeprint/fooscanner.cpp +++ b/kdeprint/fooscanner.cpp @@ -1,19 +1,19 @@ -#define yy_create_buffer kdeprint_foomatic2_create_buffer -#define yy_delete_buffer kdeprint_foomatic2_delete_buffer -#define yy_scan_buffer kdeprint_foomatic2_scan_buffer -#define yy_scan_string kdeprint_foomatic2_scan_string -#define yy_scan_bytes kdeprint_foomatic2_scan_bytes -#define yy_flex_debug kdeprint_foomatic2_flex_debug -#define yy_init_buffer kdeprint_foomatic2_init_buffer -#define yy_flush_buffer kdeprint_foomatic2_flush_buffer -#define yy_load_buffer_state kdeprint_foomatic2_load_buffer_state -#define yy_switch_to_buffer kdeprint_foomatic2_switch_to_buffer -#define yyin kdeprint_foomatic2in -#define yyleng kdeprint_foomatic2leng -#define yylex kdeprint_foomatic2lex -#define yyout kdeprint_foomatic2out -#define yyrestart kdeprint_foomatic2restart -#define yytext kdeprint_foomatic2text +#define yy_create_buffer tdeprint_foomatic2_create_buffer +#define yy_delete_buffer tdeprint_foomatic2_delete_buffer +#define yy_scan_buffer tdeprint_foomatic2_scan_buffer +#define yy_scan_string tdeprint_foomatic2_scan_string +#define yy_scan_bytes tdeprint_foomatic2_scan_bytes +#define yy_flex_debug tdeprint_foomatic2_flex_debug +#define yy_init_buffer tdeprint_foomatic2_init_buffer +#define yy_flush_buffer tdeprint_foomatic2_flush_buffer +#define yy_load_buffer_state tdeprint_foomatic2_load_buffer_state +#define yy_switch_to_buffer tdeprint_foomatic2_switch_to_buffer +#define yyin tdeprint_foomatic2in +#define yyleng tdeprint_foomatic2leng +#define yylex tdeprint_foomatic2lex +#define yyout tdeprint_foomatic2out +#define yyrestart tdeprint_foomatic2restart +#define yytext tdeprint_foomatic2text #line 19 "./fooscanner.cpp" /* A lexical scanner generated by flex */ @@ -427,7 +427,7 @@ char *yytext; #line 2 "./fooscanner.l" /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -449,13 +449,13 @@ char *yytext; #define YYSTYPE QVariant #include "fooparser.cpp.h" -#define yylval kdeprint_foomatic2lval +#define yylval tdeprint_foomatic2lval #define YY_INPUT( buf, result, max_size ) \ { \ - if ( kdeprint_foomatic2scanner_device ) \ + if ( tdeprint_foomatic2scanner_device ) \ { \ - result = kdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ + result = tdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ if ( result < 0 ) \ result = 0; \ } \ @@ -463,7 +463,7 @@ char *yytext; result = 0; \ } -TQIODevice* kdeprint_foomatic2scanner_device = NULL; +TQIODevice* tdeprint_foomatic2scanner_device = NULL; #line 468 "./fooscanner.cpp" /* Macros after this point can all be overridden by user definitions in @@ -1696,12 +1696,12 @@ int main() #line 73 "./fooscanner.l" -void kdeprint_foomatic2scanner_init( TQIODevice *d ) +void tdeprint_foomatic2scanner_init( TQIODevice *d ) { - kdeprint_foomatic2scanner_device = d; + tdeprint_foomatic2scanner_device = d; } -void kdeprint_foomatic2scanner_terminate() +void tdeprint_foomatic2scanner_terminate() { - kdeprint_foomatic2scanner_device = NULL; + tdeprint_foomatic2scanner_device = NULL; } diff --git a/kdeprint/fooscanner.l b/kdeprint/fooscanner.l index b93ab3bb0..ddd5bb974 100644 --- a/kdeprint/fooscanner.l +++ b/kdeprint/fooscanner.l @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,13 +23,13 @@ #define YYSTYPE QVariant #include "fooparser.cpp.h" -#define yylval kdeprint_foomatic2lval +#define yylval tdeprint_foomatic2lval #define YY_INPUT( buf, result, max_size ) \ { \ - if ( kdeprint_foomatic2scanner_device ) \ + if ( tdeprint_foomatic2scanner_device ) \ { \ - result = kdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ + result = tdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \ if ( result < 0 ) \ result = 0; \ } \ @@ -37,7 +37,7 @@ result = 0; \ } -QIODevice* kdeprint_foomatic2scanner_device = NULL; +QIODevice* tdeprint_foomatic2scanner_device = NULL; %} %option noyywrap @@ -72,12 +72,12 @@ D [[:digit:]] %% -void kdeprint_foomatic2scanner_init( QIODevice *d ) +void tdeprint_foomatic2scanner_init( QIODevice *d ) { - kdeprint_foomatic2scanner_device = d; + tdeprint_foomatic2scanner_device = d; } -void kdeprint_foomatic2scanner_terminate() +void tdeprint_foomatic2scanner_terminate() { - kdeprint_foomatic2scanner_device = NULL; + tdeprint_foomatic2scanner_device = NULL; } diff --git a/kdeprint/kdeprintcheck.cpp b/kdeprint/kdeprintcheck.cpp index 2cccde6de..1ace082a4 100644 --- a/kdeprint/kdeprintcheck.cpp +++ b/kdeprint/kdeprintcheck.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,7 +36,7 @@ * - run:/<execname> -> check for a running executable */ -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kdeprint/kdeprintcheck.h b/kdeprint/kdeprintcheck.h index f538dc2a4..ae1264a97 100644 --- a/kdeprint/kdeprintcheck.h +++ b/kdeprint/kdeprintcheck.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kdeprintd.cpp b/kdeprint/kdeprintd.cpp index e607629cb..d6237b2b2 100644 --- a/kdeprint/kdeprintd.cpp +++ b/kdeprint/kdeprintd.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. **/ -#include "kdeprintd.h" +#include "tdeprintd.h" #include "kprintprocess.h" #include <tqfile.h> @@ -42,7 +42,7 @@ extern "C" { - KDE_EXPORT KDEDModule *create_kdeprintd(const TQCString& name) + KDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name) { return new KDEPrintd(name); } @@ -123,7 +123,7 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla KURL url( re.cap( 1 ) ); if ( !url.isLocalFile() ) { - TQString tmpFilename = locateLocal( "tmp", "kdeprint_" + kapp->randomString( 8 ) ); + TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) ); command.replace( re, KProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); @@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) i18n("Provide root's Password"), "provideRootsPassword") == KMessageBox::Continue) { - cmd = ("kdesu -c " + KProcess::quote(cmd)); + cmd = ("tdesu -c " + KProcess::quote(cmd)); break; } else @@ -312,4 +312,4 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl; } -#include "kdeprintd.moc" +#include "tdeprintd.moc" diff --git a/kdeprint/kdeprintd.desktop b/kdeprint/kdeprintd.desktop index b30434c49..45cf8ece4 100644 --- a/kdeprint/kdeprintd.desktop +++ b/kdeprint/kdeprintd.desktop @@ -3,8 +3,8 @@ Type=Service ServiceTypes=KDEDModule X-KDE-ModuleType=Library -X-KDE-Library=kdeprintd -X-KDE-FactoryName=kdeprintd +X-KDE-Library=tdeprintd +X-KDE-FactoryName=tdeprintd X-KDE-Kded-autoload=false X-KDE-Kded-load-on-demand=true diff --git a/kdeprint/kdeprintd.h b/kdeprint/kdeprintd.h index 48fcdd021..597ffbc5b 100644 --- a/kdeprint/kdeprintd.h +++ b/kdeprint/kdeprintd.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kdeprintrc.upd b/kdeprint/kdeprintrc.upd index 6ac48a7ce..faf6abab8 100644 --- a/kdeprint/kdeprintrc.upd +++ b/kdeprint/kdeprintrc.upd @@ -1,5 +1,5 @@ Id=kde-3.1-toolbar -File=kdeprintrc +File=tdeprintrc Group=General Options=copy Key=ViewToolBar,ViewMenuBar diff --git a/kdeprint/kfilelist.cpp b/kdeprint/kfilelist.cpp index 85117a922..1f67851c6 100644 --- a/kdeprint/kfilelist.cpp +++ b/kdeprint/kfilelist.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kfilelist.h b/kdeprint/kfilelist.h index 8a7ecd50a..03b7977d8 100644 --- a/kdeprint/kfilelist.h +++ b/kdeprint/kfilelist.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmdbentry.cpp b/kdeprint/kmdbentry.cpp index 9402dd02c..34a0b60b4 100644 --- a/kdeprint/kmdbentry.cpp +++ b/kdeprint/kmdbentry.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmdbentry.h b/kdeprint/kmdbentry.h index 6de72c5ba..cccec92b6 100644 --- a/kdeprint/kmdbentry.h +++ b/kdeprint/kmdbentry.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmfactory.cpp b/kdeprint/kmfactory.cpp index 5c31cf5a9..3206d3cee 100644 --- a/kdeprint/kmfactory.cpp +++ b/kdeprint/kmfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ #include "kprinterimpl.h" #include "kprinter.h" #include "kpreloadobject.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "kxmlcommand.h" #include <tqdir.h> @@ -113,8 +113,8 @@ KMFactory::KMFactory() if ( !ok ) settings.writeEntry( "/qt/embedFonts", true ); - KGlobal::iconLoader()->addAppDir("kdeprint"); - KGlobal::locale()->insertCatalogue("kdeprint"); + KGlobal::iconLoader()->addAppDir("tdeprint"); + KGlobal::locale()->insertCatalogue("tdeprint"); // create DCOP signal connection connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); @@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst) if (sys.isEmpty()) // load default configured print plugin sys = printSystem(); - TQString libname = TQString::tqfromLatin1("kdeprint_%1").arg(sys); + TQString libname = TQString::tqfromLatin1("tdeprint_%1").arg(sys); m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname)); if (!m_factory) { @@ -228,7 +228,7 @@ KConfig* KMFactory::printConfig(const TQString& group) { if (!m_printconfig) { - m_printconfig = new KConfig("kdeprintrc"); + m_printconfig = new KConfig("tdeprintrc"); Q_CHECK_PTR(m_printconfig); } if (!group.isEmpty()) @@ -295,7 +295,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst) TQValueList<KMFactory::PluginInfo> KMFactory::pluginList() { - TQDir d(locate("data", "kdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files); + TQDir d(locate("data", "tdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files); TQValueList<PluginInfo> list; for (uint i=0; i<d.count(); i++) { @@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) { TQString path(name); if (path[0] != '/') - path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name)); + path = locate("data", TQString::tqfromLatin1("tdeprint/plugins/%1.print").arg(name)); KSimpleConfig conf(path); PluginInfo info; @@ -339,7 +339,7 @@ void KMFactory::registerObject(KPReloadObject *obj, bool priority) m_objects.prepend(obj); else m_objects.append(obj); - kdDebug(500) << "kdeprint: registering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; + kdDebug(500) << "tdeprint: registering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; } } @@ -347,7 +347,7 @@ void KMFactory::unregisterObject(KPReloadObject *obj) { // remove object from list (not deleted as autoDelete is false) m_objects.removeRef(obj); - kdDebug(500) << "kdeprint: unregistering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; + kdDebug(500) << "tdeprint: unregistering " << (void*)obj << ", number of objects = " << m_objects.count() << endl; } TQString KMFactory::autoDetect() @@ -414,14 +414,14 @@ void KMFactory::saveConfig() TQPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQString& user, const TQString& host, int port ) { - DCOPRef kdeprintd( "kded", "kdeprintd" ); + DCOPRef tdeprintd( "kded", "tdeprintd" ); /** * We do not use an internal event loop for 2 potential problems: * - the MessageWindow modality (appearing afterwards, it pops up on top * of the password dialog) * - KMTimer should be stopped, but it's unavailable from this object */ - DCOPReply reply = kdeprintd.call( "requestPassword", user, host, port, seqNbr ); + DCOPReply reply = tdeprintd.call( "requestPassword", user, host, port, seqNbr ); if ( reply.isValid() ) { TQString replyString = reply; @@ -440,14 +440,14 @@ TQPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQStrin void KMFactory::initPassword( const TQString& user, const TQString& password, const TQString& host, int port ) { - DCOPRef kdeprintd( "kded", "kdeprintd" ); + DCOPRef tdeprintd( "kded", "tdeprintd" ); /** * We do not use an internal event loop for 2 potential problems: * - the MessageWindow modality (appearing afterwards, it pops up on top * of the password dialog) * - KMTimer should be stopped, but it's unavailable from this object */ - kdeprintd.call( "initPassword", user, password, host, port ); + tdeprintd.call( "initPassword", user, password, host, port ); } #include "kmfactory.moc" diff --git a/kdeprint/kmfactory.h b/kdeprint/kmfactory.h index 326e5ea8b..168385f6e 100644 --- a/kdeprint/kmfactory.h +++ b/kdeprint/kmfactory.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kmjob.cpp b/kdeprint/kmjob.cpp index 5c904538b..ce7e95993 100644 --- a/kdeprint/kmjob.cpp +++ b/kdeprint/kmjob.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -78,7 +78,7 @@ TQString KMJob::pixmap() return TQString::tqfromLatin1("exec"); // normal case - QString str("kdeprint_job"); + QString str("tdeprint_job"); switch (m_state) { case KMJob::Printing: diff --git a/kdeprint/kmjob.h b/kdeprint/kmjob.h index 379f7cfd8..d8fed5e8d 100644 --- a/kdeprint/kmjob.h +++ b/kdeprint/kmjob.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <kdeprint/kmobject.h> +#include <tdeprint/kmobject.h> #include <kdelibs_export.h> /** diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp index 3449e1bb2..918c14ff2 100644 --- a/kdeprint/kmjobmanager.cpp +++ b/kdeprint/kmjobmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmjobmanager.h b/kdeprint/kmjobmanager.h index 8b95bf7ac..89cabaa7c 100644 --- a/kdeprint/kmjobmanager.h +++ b/kdeprint/kmjobmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp index 4fdc70f7e..01ca0dc77 100644 --- a/kdeprint/kmmanager.cpp +++ b/kdeprint/kmmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname) if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213) { f.close(); - destname = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); + destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); f.setName(destname); if (f.open(IO_WriteOnly)) @@ -422,7 +422,7 @@ TQString KMManager::testPage() conf->setGroup("General"); QString tpage = conf->readPathEntry("TestPage"); if (tpage.isEmpty()) - tpage = locate("data","kdeprint/testprint.ps"); + tpage = locate("data","tdeprint/testprint.ps"); return tpage; } diff --git a/kdeprint/kmmanager.h b/kdeprint/kmmanager.h index ecdacba06..df78adcd3 100644 --- a/kdeprint/kmmanager.h +++ b/kdeprint/kmmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ #warning internal header, do not use except if you are a KDEPrint developer #endif -#include <kdeprint/kmprinter.h> +#include <tdeprint/kmprinter.h> #include <tqobject.h> #include <tqstring.h> diff --git a/kdeprint/kmobject.h b/kdeprint/kmobject.h index 57824cd09..5b9358c49 100644 --- a/kdeprint/kmobject.h +++ b/kdeprint/kmobject.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kmprinter.cpp b/kdeprint/kmprinter.cpp index 5749a47c5..b18116ef8 100644 --- a/kdeprint/kmprinter.cpp +++ b/kdeprint/kmprinter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -90,7 +90,7 @@ TQString KMPrinter::pixmap() { if (!m_pixmap.isEmpty()) return m_pixmap; - QString str("kdeprint_printer"); + QString str("tdeprint_printer"); if (!isValid()) str.append("_defect"); else { diff --git a/kdeprint/kmprinter.h b/kdeprint/kmprinter.h index 7f527fb23..c6c2995e9 100644 --- a/kdeprint/kmprinter.h +++ b/kdeprint/kmprinter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,7 +29,7 @@ #include <tqptrlist.h> #include <kurl.h> #include <tqmap.h> -#include <kdeprint/kmobject.h> +#include <tdeprint/kmobject.h> class KMDBEntry; class DrMain; diff --git a/kdeprint/kmspecialmanager.cpp b/kdeprint/kmspecialmanager.cpp index ba742fc78..6da7f4ed7 100644 --- a/kdeprint/kmspecialmanager.cpp +++ b/kdeprint/kmspecialmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kmspecialmanager.h" #include "kmmanager.h" #include "kmprinter.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "kxmlcommand.h" #include "driver.h" @@ -46,11 +46,11 @@ bool KMSpecialManager::savePrinters() QString confname; if (getuid() == 0) { - confname = locate("data", "kdeprint/specials.desktop"); + confname = locate("data", "tdeprint/specials.desktop"); if (confname.startsWith(KGlobal::dirs()->localkdedir())) { // seems there's a problem here - m_mgr->setErrorMsg(i18n("A file share/kdeprint/specials.desktop was found in your " + m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " "local KDE directory. This file probably comes from a previous KDE " "release and should be removed in order to manage global pseudo " "printers.")); @@ -58,7 +58,7 @@ bool KMSpecialManager::savePrinters() } } else - confname = locateLocal("data","kdeprint/specials.desktop"); + confname = locateLocal("data","tdeprint/specials.desktop"); KSimpleConfig conf(confname); @@ -108,7 +108,7 @@ bool KMSpecialManager::loadPrinters() bool result(true); TQString localDir = KGlobal::dirs()->localkdedir(); - TQStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/specials.desktop"); + TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); // local files should processed last, so we need to reorder the list // and put local files at the end TQStringList orderedFiles; diff --git a/kdeprint/kmspecialmanager.h b/kdeprint/kmspecialmanager.h index 47adec6b2..b42aea1df 100644 --- a/kdeprint/kmspecialmanager.h +++ b/kdeprint/kmspecialmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmthreadjob.cpp b/kdeprint/kmthreadjob.cpp index 0fe277ee1..fcee4877f 100644 --- a/kdeprint/kmthreadjob.cpp +++ b/kdeprint/kmthreadjob.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob() TQString KMThreadJob::jobFile() { - QString f = locateLocal("data","kdeprint/printjobs"); + QString f = locateLocal("data","tdeprint/printjobs"); return f; } diff --git a/kdeprint/kmthreadjob.h b/kdeprint/kmthreadjob.h index b4eedfbfd..5bded6274 100644 --- a/kdeprint/kmthreadjob.h +++ b/kdeprint/kmthreadjob.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmuimanager.cpp b/kdeprint/kmuimanager.cpp index 78f5c209f..962653dd2 100644 --- a/kdeprint/kmuimanager.cpp +++ b/kdeprint/kmuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmuimanager.h b/kdeprint/kmuimanager.h index 478dbc0df..248ad4ed7 100644 --- a/kdeprint/kmuimanager.h +++ b/kdeprint/kmuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmvirtualmanager.cpp b/kdeprint/kmvirtualmanager.cpp index 22ad5ec39..78757decd 100644 --- a/kdeprint/kmvirtualmanager.cpp +++ b/kdeprint/kmvirtualmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kmvirtualmanager.h b/kdeprint/kmvirtualmanager.h index 5725854e2..1b7ab4867 100644 --- a/kdeprint/kmvirtualmanager.h +++ b/kdeprint/kmvirtualmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp index 6d7a29c8c..bc0e03e0d 100644 --- a/kdeprint/kpcopiespage.cpp +++ b/kdeprint/kpcopiespage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -270,7 +270,7 @@ void KPCopiesPage::slotRangeEntered() void KPCopiesPage::slotCollateClicked() { - TQString s("kdeprint_"); + TQString s("tdeprint_"); s.append((m_collate->isChecked() ? "collate" : "uncollate")); if (m_order->isChecked()) s.append("_reverse"); m_collatepix->setPixmap(UserIcon(s)); diff --git a/kdeprint/kpcopiespage.h b/kdeprint/kpcopiespage.h index 9aff7ef8d..1e1532ce9 100644 --- a/kdeprint/kpcopiespage.h +++ b/kdeprint/kpcopiespage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +21,7 @@ #define KPCOPIESPAGE_H #include "kprintdialogpage.h" -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> class TQRadioButton; class TQLineEdit; diff --git a/kdeprint/kpdriverpage.cpp b/kdeprint/kpdriverpage.cpp index a7dd2b61d..18cfeb207 100644 --- a/kdeprint/kpdriverpage.cpp +++ b/kdeprint/kpdriverpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpdriverpage.h b/kdeprint/kpdriverpage.h index 90f3ebb2d..5c3936e49 100644 --- a/kdeprint/kpdriverpage.h +++ b/kdeprint/kpdriverpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpfileselectpage.cpp b/kdeprint/kpfileselectpage.cpp index 54ccfdd6b..f3131717a 100644 --- a/kdeprint/kpfileselectpage.cpp +++ b/kdeprint/kpfileselectpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpfileselectpage.h b/kdeprint/kpfileselectpage.h index 518f5a106..11ed378ff 100644 --- a/kdeprint/kpfileselectpage.h +++ b/kdeprint/kpfileselectpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpfilterpage.cpp b/kdeprint/kpfilterpage.cpp index fcea863a2..b321b3141 100644 --- a/kdeprint/kpfilterpage.cpp +++ b/kdeprint/kpfilterpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpfilterpage.h b/kdeprint/kpfilterpage.h index 83368e1d4..72065b3f1 100644 --- a/kdeprint/kpfilterpage.h +++ b/kdeprint/kpfilterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp index ac7dfdae0..98ab5d4a6 100644 --- a/kdeprint/kpgeneralpage.cpp +++ b/kdeprint/kpgeneralpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -696,11 +696,11 @@ void KPGeneralPage::slotOrientationChanged(int ID) TQString iconstr; switch (ID) { - case ORIENT_PORTRAIT_ID: iconstr = "kdeprint_portrait"; break; - case ORIENT_LANDSCAPE_ID: iconstr = "kdeprint_landscape"; break; - case ORIENT_REVPORTRAIT_ID: iconstr = "kdeprint_revportrait"; break; - case ORIENT_REVLANDSCAPE_ID: iconstr = "kdeprint_revlandscape"; break; - default: iconstr = "kdeprint_portrait"; break; + case ORIENT_PORTRAIT_ID: iconstr = "tdeprint_portrait"; break; + case ORIENT_LANDSCAPE_ID: iconstr = "tdeprint_landscape"; break; + case ORIENT_REVPORTRAIT_ID: iconstr = "tdeprint_revportrait"; break; + case ORIENT_REVLANDSCAPE_ID: iconstr = "tdeprint_revlandscape"; break; + default: iconstr = "tdeprint_portrait"; break; } m_orientpix->setPixmap(UserIcon(iconstr)); } @@ -710,10 +710,10 @@ void KPGeneralPage::slotNupChanged(int ID) TQString iconstr; switch (ID) { - case NUP_1_ID: iconstr = "kdeprint_nup1"; break; - case NUP_2_ID: iconstr = "kdeprint_nup2"; break; - case NUP_4_ID: iconstr = "kdeprint_nup4"; break; - default: iconstr = "kdeprint_nup1"; break; + case NUP_1_ID: iconstr = "tdeprint_nup1"; break; + case NUP_2_ID: iconstr = "tdeprint_nup2"; break; + case NUP_4_ID: iconstr = "tdeprint_nup4"; break; + default: iconstr = "tdeprint_nup1"; break; } m_nuppix->setPixmap(UserIcon(iconstr)); } @@ -725,10 +725,10 @@ void KPGeneralPage::slotDuplexChanged(int ID) TQString iconstr; switch (ID) { - case DUPLEX_NONE_ID: iconstr = "kdeprint_duplex_none"; break; - case DUPLEX_LONG_ID: iconstr = "kdeprint_duplex_long"; break; - case DUPLEX_SHORT_ID: iconstr = "kdeprint_duplex_short"; break; - default: iconstr = "kdeprint_duplex_none"; break; + case DUPLEX_NONE_ID: iconstr = "tdeprint_duplex_none"; break; + case DUPLEX_LONG_ID: iconstr = "tdeprint_duplex_long"; break; + case DUPLEX_SHORT_ID: iconstr = "tdeprint_duplex_short"; break; + default: iconstr = "tdeprint_duplex_none"; break; } m_duplexpix->setPixmap(UserIcon(iconstr)); } diff --git a/kdeprint/kpgeneralpage.h b/kdeprint/kpgeneralpage.h index 643b19b59..2a211ab04 100644 --- a/kdeprint/kpgeneralpage.h +++ b/kdeprint/kpgeneralpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kpipeprocess.cpp b/kdeprint/kpipeprocess.cpp index a3ef560c8..daf3c2900 100644 --- a/kdeprint/kpipeprocess.cpp +++ b/kdeprint/kpipeprocess.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpipeprocess.h b/kdeprint/kpipeprocess.h index 8cf3dbf30..0ead3da78 100644 --- a/kdeprint/kpipeprocess.h +++ b/kdeprint/kpipeprocess.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpmarginpage.cpp b/kdeprint/kpmarginpage.cpp index 309a3dfd2..554679ee7 100644 --- a/kdeprint/kpmarginpage.cpp +++ b/kdeprint/kpmarginpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kpmarginpage.h b/kdeprint/kpmarginpage.h index fd6da6920..4d52686fd 100644 --- a/kdeprint/kpmarginpage.h +++ b/kdeprint/kpmarginpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpposterpage.cpp b/kdeprint/kpposterpage.cpp index 1fa7a23b5..d82e5b572 100644 --- a/kdeprint/kpposterpage.cpp +++ b/kdeprint/kpposterpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpposterpage.h b/kdeprint/kpposterpage.h index ec10a920d..ce4858aa3 100644 --- a/kdeprint/kpposterpage.h +++ b/kdeprint/kpposterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp index 4bf107389..e2c28ebb1 100644 --- a/kdeprint/kpqtpage.cpp +++ b/kdeprint/kpqtpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -225,12 +225,12 @@ void KPQtPage::init() void KPQtPage::slotOrientationChanged(int ID) { - m_orientpix->setPixmap(UserIcon((ID == ORIENT_PORTRAIT_ID ? "kdeprint_portrait" : "kdeprint_landscape"))); + m_orientpix->setPixmap(UserIcon((ID == ORIENT_PORTRAIT_ID ? "tdeprint_portrait" : "tdeprint_landscape"))); } void KPQtPage::slotColorModeChanged(int ID) { - m_colorpix->setPixmap(UserIcon((ID == COLORMODE_COLOR_ID ? "kdeprint_color" : "kdeprint_grayscale"))); + m_colorpix->setPixmap(UserIcon((ID == COLORMODE_COLOR_ID ? "tdeprint_color" : "tdeprint_grayscale"))); } void KPQtPage::slotNupChanged(int ID) @@ -238,10 +238,10 @@ void KPQtPage::slotNupChanged(int ID) QString pixstr; switch (ID) { - case NUP_1: pixstr = "kdeprint_nup1"; break; - case NUP_2: pixstr = "kdeprint_nup2"; break; - case NUP_4: pixstr = "kdeprint_nup4"; break; - case NUP_OTHER: pixstr = "kdeprint_nupother"; break; + case NUP_1: pixstr = "tdeprint_nup1"; break; + case NUP_2: pixstr = "tdeprint_nup2"; break; + case NUP_4: pixstr = "tdeprint_nup4"; break; + case NUP_OTHER: pixstr = "tdeprint_nupother"; break; } m_nuppix->setPixmap(UserIcon(pixstr)); } diff --git a/kdeprint/kpqtpage.h b/kdeprint/kpqtpage.h index 723f35e04..0ab4361f4 100644 --- a/kdeprint/kpqtpage.h +++ b/kdeprint/kpqtpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpreloadobject.cpp b/kdeprint/kpreloadobject.cpp index 10acda92f..af9e299cd 100644 --- a/kdeprint/kpreloadobject.cpp +++ b/kdeprint/kpreloadobject.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kpreloadobject.h b/kdeprint/kpreloadobject.h index 3c8e87b30..09bbe97d6 100644 --- a/kdeprint/kpreloadobject.h +++ b/kdeprint/kpreloadobject.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp index 4e62e791b..e275ed559 100644 --- a/kdeprint/kprintaction.cpp +++ b/kdeprint/kprintaction.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kprintaction.h" #include <kprinter.h> -#include <kdeprint/kmmanager.h> +#include <tdeprint/kmmanager.h> #include <kiconloader.h> #include <kpopupmenu.h> #include <klocale.h> diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h index eb23d6e31..f6ba35d34 100644 --- a/kdeprint/kprintaction.h +++ b/kdeprint/kprintaction.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp index ebdc6ae42..5cb56819e 100644 --- a/kdeprint/kprintdialog.cpp +++ b/kdeprint/kprintdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -288,9 +288,9 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) m_printerlabel->setBuddy(d->m_printers); d->m_properties = new KPushButton(KGuiItem(i18n("P&roperties"), "edit"), m_pbox); TQWhatsThis::add( d->m_properties, whatsThisPrintJobProperties); - d->m_options = new KPushButton(KGuiItem(i18n("System Op&tions"), "kdeprint_configmgr"), this); + d->m_options = new KPushButton(KGuiItem(i18n("System Op&tions"), "tdeprint_configmgr"), this); TQWhatsThis::add(d->m_options,whatsThisSystemOptions); - d->m_default = new KPushButton(KGuiItem(i18n("Set as &Default"), "kdeprint_defaultsoft"), m_pbox); + d->m_default = new KPushButton(KGuiItem(i18n("Set as &Default"), "tdeprint_defaultsoft"), m_pbox); TQWhatsThis::add(d->m_default,whatsThisSetDefaultPrinter); d->m_filter = new TQPushButton(m_pbox); d->m_filter->setPixmap(SmallIcon("filter")); @@ -914,7 +914,7 @@ void KPrintDialog::slotToggleFilter(bool on) void KPrintDialog::slotHelp() { - kapp->invokeHelp(TQString::null, "kdeprint"); + kapp->invokeHelp(TQString::null, "tdeprint"); } void KPrintDialog::slotOutputFileSelected(const TQString& txt) diff --git a/kdeprint/kprintdialog.h b/kdeprint/kprintdialog.h index 0e4adfd64..77484ca58 100644 --- a/kdeprint/kprintdialog.h +++ b/kdeprint/kprintdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,7 +26,7 @@ #include <kdialog.h> #include <tqptrlist.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> class KPrinter; class KPrintDialogPage; diff --git a/kdeprint/kprintdialogpage.cpp b/kdeprint/kprintdialogpage.cpp index 0bd860623..58861019a 100644 --- a/kdeprint/kprintdialogpage.cpp +++ b/kdeprint/kprintdialogpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprintdialogpage.h b/kdeprint/kprintdialogpage.h index 1802eb6ec..d9b44b6ea 100644 --- a/kdeprint/kprintdialogpage.h +++ b/kdeprint/kprintdialogpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -39,7 +39,7 @@ class DrMain; * "kde-appname-optionname" for internal reasons. * * \code - * #include <kdeprint/kprintdialogpage.h> + * #include <tdeprint/kprintdialogpage.h> * * class MyDialogPage : public KPrintDialogPage * { diff --git a/kdeprint/kprinter.cpp b/kdeprint/kprinter.cpp index edd924456..67d276990 100644 --- a/kdeprint/kprinter.cpp +++ b/kdeprint/kprinter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -409,7 +409,7 @@ bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer) args << "-d"; args << printerName(); args << "--noshow"; - kapp->kdeinitExec("kjobviewer", args); + kapp->tdeinitExec("kjobviewer", args); } } } diff --git a/kdeprint/kprinter.h b/kdeprint/kprinter.h index 7a6f21569..4910c23ef 100644 --- a/kdeprint/kprinter.h +++ b/kdeprint/kprinter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ #include <kdemacros.h> #include <kdelibs_export.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> class KPrinterImpl; class KPrintDialogPage; @@ -78,7 +78,7 @@ class DrPageSize; * of the print dialog to integrate application specific print options. This is done by subclassing * KPrintDialogPage and adding the page using addDialogPage(). * - * When compiling an application that uses KPrinter, you must link to -lkdeprint, which when + * When compiling an application that uses KPrinter, you must link to -ltdeprint, which when * using the standard KDE build framework can be done by adding $(LIB_KDEPRINT) to _LDADD. * * @short The central interface class to access the KDE print system. @@ -106,7 +106,7 @@ public: * page selection will be enabled in the print dialog, otherwise it will be * disabled. However some applications (word processor) can do page selection * themselves, then it will be enabled in the print dialog, whatever the - * print system used. But such an application has to tell kdeprint about its + * print system used. But such an application has to tell tdeprint about its * feature: * @li @p ApplicationSide: the application will do page selection * @li @p SystemSide: page selection will be left to the print system, if available (default) diff --git a/kdeprint/kprinterimpl.cpp b/kdeprint/kprinterimpl.cpp index 7d0d9477a..166ae7207 100644 --- a/kdeprint/kprinterimpl.cpp +++ b/kdeprint/kprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -194,7 +194,7 @@ void KPrinterImpl::broadcastOption(const TQString& key, const TQString& value) int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool removeflag) { - kdDebug(500) << "kdeprint: print command: " << cmd << endl; + kdDebug(500) << "tdeprint: print command: " << cmd << endl; int result = 0; DCOPClient *dclient = kapp->dcopClient(); @@ -209,7 +209,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool arg << cmd; arg << files; arg << removeflag; - if (dclient->call( "kded", "kdeprintd", "print(TQString,TQStringList,bool)", data, replyType, replyData )) + if (dclient->call( "kded", "tdeprintd", "print(TQString,TQStringList,bool)", data, replyType, replyData )) { if (replyType == "int") { @@ -222,7 +222,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) { - kdDebug(500) << "kdeprint: status message: " << msg << endl; + kdDebug(500) << "tdeprint: status message: " << msg << endl; KConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); if (!conf->readBoolEntry("ShowStatusMsg", true)) @@ -243,7 +243,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) arg << message; arg << (int)getpid(); arg << kapp->caption(); - dclient->send( "kded", "kdeprintd", "statusMessage(TQString,int,TQString)", data ); + dclient->send( "kded", "tdeprintd", "statusMessage(TQString,int,TQString)", data ); } bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const TQStringList& files, bool flag) @@ -278,7 +278,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T { TQString msg = i18n("Unable to start child print process. "); if (pid == 0) - msg += i18n("The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this server is running."); + msg += i18n("The KDE print server (<b>tdeprintd</b>) could not be contacted. Check that this server is running."); else msg += i18n("1 is the command that <files> is given to", "Check the command syntax:\n%1 <files>").arg(cmd); printer->setErrorMessage(msg); @@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile() { TQString f; // be sure the file doesn't exist - do f = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); + do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); return f; } @@ -372,7 +372,7 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ return -1; } } - kdDebug(500) << "kdeprint: filter command: " << filtercmd << endl; + kdDebug(500) << "tdeprint: filter command: " << filtercmd << endl; TQString rin("%in"), rout("%out"), rpsl("%psl"), rpsu("%psu"); TQString ps = pageSizeToPageName( printer->option( "kde-printsize" ).isEmpty() ? printer->pageSize() : ( KPrinter::PageSize )printer->option( "kde-printsize" ).toInt() ); @@ -508,7 +508,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool TQString::null, i18n("Convert"), i18n("Keep"), - TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) + TQString::tqfromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes) { // find the filter chain TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType); diff --git a/kdeprint/kprinterimpl.h b/kdeprint/kprinterimpl.h index b06d77706..618d9a429 100644 --- a/kdeprint/kprinterimpl.h +++ b/kdeprint/kprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprinterpropertydialog.cpp b/kdeprint/kprinterpropertydialog.cpp index d2036bcf1..1128a7d3a 100644 --- a/kdeprint/kprinterpropertydialog.cpp +++ b/kdeprint/kprinterpropertydialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kprinterpropertydialog.h b/kdeprint/kprinterpropertydialog.h index 9264ea0d1..98a37d8bd 100644 --- a/kdeprint/kprinterpropertydialog.h +++ b/kdeprint/kprinterpropertydialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprintpreview.cpp b/kdeprint/kprintpreview.cpp index 6d385c17c..235472d1f 100644 --- a/kdeprint/kprintpreview.cpp +++ b/kdeprint/kprintpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or @@ -106,7 +106,7 @@ public: static KLibFactory* componentFactory() { - kdDebug(500) << "kdeprint: querying trader for 'application/postscript' service" << endl; + kdDebug(500) << "tdeprint: querying trader for 'application/postscript' service" << endl; KLibFactory *factory(0); factory = KLibLoader::self()->factory("libkghostviewpart"); if( factory ) @@ -147,7 +147,7 @@ static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOn KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) : KDialogBase(parent, "PreviewDlg", true, i18n("Print Preview"), 0) { - kdDebug(500) << "kdeprint: creating preview dialog" << endl; + kdDebug(500) << "tdeprint: creating preview dialog" << endl; d = new KPrintPreviewPrivate(this); d->previewonly_ = previewOnly; diff --git a/kdeprint/kprintpreview.h b/kdeprint/kprintpreview.h index 9193bad3e..5fd581fe7 100644 --- a/kdeprint/kprintpreview.h +++ b/kdeprint/kprintpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/kprintprocess.cpp b/kdeprint/kprintprocess.cpp index f18addde8..fb1df2840 100644 --- a/kdeprint/kprintprocess.cpp +++ b/kdeprint/kprintprocess.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kprintprocess.h b/kdeprint/kprintprocess.h index 13943d05d..976b35afe 100644 --- a/kdeprint/kprintprocess.h +++ b/kdeprint/kprintprocess.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp index 24c0e88df..81dc5d3d5 100644 --- a/kdeprint/kxmlcommand.cpp +++ b/kdeprint/kxmlcommand.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kxmlcommand.h" #include "driver.h" #include "kmfactory.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "driverview.h" #include <tqfile.h> @@ -199,7 +199,7 @@ void KXmlCommand::setComment( const TQString& s ) bool KXmlCommand::isValid() { - return (!locate("data", "kdeprint/filters/"+name()+".desktop").isEmpty()); + return (!locate("data", "tdeprint/filters/"+name()+".desktop").isEmpty()); } void KXmlCommand::check(bool use_xml) @@ -218,7 +218,7 @@ void KXmlCommand::check(bool use_xml) void KXmlCommand::loadDesktop() { - KSimpleConfig conf(locate("data", "kdeprint/filters/"+name()+".desktop")); + KSimpleConfig conf(locate("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("KDE Print Filter Entry"); d->m_description = conf.readEntry("Comment"); d->m_outputMime = conf.readEntry("MimeTypeOut"); @@ -229,7 +229,7 @@ void KXmlCommand::loadDesktop() void KXmlCommand::saveDesktop() { - KSimpleConfig conf(locateLocal("data", "kdeprint/filters/"+name()+".desktop")); + KSimpleConfig conf(locateLocal("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("KDE Print Filter Entry"); conf.writeEntry("Comment", d->m_description); conf.writeEntry("MimeTypeIn", d->m_inputMime); @@ -240,7 +240,7 @@ void KXmlCommand::saveDesktop() void KXmlCommand::loadXml() { - TQFile f(locate("data", "kdeprint/filters/"+name()+".xml")); + TQFile f(locate("data", "tdeprint/filters/"+name()+".xml")); TQDomDocument doc; if (f.open(IO_ReadOnly) && doc.setContent(&f) && doc.documentElement().tagName() == "kprintfilter") { @@ -425,7 +425,7 @@ void KXmlCommand::getOptions(TQMap<TQString,TQString>& opts, bool incldef) void KXmlCommand::saveXml() { - TQFile f(locateLocal("data", "kdeprint/filters/"+name()+".xml")); + TQFile f(locateLocal("data", "tdeprint/filters/"+name()+".xml")); if (!f.open(IO_WriteOnly)) return; @@ -576,7 +576,7 @@ KXmlCommand* KXmlCommandManager::loadCommand(const TQString& xmlId, bool check) { if (check) { - TQString desktopFile = locate("data", "kdeprint/filters/"+xmlId+".desktop"); + TQString desktopFile = locate("data", "tdeprint/filters/"+xmlId+".desktop"); if (desktopFile.isEmpty()) return 0; } @@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList() { if (d->m_cmdlist.isEmpty()) { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kdeprint/filters/"); + TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/"); for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) { diff --git a/kdeprint/kxmlcommand.h b/kdeprint/kxmlcommand.h index e24266f49..a0ba90c56 100644 --- a/kdeprint/kxmlcommand.h +++ b/kdeprint/kxmlcommand.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/Makefile.am b/kdeprint/lpd/Makefile.am index 7230fba1b..5c6559a27 100644 --- a/kdeprint/lpd/Makefile.am +++ b/kdeprint/lpd/Makefile.am @@ -1,18 +1,18 @@ -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes) -kde_module_LTLIBRARIES = kdeprint_lpd.la +kde_module_LTLIBRARIES = tdeprint_lpd.la -kdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \ +tdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \ lpdtools.cpp gschecker.cpp -kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la -kdeprint_lpd_la_METASOURCES = AUTO +tdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_lpd_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la +tdeprint_lpd_la_METASOURCES = AUTO noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h bin_PROGRAMS = make_driver_db_lpd make_driver_db_lpd_SOURCES = make_driver_db_lpd.c -make_driver_db_lpd_LDADD = $(top_builddir)/kdecore/libtdefakes.la +make_driver_db_lpd_LDADD = $(top_builddir)/tdecore/libtdefakes.la entry_DATA = lpd.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp index 23f6be0a6..9fe6e290b 100644 --- a/kdeprint/lpd/gschecker.cpp +++ b/kdeprint/lpd/gschecker.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/gschecker.h b/kdeprint/lpd/gschecker.h index 1814ca1d7..c3c23a5be 100644 --- a/kdeprint/lpd/gschecker.h +++ b/kdeprint/lpd/gschecker.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/klpdprinterimpl.cpp b/kdeprint/lpd/klpdprinterimpl.cpp index 8b365cbd1..59f04e74c 100644 --- a/kdeprint/lpd/klpdprinterimpl.cpp +++ b/kdeprint/lpd/klpdprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/klpdprinterimpl.h b/kdeprint/lpd/klpdprinterimpl.h index 654c2606e..a757d0c8c 100644 --- a/kdeprint/lpd/klpdprinterimpl.h +++ b/kdeprint/lpd/klpdprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/kmlpdfactory.cpp b/kdeprint/lpd/kmlpdfactory.cpp index a1882c3ca..05ee61bd5 100644 --- a/kdeprint/lpd/kmlpdfactory.cpp +++ b/kdeprint/lpd/kmlpdfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ extern "C" { - void* init_kdeprint_lpd() + void* init_tdeprint_lpd() { return new KLpdFactory; } diff --git a/kdeprint/lpd/kmlpdfactory.h b/kdeprint/lpd/kmlpdfactory.h index 924c48b81..ffc05af71 100644 --- a/kdeprint/lpd/kmlpdfactory.h +++ b/kdeprint/lpd/kmlpdfactory.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp index 54f6c312a..a5612ad58 100644 --- a/kdeprint/lpd/kmlpdmanager.cpp +++ b/kdeprint/lpd/kmlpdmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/kmlpdmanager.h b/kdeprint/lpd/kmlpdmanager.h index 0af2d1e15..3c2291017 100644 --- a/kdeprint/lpd/kmlpdmanager.h +++ b/kdeprint/lpd/kmlpdmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/kmlpduimanager.cpp b/kdeprint/lpd/kmlpduimanager.cpp index be243c688..fad3fcd58 100644 --- a/kdeprint/lpd/kmlpduimanager.cpp +++ b/kdeprint/lpd/kmlpduimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/kmlpduimanager.h b/kdeprint/lpd/kmlpduimanager.h index 0483df181..7aca6ed1d 100644 --- a/kdeprint/lpd/kmlpduimanager.h +++ b/kdeprint/lpd/kmlpduimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp index ba96f31a0..610e8ead5 100644 --- a/kdeprint/lpd/lpdtools.cpp +++ b/kdeprint/lpd/lpdtools.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/lpdtools.h b/kdeprint/lpd/lpdtools.h index 3592437e6..692dd0fa2 100644 --- a/kdeprint/lpd/lpdtools.h +++ b/kdeprint/lpd/lpdtools.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpd/make_driver_db_lpd.c b/kdeprint/lpd/make_driver_db_lpd.c index e907dbf2c..02aced962 100644 --- a/kdeprint/lpd/make_driver_db_lpd.c +++ b/kdeprint/lpd/make_driver_db_lpd.c @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpdunix/CMakeLists.txt b/kdeprint/lpdunix/CMakeLists.txt index 5816af6ab..5b30cf46c 100644 --- a/kdeprint/lpdunix/CMakeLists.txt +++ b/kdeprint/lpdunix/CMakeLists.txt @@ -18,12 +18,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -33,12 +33,12 @@ link_directories( ##### other data ################################ -install( FILES lpdunix.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) +install( FILES lpdunix.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) -#### kdeprint_lpdunix ########################### +#### tdeprint_lpdunix ########################### -set( target kdeprint_lpdunix ) +set( target tdeprint_lpdunix ) set( ${target}_SRCS kmlpdunixfactory.cpp kmlpdunixmanager.cpp @@ -47,6 +47,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/lpdunix/Makefile.am b/kdeprint/lpdunix/Makefile.am index 89b08d839..019ead755 100644 --- a/kdeprint/lpdunix/Makefile.am +++ b/kdeprint/lpdunix/Makefile.am @@ -1,15 +1,15 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes) -kde_module_LTLIBRARIES = kdeprint_lpdunix.la +kde_module_LTLIBRARIES = tdeprint_lpdunix.la -kdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp -kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) -kdeprint_lpdunix_la_METASOURCES = AUTO +tdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp +tdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) +tdeprint_lpdunix_la_METASOURCES = AUTO noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h entry_DATA = lpdunix.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/lpdunix/klpdunixprinterimpl.cpp b/kdeprint/lpdunix/klpdunixprinterimpl.cpp index 8a680ae6e..9ba97efae 100644 --- a/kdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/kdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpdunix/klpdunixprinterimpl.h b/kdeprint/lpdunix/klpdunixprinterimpl.h index cc16f10f2..bbbda4104 100644 --- a/kdeprint/lpdunix/klpdunixprinterimpl.h +++ b/kdeprint/lpdunix/klpdunixprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpdunix/kmlpdunixfactory.cpp b/kdeprint/lpdunix/kmlpdunixfactory.cpp index 8ebb19f22..70925a65c 100644 --- a/kdeprint/lpdunix/kmlpdunixfactory.cpp +++ b/kdeprint/lpdunix/kmlpdunixfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,6 +24,6 @@ #include <kgenericfactory.h> typedef K_TYPELIST_3( KMLpdUnixManager, KLpdUnixPrinterImpl, KMLpdUnixUiManager ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_lpdunix, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_lpdunix, KGenericFactory< Products > ) diff --git a/kdeprint/lpdunix/kmlpdunixmanager.cpp b/kdeprint/lpdunix/kmlpdunixmanager.cpp index 8e757a706..afcd83b2a 100644 --- a/kdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/kdeprint/lpdunix/kmlpdunixmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpdunix/kmlpdunixmanager.h b/kdeprint/lpdunix/kmlpdunixmanager.h index 7abc91752..8716f8351 100644 --- a/kdeprint/lpdunix/kmlpdunixmanager.h +++ b/kdeprint/lpdunix/kmlpdunixmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpdunix/kmlpdunixuimanager.cpp b/kdeprint/lpdunix/kmlpdunixuimanager.cpp index 5dc281c85..686dfecbb 100644 --- a/kdeprint/lpdunix/kmlpdunixuimanager.cpp +++ b/kdeprint/lpdunix/kmlpdunixuimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpdunix/kmlpdunixuimanager.h b/kdeprint/lpdunix/kmlpdunixuimanager.h index 23616e511..6e9e0d2ef 100644 --- a/kdeprint/lpdunix/kmlpdunixuimanager.h +++ b/kdeprint/lpdunix/kmlpdunixuimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/CMakeLists.txt b/kdeprint/lpr/CMakeLists.txt index 56de888b9..c893411b1 100644 --- a/kdeprint/lpr/CMakeLists.txt +++ b/kdeprint/lpr/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint - ${CMAKE_SOURCE_DIR}/kdeprint/management + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint + ${CMAKE_SOURCE_DIR}/tdeprint/management ) link_directories( @@ -36,18 +36,18 @@ link_directories( install( FILES printcapentry.h lprhandler.h lprsettings.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint/lpr ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint/lpr ) ##### other data ################################ -install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) -install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) +install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) +install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) -#### kdeprint_lpr ############################### +#### tdeprint_lpr ############################### -set( target kdeprint_lpr ) +set( target tdeprint_lpr ) set( ${target}_SRCS printcapreader.cpp lprhandler.cpp matichandler.cpp @@ -60,7 +60,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -75,6 +75,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static kdefakes-shared ${DL_LIBRARIES} + LINK driverparse-static tdefakes-shared ${DL_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/lpr/Makefile.am b/kdeprint/lpr/Makefile.am index cb40661f9..a9039888f 100644 --- a/kdeprint/lpr/Makefile.am +++ b/kdeprint/lpr/Makefile.am @@ -1,10 +1,10 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes) -kde_module_LTLIBRARIES = kdeprint_lpr.la +kde_module_LTLIBRARIES = tdeprint_lpr.la -kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \ +tdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \ matichandler.cpp klprfactory.cpp kmlprmanager.cpp \ kmlpruimanager.cpp lpchelper.cpp lpqhelper.cpp \ kmlprjobmanager.cpp matichelper.cpp \ @@ -12,10 +12,10 @@ kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \ lprsettings.cpp kmconfiglpr.cpp apshandler.cpp \ lprngtoolhandler.cpp \ editentrydialog.cpp -kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la \ +tdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_lpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la \ $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) -kdeprint_lpr_la_METASOURCES = AUTO +tdeprint_lpr_la_METASOURCES = AUTO noinst_HEADERS = printcapreader.h \ matichandler.h kmlprmanager.h \ @@ -25,16 +25,16 @@ noinst_HEADERS = printcapreader.h \ lprngtoolhandler.h \ editentrydialog.h -kdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h -kdeprintlprdir = $(includedir)/kdeprint/lpr +tdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h +tdeprintlprdir = $(includedir)/tdeprint/lpr bin_PROGRAMS = make_driver_db_lpr make_driver_db_lpr_SOURCES = make_driver_db_lpr.c make_driver_db_lpr_LDFLAGS = $(all_libraries) -make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libtdefakes.la ../libdriverparse.a $(LIBDL) +make_driver_db_lpr_LDADD = $(top_builddir)/tdecore/libtdefakes.la ../libdriverparse.a $(LIBDL) entry_DATA = lpr.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins miscdata_DATA = apsdriver1 apsdriver2 lprngtooldriver1 -miscdatadir = $(kde_datadir)/kdeprint +miscdatadir = $(kde_datadir)/tdeprint diff --git a/kdeprint/lpr/apshandler.cpp b/kdeprint/lpr/apshandler.cpp index 641ff5e07..d4107d7c7 100644 --- a/kdeprint/lpr/apshandler.cpp +++ b/kdeprint/lpr/apshandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -196,7 +196,7 @@ DrMain* ApsHandler::loadDbDriver(const TQString& s) DrMain* ApsHandler::loadApsDriver(bool config) { - DrMain *driver = loadToolDriver(locate("data", (config ? "kdeprint/apsdriver1" : "kdeprint/apsdriver2"))); + DrMain *driver = loadToolDriver(locate("data", (config ? "tdeprint/apsdriver1" : "tdeprint/apsdriver2"))); if (driver) driver->set("text", "APS Common Driver"); return driver; diff --git a/kdeprint/lpr/apshandler.h b/kdeprint/lpr/apshandler.h index 02ee79c92..db213d194 100644 --- a/kdeprint/lpr/apshandler.h +++ b/kdeprint/lpr/apshandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/editentrydialog.cpp b/kdeprint/lpr/editentrydialog.cpp index 9029a6736..6c4ecc30c 100644 --- a/kdeprint/lpr/editentrydialog.cpp +++ b/kdeprint/lpr/editentrydialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/editentrydialog.h b/kdeprint/lpr/editentrydialog.h index c51152627..f4359dd89 100644 --- a/kdeprint/lpr/editentrydialog.h +++ b/kdeprint/lpr/editentrydialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/klprfactory.cpp b/kdeprint/lpr/klprfactory.cpp index 86666981e..4764dfc6a 100644 --- a/kdeprint/lpr/klprfactory.cpp +++ b/kdeprint/lpr/klprfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,5 +25,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_4( KMLprManager, KMLprUiManager, KMLprJobManager, KLprPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_lpr, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_lpr, KGenericFactory< Products > ) diff --git a/kdeprint/lpr/klprprinterimpl.cpp b/kdeprint/lpr/klprprinterimpl.cpp index 9f0956ff3..70356f23c 100644 --- a/kdeprint/lpr/klprprinterimpl.cpp +++ b/kdeprint/lpr/klprprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/klprprinterimpl.h b/kdeprint/lpr/klprprinterimpl.h index ca346ab8a..508173f1d 100644 --- a/kdeprint/lpr/klprprinterimpl.h +++ b/kdeprint/lpr/klprprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/kmconfiglpr.cpp b/kdeprint/lpr/kmconfiglpr.cpp index f9f51b46d..f43a8da2d 100644 --- a/kdeprint/lpr/kmconfiglpr.cpp +++ b/kdeprint/lpr/kmconfiglpr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/kmconfiglpr.h b/kdeprint/lpr/kmconfiglpr.h index 1f88d9fb7..7f3d50857 100644 --- a/kdeprint/lpr/kmconfiglpr.h +++ b/kdeprint/lpr/kmconfiglpr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/kmlprjobmanager.cpp b/kdeprint/lpr/kmlprjobmanager.cpp index 67e7a4001..851663664 100644 --- a/kdeprint/lpr/kmlprjobmanager.cpp +++ b/kdeprint/lpr/kmlprjobmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/kmlprjobmanager.h b/kdeprint/lpr/kmlprjobmanager.h index 83d65a296..d9a8eae3f 100644 --- a/kdeprint/lpr/kmlprjobmanager.h +++ b/kdeprint/lpr/kmlprjobmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/kmlprmanager.cpp b/kdeprint/lpr/kmlprmanager.cpp index 64e593590..cf4dbbb94 100644 --- a/kdeprint/lpr/kmlprmanager.cpp +++ b/kdeprint/lpr/kmlprmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -137,7 +137,7 @@ void KMLprManager::initHandlers() insertHandler(new LPRngToolHandler(this)); // now load external handlers - TQStringList l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.la"); + TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); @@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt) void KMLprManager::createPluginActions(KActionCollection *coll) { - KAction *act = new KAction(i18n("&Edit printcap Entry..."), "kdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); + KAction *act = new KAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); act->setGroup("plugin"); } diff --git a/kdeprint/lpr/kmlprmanager.h b/kdeprint/lpr/kmlprmanager.h index d95fb7db5..34d38340f 100644 --- a/kdeprint/lpr/kmlprmanager.h +++ b/kdeprint/lpr/kmlprmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/kmlpruimanager.cpp b/kdeprint/lpr/kmlpruimanager.cpp index ea48c9bf9..655309e0c 100644 --- a/kdeprint/lpr/kmlpruimanager.cpp +++ b/kdeprint/lpr/kmlpruimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/kmlpruimanager.h b/kdeprint/lpr/kmlpruimanager.h index e7e015e2a..561f93500 100644 --- a/kdeprint/lpr/kmlpruimanager.h +++ b/kdeprint/lpr/kmlpruimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lpchelper.cpp b/kdeprint/lpr/lpchelper.cpp index 7cf0bfebf..c921a803c 100644 --- a/kdeprint/lpr/lpchelper.cpp +++ b/kdeprint/lpr/lpchelper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lpchelper.h b/kdeprint/lpr/lpchelper.h index 8f2590065..b1e20f089 100644 --- a/kdeprint/lpr/lpchelper.h +++ b/kdeprint/lpr/lpchelper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lpqhelper.cpp b/kdeprint/lpr/lpqhelper.cpp index 3bd1c514b..30348f591 100644 --- a/kdeprint/lpr/lpqhelper.cpp +++ b/kdeprint/lpr/lpqhelper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lpqhelper.h b/kdeprint/lpr/lpqhelper.h index 59965fb62..2c38566c5 100644 --- a/kdeprint/lpr/lpqhelper.h +++ b/kdeprint/lpr/lpqhelper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lprhandler.cpp b/kdeprint/lpr/lprhandler.cpp index d3fc4ee94..fcb838bb9 100644 --- a/kdeprint/lpr/lprhandler.cpp +++ b/kdeprint/lpr/lprhandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lprhandler.h b/kdeprint/lpr/lprhandler.h index eaab2557f..e0e66e146 100644 --- a/kdeprint/lpr/lprhandler.h +++ b/kdeprint/lpr/lprhandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lprngtoolhandler.cpp b/kdeprint/lpr/lprngtoolhandler.cpp index 2d94e9b18..1d76cf2f5 100644 --- a/kdeprint/lpr/lprngtoolhandler.cpp +++ b/kdeprint/lpr/lprngtoolhandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -163,7 +163,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool return NULL; } - DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); + DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1")); if (driver) { TQString model = prt->option("driverID"); @@ -183,7 +183,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool DrMain* LPRngToolHandler::loadDbDriver(const TQString& s) { int p = s.find('/'); - DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); + DrMain* driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1")); if (driver) driver->set("driverID", s.mid(p+1)); return driver; @@ -231,7 +231,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr) return opts; if (m_dict.count() == 0) - m_dict = loadChoiceDict(locate("data", "kdeprint/lprngtooldriver1")); + m_dict = loadChoiceDict(locate("data", "tdeprint/lprngtooldriver1")); TQString unknown; for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) diff --git a/kdeprint/lpr/lprngtoolhandler.h b/kdeprint/lpr/lprngtoolhandler.h index e8843dc64..49641ca3a 100644 --- a/kdeprint/lpr/lprngtoolhandler.h +++ b/kdeprint/lpr/lprngtoolhandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lprsettings.cpp b/kdeprint/lpr/lprsettings.cpp index a1a632a0f..0c1cec2a9 100644 --- a/kdeprint/lpr/lprsettings.cpp +++ b/kdeprint/lpr/lprsettings.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/lprsettings.h b/kdeprint/lpr/lprsettings.h index 419ec46d1..01abbeeb3 100644 --- a/kdeprint/lpr/lprsettings.h +++ b/kdeprint/lpr/lprsettings.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,7 +25,7 @@ #endif #include <tqobject.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> /** * @internal diff --git a/kdeprint/lpr/matichandler.cpp b/kdeprint/lpr/matichandler.cpp index bd3307ad5..ef2f1584b 100644 --- a/kdeprint/lpr/matichandler.cpp +++ b/kdeprint/lpr/matichandler.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/matichandler.h b/kdeprint/lpr/matichandler.h index db376f264..e30eee39e 100644 --- a/kdeprint/lpr/matichandler.h +++ b/kdeprint/lpr/matichandler.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/matichelper.cpp b/kdeprint/lpr/matichelper.cpp index 1da5f6313..ec0041b7c 100644 --- a/kdeprint/lpr/matichelper.cpp +++ b/kdeprint/lpr/matichelper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/matichelper.h b/kdeprint/lpr/matichelper.h index 622dd06aa..5a2b64fe3 100644 --- a/kdeprint/lpr/matichelper.h +++ b/kdeprint/lpr/matichelper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/printcapentry.cpp b/kdeprint/lpr/printcapentry.cpp index 3f3af643b..9c83537e4 100644 --- a/kdeprint/lpr/printcapentry.cpp +++ b/kdeprint/lpr/printcapentry.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001,2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/printcapentry.h b/kdeprint/lpr/printcapentry.h index a7f2cabcf..f8ba99197 100644 --- a/kdeprint/lpr/printcapentry.h +++ b/kdeprint/lpr/printcapentry.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/printcapreader.cpp b/kdeprint/lpr/printcapreader.cpp index 72a6e2903..00016c14f 100644 --- a/kdeprint/lpr/printcapreader.cpp +++ b/kdeprint/lpr/printcapreader.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/lpr/printcapreader.h b/kdeprint/lpr/printcapreader.h index 51aac90d1..2236e5068 100644 --- a/kdeprint/lpr/printcapreader.h +++ b/kdeprint/lpr/printcapreader.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/CMakeLists.txt b/kdeprint/management/CMakeLists.txt index c9fe6a5a9..0e12299e6 100644 --- a/kdeprint/management/CMakeLists.txt +++ b/kdeprint/management/CMakeLists.txt @@ -18,16 +18,16 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -40,19 +40,19 @@ link_directories( install( FILES kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint ) ##### other data ################################ install( FILES tileup.png tiledown.png side.png - DESTINATION ${DATA_INSTALL_DIR}/kdeprint ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint ) -#### kdeprint_management ######################## +#### tdeprint_management ######################## -set( target kdeprint_management ) +set( target tdeprint_management ) set( ${target}_SRCS kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp @@ -77,7 +77,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -87,12 +87,12 @@ tde_add_library( ${target} SHARED AUTOMOC set( target libtdeprint_management_module ) set( ${target}_SRCS - kdeprint_management_module.cpp + tdeprint_management_module.cpp ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -105,7 +105,7 @@ set( ${target}_SRCS kaddprinterwizard.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint-shared + LINK tdeprint-shared ) diff --git a/kdeprint/management/Makefile.am b/kdeprint/management/Makefile.am index 0cc693b68..34f8de935 100644 --- a/kdeprint/management/Makefile.am +++ b/kdeprint/management/Makefile.am @@ -1,10 +1,10 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) +INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = libtdeprint_management.la kde_module_LTLIBRARIES = libtdeprint_management_module.la -kdeinit_LTLIBRARIES = kaddprinterwizard.la +tdeinit_LTLIBRARIES = kaddprinterwizard.la bin_PROGRAMS = kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp @@ -29,12 +29,12 @@ libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-und libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) libtdeprint_management_la_METASOURCES = AUTO -libtdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp +libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) -kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h -kdeprintdir = $(includedir)/kdeprint +tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h +tdeprintdir = $(includedir)/tdeprint noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \ kminfopage.h kmmainview.h kmpages.h \ @@ -48,5 +48,5 @@ noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \ kmconfigfilter.h kmconfigfonts.h kmconfigjobs.h networkscanner.h dataicon_DATA = tileup.png tiledown.png side.png -dataicondir = $(kde_datadir)/kdeprint +dataicondir = $(kde_datadir)/tdeprint diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp index 4163a87fe..af04ee170 100644 --- a/kdeprint/management/cjanuswidget.cpp +++ b/kdeprint/management/cjanuswidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h index 6deec3149..d33be1499 100644 --- a/kdeprint/management/cjanuswidget.h +++ b/kdeprint/management/cjanuswidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/jobitem.cpp b/kdeprint/management/jobitem.cpp index 171a91657..a9ce2fe85 100644 --- a/kdeprint/management/jobitem.cpp +++ b/kdeprint/management/jobitem.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/jobitem.h b/kdeprint/management/jobitem.h index 31c7923d8..580a1b84f 100644 --- a/kdeprint/management/jobitem.h +++ b/kdeprint/management/jobitem.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kdeprint_management_module.cpp b/kdeprint/management/kdeprint_management_module.cpp index 70c7b4cfd..8d4027f75 100644 --- a/kdeprint/management/kdeprint_management_module.cpp +++ b/kdeprint/management/kdeprint_management_module.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * Copyright (C) 2004 Dominique Devriese <devriese@kde.org> * * This library is free software; you can redistribute it and/or @@ -34,7 +34,7 @@ extern "C" { KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent) { - return kdeprint_management_add_printer_wizard( parent ); + return tdeprint_management_add_printer_wizard( parent ); } KDEPRINT_EXPORT bool config_dialog(TQWidget *parent) diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp index c042213f7..8bf4d5a10 100644 --- a/kdeprint/management/kiconselectaction.cpp +++ b/kdeprint/management/kiconselectaction.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kiconselectaction.h b/kdeprint/management/kiconselectaction.h index dfd6ea17b..84bef60d2 100644 --- a/kdeprint/management/kiconselectaction.h +++ b/kdeprint/management/kiconselectaction.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp index 65d4d34f4..32fb7db11 100644 --- a/kdeprint/management/kmconfigcommand.cpp +++ b/kdeprint/management/kmconfigcommand.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigcommand.h b/kdeprint/management/kmconfigcommand.h index 2ec662d95..203e6fd3a 100644 --- a/kdeprint/management/kmconfigcommand.h +++ b/kdeprint/management/kmconfigcommand.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigdialog.cpp b/kdeprint/management/kmconfigdialog.cpp index f2ddf7b57..3bd89a751 100644 --- a/kdeprint/management/kmconfigdialog.cpp +++ b/kdeprint/management/kmconfigdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigdialog.h b/kdeprint/management/kmconfigdialog.h index ed60378c5..de04bc154 100644 --- a/kdeprint/management/kmconfigdialog.h +++ b/kdeprint/management/kmconfigdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp index 967a67908..29d5107e0 100644 --- a/kdeprint/management/kmconfigfilter.cpp +++ b/kdeprint/management/kmconfigfilter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigfilter.h b/kdeprint/management/kmconfigfilter.h index b69f10c08..9571f0d54 100644 --- a/kdeprint/management/kmconfigfilter.h +++ b/kdeprint/management/kmconfigfilter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp index e5f47de3b..183d0b621 100644 --- a/kdeprint/management/kmconfigfonts.cpp +++ b/kdeprint/management/kmconfigfonts.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigfonts.h b/kdeprint/management/kmconfigfonts.h index 1d1483ed7..a93a26d75 100644 --- a/kdeprint/management/kmconfigfonts.h +++ b/kdeprint/management/kmconfigfonts.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp index 96e8668de..40d187c3c 100644 --- a/kdeprint/management/kmconfiggeneral.cpp +++ b/kdeprint/management/kmconfiggeneral.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfiggeneral.h b/kdeprint/management/kmconfiggeneral.h index 23739a152..8fc6fa5ab 100644 --- a/kdeprint/management/kmconfiggeneral.h +++ b/kdeprint/management/kmconfiggeneral.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp index f70b1a33f..1088e1b3a 100644 --- a/kdeprint/management/kmconfigjobs.cpp +++ b/kdeprint/management/kmconfigjobs.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigjobs.h b/kdeprint/management/kmconfigjobs.h index 73d6274ba..34be5b1ef 100644 --- a/kdeprint/management/kmconfigjobs.h +++ b/kdeprint/management/kmconfigjobs.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigpage.cpp b/kdeprint/management/kmconfigpage.cpp index b31575d33..fb967e05d 100644 --- a/kdeprint/management/kmconfigpage.cpp +++ b/kdeprint/management/kmconfigpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigpage.h b/kdeprint/management/kmconfigpage.h index 596b8c5ec..d56fbde8b 100644 --- a/kdeprint/management/kmconfigpage.h +++ b/kdeprint/management/kmconfigpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp index aa030019b..cd777ec7a 100644 --- a/kdeprint/management/kmconfigpreview.cpp +++ b/kdeprint/management/kmconfigpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmconfigpreview.h b/kdeprint/management/kmconfigpreview.h index 359fcb227..a9c826c98 100644 --- a/kdeprint/management/kmconfigpreview.h +++ b/kdeprint/management/kmconfigpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp index 7bdefbe0e..1a89d0a8e 100644 --- a/kdeprint/management/kmdbcreator.cpp +++ b/kdeprint/management/kmdbcreator.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h index 8b076e517..319d270c0 100644 --- a/kdeprint/management/kmdbcreator.h +++ b/kdeprint/management/kmdbcreator.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp index 973be686e..6fbab45ec 100644 --- a/kdeprint/management/kmdriverdb.cpp +++ b/kdeprint/management/kmdriverdb.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB() TQString KMDriverDB::dbFile() { // this calls insure missing directories creation - TQString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); + TQString filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); return filename; } diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h index 3913d74ef..c5af6d53e 100644 --- a/kdeprint/management/kmdriverdb.h +++ b/kdeprint/management/kmdriverdb.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp index e8a00c44d..e9c490206 100644 --- a/kdeprint/management/kmdriverdbwidget.cpp +++ b/kdeprint/management/kmdriverdbwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmdriverdbwidget.h b/kdeprint/management/kmdriverdbwidget.h index 27d8dcb6a..05b50536d 100644 --- a/kdeprint/management/kmdriverdbwidget.h +++ b/kdeprint/management/kmdriverdbwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmdriverdialog.cpp b/kdeprint/management/kmdriverdialog.cpp index 2e79a8c6f..ef37e333c 100644 --- a/kdeprint/management/kmdriverdialog.cpp +++ b/kdeprint/management/kmdriverdialog.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmdriverdialog.h b/kdeprint/management/kmdriverdialog.h index 8720213d7..8b7b01c45 100644 --- a/kdeprint/management/kmdriverdialog.h +++ b/kdeprint/management/kmdriverdialog.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp index 7afaf1537..1fa5a6da9 100644 --- a/kdeprint/management/kmiconview.cpp +++ b/kdeprint/management/kmiconview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h index 1c3aeb542..1fd6fbbda 100644 --- a/kdeprint/management/kmiconview.h +++ b/kdeprint/management/kmiconview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp index c8c80117c..ad43f1ccb 100644 --- a/kdeprint/management/kminfopage.cpp +++ b/kdeprint/management/kminfopage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kminfopage.h b/kdeprint/management/kminfopage.h index b0dd3a935..591fdbfe8 100644 --- a/kdeprint/management/kminfopage.h +++ b/kdeprint/management/kminfopage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp index a2d024546..25c037516 100644 --- a/kdeprint/management/kminstancepage.cpp +++ b/kdeprint/management/kminstancepage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kminstancepage.h b/kdeprint/management/kminstancepage.h index 3b8931100..7a3075d73 100644 --- a/kdeprint/management/kminstancepage.h +++ b/kdeprint/management/kminstancepage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp index 508595998..7f168faed 100644 --- a/kdeprint/management/kmjobviewer.cpp +++ b/kdeprint/management/kmjobviewer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -128,7 +128,7 @@ void KMJobViewer::setPrinter(const TQString& prname) { // We need to trigger a refresh even if the printer // has not changed, some jobs may have been canceled - // outside kdeprint. We can't return simply if + // outside tdeprint. We can't return simply if // prname == m_prname. if (m_prname != prname) { @@ -298,7 +298,7 @@ void KMJobViewer::initActions() } // Filter actions - KActionMenu *fact = new KActionMenu(i18n("&Select Printer"), "kdeprint_printer", actionCollection(), "filter_modify"); + KActionMenu *fact = new KActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify"); fact->setDelayed(false); connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); diff --git a/kdeprint/management/kmjobviewer.h b/kdeprint/management/kmjobviewer.h index a8ac7d0af..650fe4b15 100644 --- a/kdeprint/management/kmjobviewer.h +++ b/kdeprint/management/kmjobviewer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp index b9e4b738b..72d6872cb 100644 --- a/kdeprint/management/kmlistview.cpp +++ b/kdeprint/management/kmlistview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -123,7 +123,7 @@ KMListView::KMListView(TQWidget *parent, const char *name) connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport())); m_root = new KMListViewItem(this,i18n("Print System")); - m_root->setPixmap(0,SmallIcon("kdeprint_printer")); + m_root->setPixmap(0,SmallIcon("tdeprint_printer")); m_root->setOpen(true); m_classes = new KMListViewItem(m_root,i18n("Classes")); m_classes->setPixmap(0,SmallIcon("package")); diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h index 9f5b24b46..20ddc5731 100644 --- a/kdeprint/management/kmlistview.h +++ b/kdeprint/management/kmlistview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp index a1a63d61f..f5f905af3 100644 --- a/kdeprint/management/kmmainview.cpp +++ b/kdeprint/management/kmmainview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -60,7 +60,7 @@ #undef m_manager #define m_manager KMFactory::self()->manager() -int kdeprint_management_add_printer_wizard( TQWidget* parent ) +int tdeprint_management_add_printer_wizard( TQWidget* parent ) { KMWizard dlg(parent); int flag(0); @@ -181,24 +181,24 @@ void KMMainView::initActions() vact->setCurrentItem(0); connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); - KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "kdeprint_printstate", m_actions, "printer_state_change"); + KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new KAction(i18n("&Start Printer"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new KAction(i18n("Sto&p Printer"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new KAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new KAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); - stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "kdeprint_queuestate", m_actions, "printer_spool_change"); + stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); new KAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); new KAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); - new KAction(i18n("Add &Printer/Class..."),"kdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); - new KAction(i18n("Add &Special (pseudo) Printer..."),"kdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new KAction(i18n("Set as &Local Default"),"kdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new KAction(i18n("Set as &User Default"),"kdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new KAction(i18n("&Test Printer..."),"kdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); - new KAction(i18n("Configure &Manager..."),"kdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new KAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); + new KAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new KAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new KAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new KAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); + new KAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); new KAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); KIconSelectAction *dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); @@ -208,9 +208,9 @@ void KMMainView::initActions() dact->setCurrentItem(0); connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); - new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); - new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); - new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure"); + new KAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); + new KAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new KAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure"); KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); @@ -218,8 +218,8 @@ void KMMainView::initActions() tact = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); tact->setCheckedState(i18n("Hide Me&nu Toolbar")); connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); - tact = new KToggleAction(i18n("Show Pr&inter Details"),"kdeprint_printer_infos", 0,m_actions,"view_printerinfos"); - tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"kdeprint_printer_infos")); + tact = new KToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos"); + tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos")); tact->setChecked(true); connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); @@ -233,7 +233,7 @@ void KMMainView::initActions() KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); mact->setDelayed(false); connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); - TQStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/tools/*.desktop"); + TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { KSimpleConfig conf(*it); @@ -301,7 +301,7 @@ void KMMainView::initActions() m_actions->action("manager_configure")->plug( menu ); m_actions->action("view_refresh")->plug( menu ); //m_menubar->insertItem( i18n( "Manager" ), menu ); - m_menubar->insertButton( "kdeprint_configmgr", 3, true, i18n( "Print Manager" ) ); + m_menubar->insertButton( "tdeprint_configmgr", 3, true, i18n( "Print Manager" ) ); m_menubar->getButton( 3 )->setPopup( menu, true ); menu = new TQPopupMenu( this ); m_actions->action("view_printerinfos")->plug( menu ); @@ -586,7 +586,7 @@ void KMMainView::slotAdd() KMTimer::self()->hold(); int result(0); - if ((result=kdeprint_management_add_printer_wizard(this)) == -1) + if ((result=tdeprint_management_add_printer_wizard(this)) == -1) showErrorMsg(i18n("Unable to create printer.")); KMTimer::self()->release((result == 1)); @@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID) KMTimer::self()->hold(); TQString libname = m_toollist[ID]; - libname.prepend("kdeprint_tool_"); + libname.prepend("tdeprint_tool_"); if (m_current && !m_current->device().isEmpty() && !libname.isEmpty()) { KLibFactory *factory = KLibLoader::self()->factory(libname.local8Bit()); @@ -906,12 +906,12 @@ void KMMainView::slotHelp() { TQString s = TQT_TQOBJECT_CONST(sender())->name(); if ( s == "invoke_help" ) - kapp->invokeHelp( TQString::null, "kdeprint" ); + kapp->invokeHelp( TQString::null, "tdeprint" ); else if ( s == "invoke_web" ) { TQStringList args; args << "exec" << "http://printing.kde.org"; - kapp->kdeinitExec( "kfmclient", args ); + kapp->tdeinitExec( "kfmclient", args ); } else kdDebug( 500 ) << "Unknown help invokator: " << s << endl; diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h index c924b3e90..0d05692d9 100644 --- a/kdeprint/management/kmmainview.h +++ b/kdeprint/management/kmmainview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,7 +25,7 @@ #endif #include <tqwidget.h> -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> #include <kmainwindow.h> class KMManager; @@ -128,6 +128,6 @@ private: KToolBar *m_menubar; }; -KDEPRINT_EXPORT int kdeprint_management_add_printer_wizard( TQWidget* parent ); +KDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent ); #endif diff --git a/kdeprint/management/kmpages.cpp b/kdeprint/management/kmpages.cpp index be7f2f87a..4f0f1f4f7 100644 --- a/kdeprint/management/kmpages.cpp +++ b/kdeprint/management/kmpages.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpages.h b/kdeprint/management/kmpages.h index 75ad4641a..761c8d22d 100644 --- a/kdeprint/management/kmpages.h +++ b/kdeprint/management/kmpages.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmprinterpage.h b/kdeprint/management/kmprinterpage.h index cfce97ec7..25e5b1c12 100644 --- a/kdeprint/management/kmprinterpage.h +++ b/kdeprint/management/kmprinterpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp index 5eff6d946..19264a946 100644 --- a/kdeprint/management/kmprinterview.cpp +++ b/kdeprint/management/kmprinterview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h index 0b3a17789..ba1bd38b1 100644 --- a/kdeprint/management/kmprinterview.h +++ b/kdeprint/management/kmprinterview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropbackend.cpp b/kdeprint/management/kmpropbackend.cpp index 7dfdc500d..98004d2ed 100644 --- a/kdeprint/management/kmpropbackend.cpp +++ b/kdeprint/management/kmpropbackend.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropbackend.h b/kdeprint/management/kmpropbackend.h index adcabbdd2..01249d348 100644 --- a/kdeprint/management/kmpropbackend.h +++ b/kdeprint/management/kmpropbackend.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropcontainer.cpp b/kdeprint/management/kmpropcontainer.cpp index 20ab492e7..9c7808199 100644 --- a/kdeprint/management/kmpropcontainer.cpp +++ b/kdeprint/management/kmpropcontainer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropcontainer.h b/kdeprint/management/kmpropcontainer.h index 411bb7134..d191dfeb6 100644 --- a/kdeprint/management/kmpropcontainer.h +++ b/kdeprint/management/kmpropcontainer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropdriver.cpp b/kdeprint/management/kmpropdriver.cpp index 086ccacca..55daf0ed5 100644 --- a/kdeprint/management/kmpropdriver.cpp +++ b/kdeprint/management/kmpropdriver.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropdriver.h b/kdeprint/management/kmpropdriver.h index 6eb8873bf..247431762 100644 --- a/kdeprint/management/kmpropdriver.h +++ b/kdeprint/management/kmpropdriver.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropertypage.cpp b/kdeprint/management/kmpropertypage.cpp index 74341ad9b..e0526ad5a 100644 --- a/kdeprint/management/kmpropertypage.cpp +++ b/kdeprint/management/kmpropertypage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropertypage.h b/kdeprint/management/kmpropertypage.h index 5698beff8..d13338750 100644 --- a/kdeprint/management/kmpropertypage.h +++ b/kdeprint/management/kmpropertypage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,7 +22,7 @@ #include "cjanuswidget.h" #include "kmprinterpage.h" -#include <kdeprint/kpreloadobject.h> +#include <tdeprint/kpreloadobject.h> #include <kdelibs_export.h> #include <tqptrlist.h> diff --git a/kdeprint/management/kmpropgeneral.cpp b/kdeprint/management/kmpropgeneral.cpp index f32817fb6..c55603da9 100644 --- a/kdeprint/management/kmpropgeneral.cpp +++ b/kdeprint/management/kmpropgeneral.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropgeneral.h b/kdeprint/management/kmpropgeneral.h index dd2c1cd43..c4e403b86 100644 --- a/kdeprint/management/kmpropgeneral.h +++ b/kdeprint/management/kmpropgeneral.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp index adc3ebbbe..4efbcf547 100644 --- a/kdeprint/management/kmpropmembers.cpp +++ b/kdeprint/management/kmpropmembers.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -35,7 +35,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); main_->addWidget(m_members); - m_pixmap = "kdeprint_printer_class"; + m_pixmap = "tdeprint_printer_class"; m_title = i18n("Members"); m_header = i18n("Class Members"); } diff --git a/kdeprint/management/kmpropmembers.h b/kdeprint/management/kmpropmembers.h index a8e90e6cd..90330681e 100644 --- a/kdeprint/management/kmpropmembers.h +++ b/kdeprint/management/kmpropmembers.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropwidget.cpp b/kdeprint/management/kmpropwidget.cpp index b112c390b..ae8b03cbf 100644 --- a/kdeprint/management/kmpropwidget.cpp +++ b/kdeprint/management/kmpropwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmpropwidget.h b/kdeprint/management/kmpropwidget.h index a9c2b918f..83148bc72 100644 --- a/kdeprint/management/kmpropwidget.h +++ b/kdeprint/management/kmpropwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp index 346e858f4..6569f3f83 100644 --- a/kdeprint/management/kmspecialprinterdlg.cpp +++ b/kdeprint/management/kmspecialprinterdlg.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,7 +19,7 @@ #include "kmspecialprinterdlg.h" #include "kmprinter.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include "kmfactory.h" #include "kmspecialmanager.h" #include "kxmlcommandselector.h" diff --git a/kdeprint/management/kmspecialprinterdlg.h b/kdeprint/management/kmspecialprinterdlg.h index 1ff688cf6..bc7497a05 100644 --- a/kdeprint/management/kmspecialprinterdlg.h +++ b/kdeprint/management/kmspecialprinterdlg.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmtimer.cpp b/kdeprint/management/kmtimer.cpp index 099d358f6..1525dd875 100644 --- a/kdeprint/management/kmtimer.cpp +++ b/kdeprint/management/kmtimer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmtimer.h b/kdeprint/management/kmtimer.h index 6dcf962a0..eb40e7957 100644 --- a/kdeprint/management/kmtimer.h +++ b/kdeprint/management/kmtimer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp index d05564115..e39b52f8d 100644 --- a/kdeprint/management/kmwbackend.cpp +++ b/kdeprint/management/kmwbackend.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwbackend.h b/kdeprint/management/kmwbackend.h index 98cf8e7ef..223123b4f 100644 --- a/kdeprint/management/kmwbackend.h +++ b/kdeprint/management/kmwbackend.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp index 2e27db0c9..a87388a6f 100644 --- a/kdeprint/management/kmwclass.cpp +++ b/kdeprint/management/kmwclass.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwclass.h b/kdeprint/management/kmwclass.h index 1fadf45f4..c9b63befb 100644 --- a/kdeprint/management/kmwclass.h +++ b/kdeprint/management/kmwclass.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp index d0a38e17d..58793c192 100644 --- a/kdeprint/management/kmwdriver.cpp +++ b/kdeprint/management/kmwdriver.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwdriver.h b/kdeprint/management/kmwdriver.h index cb49246b6..9eef02069 100644 --- a/kdeprint/management/kmwdriver.h +++ b/kdeprint/management/kmwdriver.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwdriverselect.cpp b/kdeprint/management/kmwdriverselect.cpp index 353fc0861..e3d253660 100644 --- a/kdeprint/management/kmwdriverselect.cpp +++ b/kdeprint/management/kmwdriverselect.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwdriverselect.h b/kdeprint/management/kmwdriverselect.h index 281989074..464a78239 100644 --- a/kdeprint/management/kmwdriverselect.h +++ b/kdeprint/management/kmwdriverselect.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwdrivertest.cpp b/kdeprint/management/kmwdrivertest.cpp index f1b9bc48b..545d3b94d 100644 --- a/kdeprint/management/kmwdrivertest.cpp +++ b/kdeprint/management/kmwdrivertest.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -52,7 +52,7 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) TQLabel *l2 = new TQLabel(i18n("<b>Model:</b>"), this); TQLabel *l3 = new TQLabel(i18n("<b>Description:</b>"), this); - m_test = new KPushButton(KGuiItem(i18n("&Test"), "kdeprint_testprinter"), this); + m_test = new KPushButton(KGuiItem(i18n("&Test"), "tdeprint_testprinter"), this); m_settings = new KPushButton(KGuiItem(i18n("&Settings"), "configure"), this); TQLabel *l0 = new TQLabel(this); diff --git a/kdeprint/management/kmwdrivertest.h b/kdeprint/management/kmwdrivertest.h index 2689e7c22..5c1aefaee 100644 --- a/kdeprint/management/kmwdrivertest.h +++ b/kdeprint/management/kmwdrivertest.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp index 9da4096c6..54294fb13 100644 --- a/kdeprint/management/kmwend.cpp +++ b/kdeprint/management/kmwend.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwend.h b/kdeprint/management/kmwend.h index fa74a6553..626eedf96 100644 --- a/kdeprint/management/kmwend.h +++ b/kdeprint/management/kmwend.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp index 190868d03..32da27c03 100644 --- a/kdeprint/management/kmwfile.cpp +++ b/kdeprint/management/kmwfile.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwfile.h b/kdeprint/management/kmwfile.h index 2e6997372..40e2e2171 100644 --- a/kdeprint/management/kmwfile.h +++ b/kdeprint/management/kmwfile.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwinfobase.cpp b/kdeprint/management/kmwinfobase.cpp index 835042c59..993576334 100644 --- a/kdeprint/management/kmwinfobase.cpp +++ b/kdeprint/management/kmwinfobase.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwinfobase.h b/kdeprint/management/kmwinfobase.h index c33058fe0..9a2b6464e 100644 --- a/kdeprint/management/kmwinfobase.h +++ b/kdeprint/management/kmwinfobase.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwinfopage.cpp b/kdeprint/management/kmwinfopage.cpp index abfa2993c..1e9652e93 100644 --- a/kdeprint/management/kmwinfopage.cpp +++ b/kdeprint/management/kmwinfopage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwinfopage.h b/kdeprint/management/kmwinfopage.h index aefa675fe..346d29401 100644 --- a/kdeprint/management/kmwinfopage.h +++ b/kdeprint/management/kmwinfopage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp index fead7c4e3..5dc915572 100644 --- a/kdeprint/management/kmwizard.cpp +++ b/kdeprint/management/kmwizard.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -244,7 +244,7 @@ void KMWizard::slotNext() void KMWizard::slotHelp() { - kapp->invokeHelp(TQString::null, "kdeprint"); + kapp->invokeHelp(TQString::null, "tdeprint"); } void KMWizard::enableWizard() diff --git a/kdeprint/management/kmwizard.h b/kdeprint/management/kmwizard.h index b23c7b1f3..5a2dcb6ea 100644 --- a/kdeprint/management/kmwizard.h +++ b/kdeprint/management/kmwizard.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwizardpage.cpp b/kdeprint/management/kmwizardpage.cpp index 936a30c87..10149d0f9 100644 --- a/kdeprint/management/kmwizardpage.cpp +++ b/kdeprint/management/kmwizardpage.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwizardpage.h b/kdeprint/management/kmwizardpage.h index 68f655b2a..61fe938b7 100644 --- a/kdeprint/management/kmwizardpage.h +++ b/kdeprint/management/kmwizardpage.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp index 3bbaf0eaa..7b56b2deb 100644 --- a/kdeprint/management/kmwlocal.cpp +++ b/kdeprint/management/kmwlocal.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -48,7 +48,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name) m_ports->addColumn(""); m_ports->setSorting(-1); TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); - root->setPixmap(0, SmallIcon("kdeprint_computer")); + root->setPixmap(0, SmallIcon("tdeprint_computer")); root->setOpen(true); connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); TQLabel *l1 = new TQLabel(i18n("URI:"), this); @@ -197,7 +197,7 @@ void KMWLocal::initialize() { TQListViewItem *pItem = new TQListViewItem(last[index], printer); last[index]->setOpen(true); - pItem->setPixmap(0, SmallIcon("kdeprint_printer")); + pItem->setPixmap(0, SmallIcon("tdeprint_printer")); } } m_initialized = true; diff --git a/kdeprint/management/kmwlocal.h b/kdeprint/management/kmwlocal.h index 154984493..681d94e51 100644 --- a/kdeprint/management/kmwlocal.h +++ b/kdeprint/management/kmwlocal.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp index b83c9cb82..cce4c7b5a 100644 --- a/kdeprint/management/kmwlpd.cpp +++ b/kdeprint/management/kmwlpd.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwlpd.h b/kdeprint/management/kmwlpd.h index 16cd70592..674cdff44 100644 --- a/kdeprint/management/kmwlpd.h +++ b/kdeprint/management/kmwlpd.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp index d46b104a7..fe567f7bb 100644 --- a/kdeprint/management/kmwname.cpp +++ b/kdeprint/management/kmwname.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwname.h b/kdeprint/management/kmwname.h index e3b74f224..f933d59ed 100644 --- a/kdeprint/management/kmwname.h +++ b/kdeprint/management/kmwname.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp index c8fb39c65..40dc105d5 100644 --- a/kdeprint/management/kmwpassword.cpp +++ b/kdeprint/management/kmwpassword.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwpassword.h b/kdeprint/management/kmwpassword.h index 493b36dd0..a7dfb062a 100644 --- a/kdeprint/management/kmwpassword.h +++ b/kdeprint/management/kmwpassword.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwsmb.cpp b/kdeprint/management/kmwsmb.cpp index 4c649d8a9..e76240cf8 100644 --- a/kdeprint/management/kmwsmb.cpp +++ b/kdeprint/management/kmwsmb.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwsmb.h b/kdeprint/management/kmwsmb.h index da89b5d1f..695379a79 100644 --- a/kdeprint/management/kmwsmb.h +++ b/kdeprint/management/kmwsmb.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp index 5f2bf9742..98aad76a5 100644 --- a/kdeprint/management/kmwsocket.cpp +++ b/kdeprint/management/kmwsocket.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -137,7 +137,7 @@ void KMWSocket::slotScanFinished() else name = it.current()->Name; TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); - item->setPixmap(0,SmallIcon("kdeprint_printer")); + item->setPixmap(0,SmallIcon("tdeprint_printer")); } } diff --git a/kdeprint/management/kmwsocket.h b/kdeprint/management/kmwsocket.h index 07344e529..687b52fd4 100644 --- a/kdeprint/management/kmwsocket.h +++ b/kdeprint/management/kmwsocket.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp index a8a89e3ad..e6d06bae2 100644 --- a/kdeprint/management/kmwsocketutil.cpp +++ b/kdeprint/management/kmwsocketutil.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * * This library is free software; you can redistribute it and/or diff --git a/kdeprint/management/kmwsocketutil.h b/kdeprint/management/kmwsocketutil.h index a7b9faee2..dfb9f490e 100644 --- a/kdeprint/management/kmwsocketutil.h +++ b/kdeprint/management/kmwsocketutil.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index 135ebbe4c..3b42b71d7 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kxmlcommanddlg.h b/kdeprint/management/kxmlcommanddlg.h index 7ccbc9e0e..88e590325 100644 --- a/kdeprint/management/kxmlcommanddlg.h +++ b/kdeprint/management/kxmlcommanddlg.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp index f46222fba..dfefe0a8b 100644 --- a/kdeprint/management/kxmlcommandselector.cpp +++ b/kdeprint/management/kxmlcommandselector.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #include "kxmlcommandselector.h" #include "kxmlcommand.h" #include "kxmlcommanddlg.h" -#include "kdeprintcheck.h" +#include "tdeprintcheck.h" #include <tqcombobox.h> #include <kpushbutton.h> diff --git a/kdeprint/management/kxmlcommandselector.h b/kdeprint/management/kxmlcommandselector.h index 7466b9ea5..0efc299f9 100644 --- a/kdeprint/management/kxmlcommandselector.h +++ b/kdeprint/management/kxmlcommandselector.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp index 73466cdbb..a52e66018 100644 --- a/kdeprint/management/networkscanner.cpp +++ b/kdeprint/management/networkscanner.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h index 97c69a2cc..3d56bb03e 100644 --- a/kdeprint/management/networkscanner.h +++ b/kdeprint/management/networkscanner.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/pluginaction.cpp b/kdeprint/management/pluginaction.cpp index d876601e7..0aa3c10a3 100644 --- a/kdeprint/management/pluginaction.cpp +++ b/kdeprint/management/pluginaction.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/pluginaction.h b/kdeprint/management/pluginaction.h index c39f5f700..fb355b597 100644 --- a/kdeprint/management/pluginaction.h +++ b/kdeprint/management/pluginaction.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp index 696d7b025..8824dd5fc 100644 --- a/kdeprint/management/sidepixmap.cpp +++ b/kdeprint/management/sidepixmap.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -28,9 +28,9 @@ SidePixmap::SidePixmap(TQWidget *parent, const char *name) setLineWidth(1); setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); - m_side.load(locate("data", "kdeprint/side.png")); - m_tileup.load(locate("data", "kdeprint/tileup.png")); - m_tiledown.load(locate("data", "kdeprint/tiledown.png")); + m_side.load(locate("data", "tdeprint/side.png")); + m_tileup.load(locate("data", "tdeprint/tileup.png")); + m_tiledown.load(locate("data", "tdeprint/tiledown.png")); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); } diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h index 330b63e2d..a9730883e 100644 --- a/kdeprint/management/sidepixmap.h +++ b/kdeprint/management/sidepixmap.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp index 8692b00bd..fde3a3451 100644 --- a/kdeprint/management/smbview.cpp +++ b/kdeprint/management/smbview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -240,7 +240,7 @@ void SmbView::processServers() continue; TQListViewItem *item = new TQListViewItem(m_current,words[0]); item->setExpandable(true); - item->setPixmap(0,SmallIcon("kdeprint_computer")); + item->setPixmap(0,SmallIcon("tdeprint_computer")); } } @@ -273,7 +273,7 @@ void SmbView::processShares() // comm += (words[i]+" "); //TQListViewItem *item = new TQListViewItem(m_current,words[0],comm); TQListViewItem *item = new TQListViewItem(m_current,sharen,comm); - item->setPixmap(0,SmallIcon("kdeprint_printer")); + item->setPixmap(0,SmallIcon("tdeprint_printer")); } } } diff --git a/kdeprint/management/smbview.h b/kdeprint/management/smbview.h index 57dc297f7..aea1d920d 100644 --- a/kdeprint/management/smbview.h +++ b/kdeprint/management/smbview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/marginpreview.cpp b/kdeprint/marginpreview.cpp index 191d1850c..2a5e21e59 100644 --- a/kdeprint/marginpreview.cpp +++ b/kdeprint/marginpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/marginpreview.h b/kdeprint/marginpreview.h index a9d1165b7..e0ed3e775 100644 --- a/kdeprint/marginpreview.h +++ b/kdeprint/marginpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/marginvaluewidget.cpp b/kdeprint/marginvaluewidget.cpp index 1ef2233e1..e4f1365c6 100644 --- a/kdeprint/marginvaluewidget.cpp +++ b/kdeprint/marginvaluewidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/marginvaluewidget.h b/kdeprint/marginvaluewidget.h index 40f471bb2..97f1409c1 100644 --- a/kdeprint/marginvaluewidget.h +++ b/kdeprint/marginvaluewidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/marginwidget.cpp b/kdeprint/marginwidget.cpp index bb745b072..53790a112 100644 --- a/kdeprint/marginwidget.cpp +++ b/kdeprint/marginwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/marginwidget.h b/kdeprint/marginwidget.h index 2a493dedf..bca3a2c00 100644 --- a/kdeprint/marginwidget.h +++ b/kdeprint/marginwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp index 4f64f8edb..32ce8db9b 100644 --- a/kdeprint/messagewindow.cpp +++ b/kdeprint/messagewindow.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -39,7 +39,7 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, box->setSpacing( 10 ); box->setMargin( 5 ); TQLabel *pix = new TQLabel( box ); - pix->setPixmap( DesktopIcon( "kdeprint_printer" ) ); + pix->setPixmap( DesktopIcon( "tdeprint_printer" ) ); m_text = new TQLabel( txt, box ); TQHBoxLayout *l0 = new TQHBoxLayout( this, 0, 0 ); diff --git a/kdeprint/messagewindow.h b/kdeprint/messagewindow.h index 52e73ea2e..44e211808 100644 --- a/kdeprint/messagewindow.h +++ b/kdeprint/messagewindow.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/pics/CMakeLists.txt b/kdeprint/pics/CMakeLists.txt index ed6478325..5363b16ef 100644 --- a/kdeprint/pics/CMakeLists.txt +++ b/kdeprint/pics/CMakeLists.txt @@ -12,30 +12,30 @@ ##### other data ################################ install( FILES - kdeprint_collate.png kdeprint_collate_reverse.png - kdeprint_color.png kdeprint_duplex_none.png - kdeprint_duplex_long.png kdeprint_duplex_short.png - kdeprint_grayscale.png kdeprint_landscape.png - kdeprint_nup1.png kdeprint_nup2.png kdeprint_nup4.png - kdeprint_portrait.png kdeprint_revlandscape.png - kdeprint_revportrait.png kdeprint_uncollate.png - kdeprint_uncollate_reverse.png kdeprint_nupother.png - kdeprint_prettyprint.png - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/pics ) + tdeprint_collate.png tdeprint_collate_reverse.png + tdeprint_color.png tdeprint_duplex_none.png + tdeprint_duplex_long.png tdeprint_duplex_short.png + tdeprint_grayscale.png tdeprint_landscape.png + tdeprint_nup1.png tdeprint_nup2.png tdeprint_nup4.png + tdeprint_portrait.png tdeprint_revlandscape.png + tdeprint_revportrait.png tdeprint_uncollate.png + tdeprint_uncollate_reverse.png tdeprint_nupother.png + tdeprint_prettyprint.png + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/pics ) tde_install_icons( - kdeprint_job kdeprint_job_error kdeprint_job_process - kdeprint_job_stopped kdeprint_printer kdeprint_printer_class - kdeprint_printer_class_stopped kdeprint_printer_defect - kdeprint_printer_remote kdeprint_printer_remote_stopped - kdeprint_printer_stopped kdeprint_printer_remote_process - kdeprint_printer_process kdeprint_printer_class_process - kdeprint_computer kdeprint_printer_infos history - kdeprint_printer_users filterstop kdeprint_job_completed - kdeprint_job_cancelled package_utilities kdeprint_enableprinter - kdeprint_stopprinter kdeprint_addprinter kdeprint_addpseudo - kdeprint_configmgr kdeprint_configsrv kdeprint_defaulthard - kdeprint_defaultsoft kdeprint_report kdeprint_testprinter - kdeprint_uploadsmb kdeprint_restartsrv kdeprint_inklevel - kdeprint_printstate kdeprint_queuestate - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/icons ) + tdeprint_job tdeprint_job_error tdeprint_job_process + tdeprint_job_stopped tdeprint_printer tdeprint_printer_class + tdeprint_printer_class_stopped tdeprint_printer_defect + tdeprint_printer_remote tdeprint_printer_remote_stopped + tdeprint_printer_stopped tdeprint_printer_remote_process + tdeprint_printer_process tdeprint_printer_class_process + tdeprint_computer tdeprint_printer_infos history + tdeprint_printer_users filterstop tdeprint_job_completed + tdeprint_job_cancelled package_utilities tdeprint_enableprinter + tdeprint_stopprinter tdeprint_addprinter tdeprint_addpseudo + tdeprint_configmgr tdeprint_configsrv tdeprint_defaulthard + tdeprint_defaultsoft tdeprint_report tdeprint_testprinter + tdeprint_uploadsmb tdeprint_restartsrv tdeprint_inklevel + tdeprint_printstate tdeprint_queuestate + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/icons ) diff --git a/kdeprint/pics/Makefile.am b/kdeprint/pics/Makefile.am index e19e32936..a46f6530d 100644 --- a/kdeprint/pics/Makefile.am +++ b/kdeprint/pics/Makefile.am @@ -1,22 +1,22 @@ -icondata_DATA = kdeprint_collate.png \ - kdeprint_collate_reverse.png \ - kdeprint_color.png \ - kdeprint_duplex_none.png \ - kdeprint_duplex_long.png \ - kdeprint_duplex_short.png \ - kdeprint_grayscale.png \ - kdeprint_landscape.png \ - kdeprint_nup1.png \ - kdeprint_nup2.png \ - kdeprint_nup4.png \ - kdeprint_portrait.png \ - kdeprint_revlandscape.png \ - kdeprint_revportrait.png \ - kdeprint_uncollate.png \ - kdeprint_uncollate_reverse.png \ - kdeprint_nupother.png \ - kdeprint_prettyprint.png -icondatadir = $(kde_datadir)/kdeprint/pics +icondata_DATA = tdeprint_collate.png \ + tdeprint_collate_reverse.png \ + tdeprint_color.png \ + tdeprint_duplex_none.png \ + tdeprint_duplex_long.png \ + tdeprint_duplex_short.png \ + tdeprint_grayscale.png \ + tdeprint_landscape.png \ + tdeprint_nup1.png \ + tdeprint_nup2.png \ + tdeprint_nup4.png \ + tdeprint_portrait.png \ + tdeprint_revlandscape.png \ + tdeprint_revportrait.png \ + tdeprint_uncollate.png \ + tdeprint_uncollate_reverse.png \ + tdeprint_nupother.png \ + tdeprint_prettyprint.png +icondatadir = $(kde_datadir)/tdeprint/pics -stdicon_ICON = kdeprint_job kdeprint_job_error kdeprint_job_process kdeprint_job_stopped kdeprint_printer kdeprint_printer_class kdeprint_printer_class_stopped kdeprint_printer_defect kdeprint_printer_remote kdeprint_printer_remote_stopped kdeprint_printer_stopped kdeprint_printer_remote_process kdeprint_printer_process kdeprint_printer_class_process kdeprint_computer kdeprint_printer_infos history kdeprint_printer_users filterstop kdeprint_job_completed kdeprint_job_cancelled package_utilities kdeprint_enableprinter kdeprint_stopprinter kdeprint_addprinter kdeprint_addpseudo kdeprint_configmgr kdeprint_configsrv kdeprint_defaulthard kdeprint_defaultsoft kdeprint_report kdeprint_testprinter kdeprint_uploadsmb kdeprint_restartsrv kdeprint_inklevel kdeprint_printstate kdeprint_queuestate -stdicondir = $(kde_datadir)/kdeprint/icons +stdicon_ICON = tdeprint_job tdeprint_job_error tdeprint_job_process tdeprint_job_stopped tdeprint_printer tdeprint_printer_class tdeprint_printer_class_stopped tdeprint_printer_defect tdeprint_printer_remote tdeprint_printer_remote_stopped tdeprint_printer_stopped tdeprint_printer_remote_process tdeprint_printer_process tdeprint_printer_class_process tdeprint_computer tdeprint_printer_infos history tdeprint_printer_users filterstop tdeprint_job_completed tdeprint_job_cancelled package_utilities tdeprint_enableprinter tdeprint_stopprinter tdeprint_addprinter tdeprint_addpseudo tdeprint_configmgr tdeprint_configsrv tdeprint_defaulthard tdeprint_defaultsoft tdeprint_report tdeprint_testprinter tdeprint_uploadsmb tdeprint_restartsrv tdeprint_inklevel tdeprint_printstate tdeprint_queuestate +stdicondir = $(kde_datadir)/tdeprint/icons diff --git a/kdeprint/plugincombobox.cpp b/kdeprint/plugincombobox.cpp index 414f38601..e9a41ddeb 100644 --- a/kdeprint/plugincombobox.cpp +++ b/kdeprint/plugincombobox.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/plugincombobox.h b/kdeprint/plugincombobox.h index ddfc8a89c..668407e14 100644 --- a/kdeprint/plugincombobox.h +++ b/kdeprint/plugincombobox.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/posterpreview.cpp b/kdeprint/posterpreview.cpp index 8afa0e295..7e8542c22 100644 --- a/kdeprint/posterpreview.cpp +++ b/kdeprint/posterpreview.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/posterpreview.h b/kdeprint/posterpreview.h index bd9b6cc77..d0c362a04 100644 --- a/kdeprint/posterpreview.h +++ b/kdeprint/posterpreview.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/ppdloader.cpp b/kdeprint/ppdloader.cpp index 9fbecc774..2e2250dd2 100644 --- a/kdeprint/ppdloader.cpp +++ b/kdeprint/ppdloader.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,9 +27,9 @@ #include <tqfile.h> #include <math.h> -void kdeprint_ppdscanner_init( TQIODevice* ); -void kdeprint_ppdscanner_terminate( bool deleteIt = true ); -int kdeprint_ppdscanner_numberoflines(); +void tdeprint_ppdscanner_init( TQIODevice* ); +void tdeprint_ppdscanner_terminate( bool deleteIt = true ); +int tdeprint_ppdscanner_numberoflines(); static TQString processLocaleString( const TQString& s ) { @@ -131,10 +131,10 @@ DrMain* PPDLoader::readFromFile( const TQString& filename ) bool result = true; m_groups.push( driver ); - kdeprint_ppdscanner_init( d ); - if ( kdeprint_ppdparse( this ) != 0 ) + tdeprint_ppdscanner_init( d ); + if ( tdeprint_ppdparse( this ) != 0 ) result = false; - kdeprint_ppdscanner_terminate( true ); + tdeprint_ppdscanner_terminate( true ); if ( result ) { @@ -170,7 +170,7 @@ DrMain* PPDLoader::loadDriver( const TQString& filename, TQString* msg ) PPDLoader loader; DrMain *driver = loader.readFromFile( filename ); if ( !driver && msg ) - *msg = filename + i18n( "(line %1): " ).arg( kdeprint_ppdscanner_numberoflines() ) + loader.errorMsg(); + *msg = filename + i18n( "(line %1): " ).arg( tdeprint_ppdscanner_numberoflines() ) + loader.errorMsg(); return driver; } diff --git a/kdeprint/ppdloader.h b/kdeprint/ppdloader.h index 703303fe8..c4eb9fbb5 100644 --- a/kdeprint/ppdloader.h +++ b/kdeprint/ppdloader.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -66,7 +66,7 @@ private: TQStringList m_fonts; TQString m_errormsg; - friend int kdeprint_ppdparse(void*); + friend int tdeprint_ppdparse(void*); DrGroup* findOrCreateGroupForOption( const TQString& ); void processPageSizes( DrMain* ); }; diff --git a/kdeprint/ppdparser.cpp b/kdeprint/ppdparser.cpp index ace79dbab..21f3fb77e 100644 --- a/kdeprint/ppdparser.cpp +++ b/kdeprint/ppdparser.cpp @@ -47,13 +47,13 @@ /* If NAME_PREFIX is specified substitute the variables and functions names. */ -#define yyparse kdeprint_ppdparse -#define yylex kdeprint_ppdlex -#define yyerror kdeprint_ppderror -#define yylval kdeprint_ppdlval -#define yychar kdeprint_ppdchar -#define yydebug kdeprint_ppddebug -#define yynerrs kdeprint_ppdnerrs +#define yyparse tdeprint_ppdparse +#define yylex tdeprint_ppdlex +#define yyerror tdeprint_ppderror +#define yylval tdeprint_ppdlval +#define yychar tdeprint_ppdchar +#define yydebug tdeprint_ppddebug +#define yynerrs tdeprint_ppdnerrs /* Tokens. */ @@ -103,7 +103,7 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -131,8 +131,8 @@ #define builder static_cast<PPDLoader*>( ppdloader ) -int kdeprint_ppdlex(); -#define kdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) +int tdeprint_ppdlex(); +#define tdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) /* Enabling traces. */ diff --git a/kdeprint/ppdparser.cpp.h b/kdeprint/ppdparser.cpp.h index 202f5ddda..182bebd34 100644 --- a/kdeprint/ppdparser.cpp.h +++ b/kdeprint/ppdparser.cpp.h @@ -74,7 +74,7 @@ typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 #endif -extern YYSTYPE kdeprint_ppdlval; +extern YYSTYPE tdeprint_ppdlval; diff --git a/kdeprint/ppdparser.y b/kdeprint/ppdparser.y index 37b130b88..f750d9316 100644 --- a/kdeprint/ppdparser.y +++ b/kdeprint/ppdparser.y @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,8 +29,8 @@ #define builder static_cast<PPDLoader*>( ppdloader ) -int kdeprint_ppdlex(); -#define kdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) +int tdeprint_ppdlex(); +#define tdeprint_ppderror(msg) static_cast<PPDLoader*>( ppdloader )->setErrorMsg( msg ) %} %token TRANSLATION diff --git a/kdeprint/ppdscanner.cpp b/kdeprint/ppdscanner.cpp index 7eb0f22e7..50611aaa1 100644 --- a/kdeprint/ppdscanner.cpp +++ b/kdeprint/ppdscanner.cpp @@ -1,19 +1,19 @@ -#define yy_create_buffer kdeprint_ppd_create_buffer -#define yy_delete_buffer kdeprint_ppd_delete_buffer -#define yy_scan_buffer kdeprint_ppd_scan_buffer -#define yy_scan_string kdeprint_ppd_scan_string -#define yy_scan_bytes kdeprint_ppd_scan_bytes -#define yy_flex_debug kdeprint_ppd_flex_debug -#define yy_init_buffer kdeprint_ppd_init_buffer -#define yy_flush_buffer kdeprint_ppd_flush_buffer -#define yy_load_buffer_state kdeprint_ppd_load_buffer_state -#define yy_switch_to_buffer kdeprint_ppd_switch_to_buffer -#define yyin kdeprint_ppdin -#define yyleng kdeprint_ppdleng -#define yylex kdeprint_ppdlex -#define yyout kdeprint_ppdout -#define yyrestart kdeprint_ppdrestart -#define yytext kdeprint_ppdtext +#define yy_create_buffer tdeprint_ppd_create_buffer +#define yy_delete_buffer tdeprint_ppd_delete_buffer +#define yy_scan_buffer tdeprint_ppd_scan_buffer +#define yy_scan_string tdeprint_ppd_scan_string +#define yy_scan_bytes tdeprint_ppd_scan_bytes +#define yy_flex_debug tdeprint_ppd_flex_debug +#define yy_init_buffer tdeprint_ppd_init_buffer +#define yy_flush_buffer tdeprint_ppd_flush_buffer +#define yy_load_buffer_state tdeprint_ppd_load_buffer_state +#define yy_switch_to_buffer tdeprint_ppd_switch_to_buffer +#define yyin tdeprint_ppdin +#define yyleng tdeprint_ppdleng +#define yylex tdeprint_ppdlex +#define yyout tdeprint_ppdout +#define yyrestart tdeprint_ppdrestart +#define yytext tdeprint_ppdtext #line 19 "./ppdscanner.cpp" /* A lexical scanner generated by flex */ @@ -521,7 +521,7 @@ char *yytext; #line 2 "./ppdscanner.l" /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -543,21 +543,21 @@ char *yytext; #define YYSTYPE TQStringList #include "ppdparser.cpp.h" -#define yylval kdeprint_ppdlval +#define yylval tdeprint_ppdlval -TQIODevice *kdeprint_ppdscanner_device = NULL; +TQIODevice *tdeprint_ppdscanner_device = NULL; #define YY_INPUT(buf,result,max_size) \ { \ - if (kdeprint_ppdscanner_device) \ + if (tdeprint_ppdscanner_device) \ { \ - result = kdeprint_ppdscanner_device->readBlock(buf,max_size); \ + result = tdeprint_ppdscanner_device->readBlock(buf,max_size); \ if (result < 0) \ result = 0; \ } \ else \ result = 0; \ } -int kdeprint_ppdscanner_lno = 0; +int tdeprint_ppdscanner_lno = 0; #if 0 #define QDEBUG0(s) qDebug(s) @@ -902,7 +902,7 @@ YY_RULE_SETUP case 19: YY_RULE_SETUP #line 87 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK case 20: YY_RULE_SETUP @@ -925,7 +925,7 @@ YY_RULE_SETUP case 23: YY_RULE_SETUP #line 95 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK /** * Value state @@ -933,7 +933,7 @@ YY_RULE_SETUP case 24: YY_RULE_SETUP #line 100 "./ppdscanner.l" -{ yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } +{ yylval = yytext; tdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } YY_BREAK case 25: YY_RULE_SETUP @@ -948,7 +948,7 @@ YY_RULE_SETUP case 27: YY_RULE_SETUP #line 103 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK case 28: YY_RULE_SETUP @@ -966,7 +966,7 @@ YY_RULE_SETUP case 30: YY_RULE_SETUP #line 110 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK /** * Constraint state @@ -989,12 +989,12 @@ YY_RULE_SETUP case 34: YY_RULE_SETUP #line 118 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +{ tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } YY_BREAK case 35: YY_RULE_SETUP #line 120 "./ppdscanner.l" -{ kdeprint_ppdscanner_lno++; /* eat up */ } +{ tdeprint_ppdscanner_lno++; /* eat up */ } YY_BREAK case 36: YY_RULE_SETUP @@ -1895,20 +1895,20 @@ int main() #line 123 "./ppdscanner.l" -void kdeprint_ppdscanner_init(TQIODevice *d) +void tdeprint_ppdscanner_init(TQIODevice *d) { - kdeprint_ppdscanner_device = d; - kdeprint_ppdscanner_lno = 1; + tdeprint_ppdscanner_device = d; + tdeprint_ppdscanner_lno = 1; } -void kdeprint_ppdscanner_terminate( bool deleteIt ) +void tdeprint_ppdscanner_terminate( bool deleteIt ) { if (deleteIt) - delete kdeprint_ppdscanner_device; - kdeprint_ppdscanner_device = NULL; + delete tdeprint_ppdscanner_device; + tdeprint_ppdscanner_device = NULL; } -int kdeprint_ppdscanner_numberoflines() +int tdeprint_ppdscanner_numberoflines() { - return kdeprint_ppdscanner_lno; + return tdeprint_ppdscanner_lno; } diff --git a/kdeprint/ppdscanner.l b/kdeprint/ppdscanner.l index 60a63f035..ba60ee2f6 100644 --- a/kdeprint/ppdscanner.l +++ b/kdeprint/ppdscanner.l @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001-2003 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,21 +23,21 @@ #define YYSTYPE TQStringList #include "ppdparser.cpp.h" -#define yylval kdeprint_ppdlval +#define yylval tdeprint_ppdlval -QIODevice *kdeprint_ppdscanner_device = NULL; +QIODevice *tdeprint_ppdscanner_device = NULL; #define YY_INPUT(buf,result,max_size) \ { \ - if (kdeprint_ppdscanner_device) \ + if (tdeprint_ppdscanner_device) \ { \ - result = kdeprint_ppdscanner_device->readBlock(buf,max_size); \ + result = tdeprint_ppdscanner_device->readBlock(buf,max_size); \ if (result < 0) \ result = 0; \ } \ else \ result = 0; \ } -int kdeprint_ppdscanner_lno = 0; +int tdeprint_ppdscanner_lno = 0; #if 0 #define QDEBUG0(s) qDebug(s) @@ -84,7 +84,7 @@ L [[:alnum:]] */ <option>{WORD3} { yylval = yytext; QDEBUG1("Option: %s",yytext); return OPTION; } <option>":" { BEGIN(value); return ':'; } -<option>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<option>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } <option>"/" { BEGIN(translation_1); return '/'; } /** @@ -92,22 +92,22 @@ L [[:alnum:]] */ <translation_1>[^\n:]* { yylval = yytext; QDEBUG1("Translation: %s",yytext); return TRANSLATION; } <translation_1>":" { BEGIN(value); return ':'; } -<translation_1>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<translation_1>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } /** * Value state */ -<value>\"[^\"]*\" { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } +<value>\"[^\"]*\" { yylval = yytext; tdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } <value>{WORD} { yylval = yytext; QDEBUG1("String part: %s",yytext); return STRINGPART; } <value>"/" { BEGIN(translation_2); return '/'; } -<value>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<value>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } <value>":" { /* stay in the same state */ return ':'; } /** * Translation state (2: with colon) */ <translation_2>[^\n]* { yylval = yytext; QDEBUG1("Translation: %s",yytext); return TRANSLATION; } -<translation_2>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<translation_2>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } /** * Constraint state @@ -115,27 +115,27 @@ L [[:alnum:]] <constr>":" { return ':'; } <constr>\*{WORD2} { yylval = yytext+1; QDEBUG1("Constraint keyword: %s",yytext); return KEYWORD; } <constr>{WORD2} { yylval = yytext; QDEBUG1("Constraint option: %s",yytext); return OPTION; } -<constr>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } +<constr>"\n" { tdeprint_ppdscanner_lno++; BEGIN(INITIAL); } -"\n" { kdeprint_ppdscanner_lno++; /* eat up */ } +"\n" { tdeprint_ppdscanner_lno++; /* eat up */ } <*>. { /* eat up */ } %% -void kdeprint_ppdscanner_init(QIODevice *d) +void tdeprint_ppdscanner_init(QIODevice *d) { - kdeprint_ppdscanner_device = d; - kdeprint_ppdscanner_lno = 1; + tdeprint_ppdscanner_device = d; + tdeprint_ppdscanner_lno = 1; } -void kdeprint_ppdscanner_terminate( bool deleteIt ) +void tdeprint_ppdscanner_terminate( bool deleteIt ) { if (deleteIt) - delete kdeprint_ppdscanner_device; - kdeprint_ppdscanner_device = NULL; + delete tdeprint_ppdscanner_device; + tdeprint_ppdscanner_device = NULL; } -int kdeprint_ppdscanner_numberoflines() +int tdeprint_ppdscanner_numberoflines() { - return kdeprint_ppdscanner_lno; + return tdeprint_ppdscanner_lno; } diff --git a/kdeprint/printerfilter.cpp b/kdeprint/printerfilter.cpp index a6f02f077..e0161a50a 100644 --- a/kdeprint/printerfilter.cpp +++ b/kdeprint/printerfilter.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/printerfilter.h b/kdeprint/printerfilter.h index df92d6a9f..603565ebb 100644 --- a/kdeprint/printerfilter.h +++ b/kdeprint/printerfilter.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/CMakeLists.txt b/kdeprint/rlpr/CMakeLists.txt index cc9369e07..f8468a0dc 100644 --- a/kdeprint/rlpr/CMakeLists.txt +++ b/kdeprint/rlpr/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdeprint - ${CMAKE_SOURCE_DIR}/kdeprint/management + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeprint + ${CMAKE_SOURCE_DIR}/tdeprint/management ) link_directories( @@ -34,12 +34,12 @@ link_directories( ##### other data ################################ -install( FILES rlpr.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins ) +install( FILES rlpr.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins ) -##### kdeprint_rlpr ############################# +##### tdeprint_rlpr ############################# -set( target kdeprint_rlpr ) +set( target tdeprint_rlpr ) set( ${target}_SRCS kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp @@ -49,6 +49,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/rlpr/Makefile.am b/kdeprint/rlpr/Makefile.am index 2a42d106f..1946fed94 100644 --- a/kdeprint/rlpr/Makefile.am +++ b/kdeprint/rlpr/Makefile.am @@ -1,17 +1,17 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes) -kde_module_LTLIBRARIES = kdeprint_rlpr.la +kde_module_LTLIBRARIES = tdeprint_rlpr.la -kdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \ +tdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \ kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp -kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) -kdeprint_rlpr_la_METASOURCES = AUTO +tdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) +tdeprint_rlpr_la_METASOURCES = AUTO noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \ kmproxywidget.h kmconfigproxy.h entry_DATA = rlpr.print -entrydir = $(kde_datadir)/kdeprint/plugins +entrydir = $(kde_datadir)/tdeprint/plugins diff --git a/kdeprint/rlpr/kmconfigproxy.cpp b/kdeprint/rlpr/kmconfigproxy.cpp index 6be500e8f..0f8ca3743 100644 --- a/kdeprint/rlpr/kmconfigproxy.cpp +++ b/kdeprint/rlpr/kmconfigproxy.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmconfigproxy.h b/kdeprint/rlpr/kmconfigproxy.h index 0fcfdaf55..6f3b7ef42 100644 --- a/kdeprint/rlpr/kmconfigproxy.h +++ b/kdeprint/rlpr/kmconfigproxy.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmproprlpr.cpp b/kdeprint/rlpr/kmproprlpr.cpp index c40a3985e..62fe97827 100644 --- a/kdeprint/rlpr/kmproprlpr.cpp +++ b/kdeprint/rlpr/kmproprlpr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmproprlpr.h b/kdeprint/rlpr/kmproprlpr.h index 630bdf671..cdf9aef7b 100644 --- a/kdeprint/rlpr/kmproprlpr.h +++ b/kdeprint/rlpr/kmproprlpr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp index 1aeb1c03f..94ad60340 100644 --- a/kdeprint/rlpr/kmproxywidget.cpp +++ b/kdeprint/rlpr/kmproxywidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmproxywidget.h b/kdeprint/rlpr/kmproxywidget.h index 85dcbf111..0c1a5079b 100644 --- a/kdeprint/rlpr/kmproxywidget.h +++ b/kdeprint/rlpr/kmproxywidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmrlprfactory.cpp b/kdeprint/rlpr/kmrlprfactory.cpp index 1e414bc59..f5cabe6bd 100644 --- a/kdeprint/rlpr/kmrlprfactory.cpp +++ b/kdeprint/rlpr/kmrlprfactory.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,5 +24,5 @@ #include <kgenericfactory.h> typedef K_TYPELIST_3( KMRlprManager, KMRlprUiManager, KRlprPrinterImpl ) Products; -K_EXPORT_COMPONENT_FACTORY( kdeprint_rlpr, KGenericFactory< Products > ) +K_EXPORT_COMPONENT_FACTORY( tdeprint_rlpr, KGenericFactory< Products > ) diff --git a/kdeprint/rlpr/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp index 467f6c58e..64f6acde1 100644 --- a/kdeprint/rlpr/kmrlprmanager.cpp +++ b/kdeprint/rlpr/kmrlprmanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -154,5 +154,5 @@ void KMRlprManager::savePrintersConf(const TQString& filename) TQString KMRlprManager::printerFile() { - return locateLocal("data","kdeprint/printers.conf"); + return locateLocal("data","tdeprint/printers.conf"); } diff --git a/kdeprint/rlpr/kmrlprmanager.h b/kdeprint/rlpr/kmrlprmanager.h index dbc0f1096..57af7f99f 100644 --- a/kdeprint/rlpr/kmrlprmanager.h +++ b/kdeprint/rlpr/kmrlprmanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmrlpruimanager.cpp b/kdeprint/rlpr/kmrlpruimanager.cpp index 5ca7a2230..9bae2cdc4 100644 --- a/kdeprint/rlpr/kmrlpruimanager.cpp +++ b/kdeprint/rlpr/kmrlpruimanager.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmrlpruimanager.h b/kdeprint/rlpr/kmrlpruimanager.h index 3f244eb5b..e2bc5de73 100644 --- a/kdeprint/rlpr/kmrlpruimanager.h +++ b/kdeprint/rlpr/kmrlpruimanager.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp index 1c037ae47..70defc27b 100644 --- a/kdeprint/rlpr/kmwrlpr.cpp +++ b/kdeprint/rlpr/kmwrlpr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -144,12 +144,12 @@ void KMWRlpr::initialize() { host = line.left(p).stripWhiteSpace(); TQListViewItem *hitem = new TQListViewItem(m_view,host); - hitem->setPixmap(0,SmallIcon("kdeprint_computer")); + hitem->setPixmap(0,SmallIcon("tdeprint_computer")); TQStringList prs = TQStringList::split(' ',line.right(line.length()-p-1),false); for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it) { TQListViewItem *pitem = new TQListViewItem(hitem,*it); - pitem->setPixmap(0,SmallIcon("kdeprint_printer")); + pitem->setPixmap(0,SmallIcon("tdeprint_printer")); } } } @@ -187,10 +187,10 @@ void KMWRlpr::initialize() if (!hitem) { hitem = new TQListViewItem(m_view,"localhost"); - hitem->setPixmap(0,SmallIcon("kdeprint_computer")); + hitem->setPixmap(0,SmallIcon("tdeprint_computer")); } TQListViewItem *pitem = new TQListViewItem(hitem,name); - pitem->setPixmap(0,SmallIcon("kdeprint_printer")); + pitem->setPixmap(0,SmallIcon("tdeprint_printer")); } } } diff --git a/kdeprint/rlpr/kmwrlpr.h b/kdeprint/rlpr/kmwrlpr.h index 14be9aee0..7c1aa74f2 100644 --- a/kdeprint/rlpr/kmwrlpr.h +++ b/kdeprint/rlpr/kmwrlpr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/krlprprinterimpl.cpp b/kdeprint/rlpr/krlprprinterimpl.cpp index ac18d1a2b..a6b0e5986 100644 --- a/kdeprint/rlpr/krlprprinterimpl.cpp +++ b/kdeprint/rlpr/krlprprinterimpl.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/rlpr/krlprprinterimpl.h b/kdeprint/rlpr/krlprprinterimpl.h index 9ed5eeebb..7af98df0c 100644 --- a/kdeprint/rlpr/krlprprinterimpl.h +++ b/kdeprint/rlpr/krlprprinterimpl.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/signal_proc.c b/kdeprint/signal_proc.c index 40fac6049..8ff30e56e 100644 --- a/kdeprint/signal_proc.c +++ b/kdeprint/signal_proc.c @@ -114,7 +114,7 @@ int main(int argc, char **argv) fprintf(stderr, "operation not authorized, switching to root\n"); snprintf(buf, 256, "kill -%d %d", signal_number, pid); - if (execlp("kdesu", "kdesu", "-c", buf, (void *)0) == -1) + if (execlp("tdesu", "tdesu", "-c", buf, (void *)0) == -1) { fprintf(stderr, "operation failed: %s\n", strerror(errno)); return -1; diff --git a/kdeprint/specials.desktop b/kdeprint/specials.desktop index 382440edc..72c648c4c 100644 --- a/kdeprint/specials.desktop +++ b/kdeprint/specials.desktop @@ -761,11 +761,11 @@ Comment[zh_CN]=外部 Comment[zh_HK]=外部 Comment[zh_TW]=外部 Comment[zu]=Ngaphandle -Icon=kdeprintfax -Command=kdeprintfax %in +Icon=tdeprintfax +Command=tdeprintfax %in File=0 Extension= -Require=exec:/kdeprintfax +Require=exec:/tdeprintfax [Printer 3] Command=ps2pdf -sPAPERSIZE=%psl %in %out && kmailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out @@ -1111,7 +1111,7 @@ Description[zh_TW]=使用 ksendfax 將目前文件傳真出去 Description[zu]=Sebenzisa i-ksendfax ukuthumela i-fax yohlu lwamafayela amanje Extension= File=0 -Icon=kdeprintfax +Icon=tdeprintfax Name=Advanced Faxing Tool (ksendfax) Name[af]=Gevorderde Faks Program (ksendfax) Name[ar]=أداة إرسال فاكس متقدمة (ksendfax) diff --git a/kdeprint/tests/Makefile.am b/kdeprint/tests/Makefile.am index 7a2d1865c..53021a6e2 100644 --- a/kdeprint/tests/Makefile.am +++ b/kdeprint/tests/Makefile.am @@ -1,15 +1,15 @@ -INCLUDES = -I$(top_srcdir)/kdeprint -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeprint -I$(top_srcdir) $(all_includes) check_PROGRAMS = helpviewer drawdemo helpviewer_SOURCES = helpwindow.cpp main.cpp richpage.cpp helpviewer_METASOURCES = helpwindow.moc -helpviewer_LDADD = $(top_builddir)/kdeprint/libtdeprint.la +helpviewer_LDADD = $(top_builddir)/tdeprint/libtdeprint.la helpviewer_LDFLAGS = $(all_libraries) drawdemo_SOURCES = drawdemo.cpp drawdemo_METASOURCES = drawdemo.moc -drawdemo_LDADD = $(top_builddir)/kdeprint/libtdeprint.la +drawdemo_LDADD = $(top_builddir)/tdeprint/libtdeprint.la drawdemo_LDFLAGS = $(all_libraries) EXTRA_DIST = home.xpm back.xpm forward.xpm diff --git a/kdeprint/tools/escputil/CMakeLists.txt b/kdeprint/tools/escputil/CMakeLists.txt index ec969c6b0..3494d3cfb 100644 --- a/kdeprint/tools/escputil/CMakeLists.txt +++ b/kdeprint/tools/escputil/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -24,12 +24,12 @@ link_directories( ##### other data ################################ -install( FILES escputil.desktop DESTINATION ${DATA_INSTALL_DIR}/kdeprint/tools ) +install( FILES escputil.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeprint/tools ) -##### kdeprint_tool_escputil #################### +##### tdeprint_tool_escputil #################### -set( target kdeprint_tool_escputil ) +set( target tdeprint_tool_escputil ) set( ${target}_SRCS escpwidget.cpp @@ -37,6 +37,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/tools/escputil/Makefile.am b/kdeprint/tools/escputil/Makefile.am index beb7c2a5e..ac7620ef1 100644 --- a/kdeprint/tools/escputil/Makefile.am +++ b/kdeprint/tools/escputil/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kdeprint_tool_escputil.la -kdeprint_tool_escputil_la_SOURCES = escpwidget.cpp -kdeprint_tool_escputil_la_METASOURCES = AUTO -kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) +kde_module_LTLIBRARIES = tdeprint_tool_escputil.la +tdeprint_tool_escputil_la_SOURCES = escpwidget.cpp +tdeprint_tool_escputil_la_METASOURCES = AUTO +tdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +tdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) noinst_HEADERS = escpwidget.h service_DATA = escputil.desktop -servicedir = $(kde_datadir)/kdeprint/tools +servicedir = $(kde_datadir)/tdeprint/tools diff --git a/kdeprint/tools/escputil/escpwidget.cpp b/kdeprint/tools/escputil/escpwidget.cpp index b55a374a7..3000b0788 100644 --- a/kdeprint/tools/escputil/escpwidget.cpp +++ b/kdeprint/tools/escputil/escpwidget.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -55,8 +55,8 @@ protected: extern "C" { - void* init_kdeprint_tool_escputil() KDE_EXPORT; - void* init_kdeprint_tool_escputil() + void* init_tdeprint_tool_escputil() KDE_EXPORT; + void* init_tdeprint_tool_escputil() { return new EscpFactory; } @@ -78,7 +78,7 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) TQPushButton *alignbtn = new TQPushButton(this, "-a"); alignbtn->setPixmap(DesktopIcon("exec")); TQPushButton *inkbtn = new TQPushButton(this, "-i"); - inkbtn->setPixmap(DesktopIcon("kdeprint_inklevel")); + inkbtn->setPixmap(DesktopIcon("tdeprint_inklevel")); TQPushButton *identbtn = new TQPushButton(this, "-d"); identbtn->setPixmap(DesktopIcon("exec")); diff --git a/kdeprint/tools/escputil/escpwidget.h b/kdeprint/tools/escputil/escpwidget.h index 809bb89c3..7e3ba55e8 100644 --- a/kdeprint/tools/escputil/escpwidget.h +++ b/kdeprint/tools/escputil/escpwidget.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/treecombobox.cpp b/kdeprint/treecombobox.cpp index b0fde0f11..7a2adc8ef 100644 --- a/kdeprint/treecombobox.cpp +++ b/kdeprint/treecombobox.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/treecombobox.h b/kdeprint/treecombobox.h index c50be34d2..6026b99f1 100644 --- a/kdeprint/treecombobox.h +++ b/kdeprint/treecombobox.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/util.cpp b/kdeprint/util.cpp index f47db5017..b4025a087 100644 --- a/kdeprint/util.cpp +++ b/kdeprint/util.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/util.h b/kdeprint/util.h index d51f248cf..db4ad1cd6 100644 --- a/kdeprint/util.h +++ b/kdeprint/util.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> + * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public |