diff options
Diffstat (limited to 'tdeprint')
54 files changed, 79 insertions, 79 deletions
diff --git a/tdeprint/CMakeLists.txt b/tdeprint/CMakeLists.txt index a7a97809f..724b0a0cb 100644 --- a/tdeprint/CMakeLists.txt +++ b/tdeprint/CMakeLists.txt @@ -32,9 +32,9 @@ include_directories( ${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}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/kded ) @@ -84,7 +84,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared tdeinit_kded-shared + LINK tdeio-shared tdeinit_kded-shared DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -104,7 +104,7 @@ set( ${target}_SRCS kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp - kfilelist.cpp kprintaction.cpp kpfileselectpage.cpp + tdefilelist.cpp kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp kpmarginpage.cpp messagewindow.cpp posterpreview.cpp @@ -116,7 +116,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kio-shared + LINK tdeio-shared DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am index b70e46e93..7ea8df12a 100644 --- a/tdeprint/Makefile.am +++ b/tdeprint/Makefile.am @@ -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 tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \ + kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp tdefilelist.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 \ @@ -40,7 +40,7 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \ kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.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 \ + tdefilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \ util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \ marginvaluewidget.h kpmarginpage.h messagewindow.h \ posterpreview.h kpposterpage.h foomatic2loader.h ppdloader.h @@ -104,7 +104,7 @@ noinst_LIBRARIES = libdriverparse.a libdriverparse_a_SOURCES = driverparse.c update_DATA = tdeprintrc.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update messages: rc.cpp $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt index 62c48618c..aa882ca7e 100644 --- a/tdeprint/cups/CMakeLists.txt +++ b/tdeprint/cups/CMakeLists.txt @@ -26,9 +26,9 @@ include_directories( ${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}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/tdeprint ${CMAKE_SOURCE_DIR}/tdeprint/management ) diff --git a/tdeprint/cups/Makefile.am b/tdeprint/cups/Makefile.am index 64e8b997d..cdbb0b92c 100644 --- a/tdeprint/cups/Makefile.am +++ b/tdeprint/cups/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = -D_TDEPRINT_COMPILE SUBDIRS = cupsdconf2 -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) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes) kde_module_LTLIBRARIES = tdeprint_cups.la diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index f0057235e..685ce6e7e 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -30,7 +30,7 @@ #include <kmessagebox.h> #include <tqmessagebox.h> #include <tqfile.h> -#include <kio/passdlg.h> +#include <tdeio/passdlg.h> #include <kdebug.h> #include <kseparator.h> #include <kactivelabel.h> diff --git a/tdeprint/cups/cupsdconf2/CMakeLists.txt b/tdeprint/cups/cupsdconf2/CMakeLists.txt index ceee1bc47..749d84182 100644 --- a/tdeprint/cups/cupsdconf2/CMakeLists.txt +++ b/tdeprint/cups/cupsdconf2/CMakeLists.txt @@ -17,9 +17,9 @@ include_directories( ${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 + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( @@ -50,5 +50,5 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared ${CUPS_LIBRARIES} + LINK tdeio-shared ${CUPS_LIBRARIES} ) diff --git a/tdeprint/cups/cupsdconf2/Makefile.am b/tdeprint/cups/cupsdconf2/Makefile.am index eb7e42159..b0c111bf8 100644 --- a/tdeprint/cups/cupsdconf2/Makefile.am +++ b/tdeprint/cups/cupsdconf2/Makefile.am @@ -1,6 +1,6 @@ #$Id$ -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includes) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp index a05e44d6f..102ead1c8 100644 --- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <stdlib.h> #include <cups/cups.h> diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index ada83d362..d221f2f04 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -41,7 +41,7 @@ #include <kiconloader.h> #include <tqstringlist.h> #include <tqwhatsthis.h> -#include <kio/passdlg.h> +#include <tdeio/passdlg.h> #include <kguiitem.h> #include <kprocess.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp index 61a89f933..00972e368 100644 --- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -28,7 +28,7 @@ #include <tqwhatsthis.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp index 7cf0ea74e..25c984ec4 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -22,7 +22,7 @@ #include <tqlineedit.h> #include <tqlayout.h> #include <kpushbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index b1bd96ee6..c2fcaab7b 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -24,7 +24,7 @@ #include <tqpushbutton.h> #include <klistview.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp index 7962b13ef..5013b57cc 100644 --- a/tdeprint/cups/cupsinfos.cpp +++ b/tdeprint/cups/cupsinfos.cpp @@ -22,10 +22,10 @@ #include "kmtimer.h" #include "messagewindow.h" -#include <kio/passdlg.h> -#include <kio/authinfo.h> +#include <tdeio/passdlg.h> +#include <tdeio/authinfo.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <dcopclient.h> #include <kdebug.h> diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp index 55a96d9d5..1b0ccdaea 100644 --- a/tdeprint/cups/kmconfigcups.cpp +++ b/tdeprint/cups/kmconfigcups.cpp @@ -21,7 +21,7 @@ #include "kmcupsconfigwidget.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index 2fe66d787..6f16f5dfa 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -23,7 +23,7 @@ #include <kurlrequester.h> #include <klocale.h> #include <kdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqgroupbox.h> #include <tqlayout.h> #include <kcursor.h> diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index ce005fc3b..a62583b1b 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -30,7 +30,7 @@ #include <klocale.h> #include <kcursor.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstringhandler.h> class PortValidator : public TQIntValidator diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index e5d45a42a..d444db1f2 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -43,7 +43,7 @@ #include <kdebug.h> #include <kapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <tdesocketbase.h> #include <klibloader.h> diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp index c976f54e0..8959aa3e8 100644 --- a/tdeprint/ext/kextprinterimpl.cpp +++ b/tdeprint/ext/kextprinterimpl.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> KExtPrinterImpl::KExtPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index a1b4ad4ee..7d972cbf8 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -32,7 +32,7 @@ #include <tqsettings.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kdebug.h> @@ -43,7 +43,7 @@ #include <kapplication.h> #include <dcopclient.h> #include <dcopref.h> -#include <kio/authinfo.h> +#include <tdeio/authinfo.h> #include <unistd.h> diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index 3496cdb1d..2a0e2ae50 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -24,7 +24,7 @@ #include <kaction.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> KMJobManager::KMJobManager(TQObject *parent, const char *name) : TQObject(parent,name) diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index 57e06994d..a597b94b6 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -29,7 +29,7 @@ #include <zlib.h> #include <tqfile.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> #include <kapplication.h> diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp index b18116ef8..22fc9d970 100644 --- a/tdeprint/kmprinter.cpp +++ b/tdeprint/kmprinter.cpp @@ -22,7 +22,7 @@ #include "driver.h" #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> KMPrinter::KMPrinter() : KMObject() diff --git a/tdeprint/kpfileselectpage.cpp b/tdeprint/kpfileselectpage.cpp index f3131717a..6847ade2b 100644 --- a/tdeprint/kpfileselectpage.cpp +++ b/tdeprint/kpfileselectpage.cpp @@ -18,7 +18,7 @@ **/ #include "kpfileselectpage.h" -#include "kfilelist.h" +#include "tdefilelist.h" #include <tqlayout.h> #include <tqstringlist.h> diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 06a61e1c0..518f544f6 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -53,16 +53,16 @@ #include <klocale.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlrequester.h> #include <klineedit.h> #include <kdebug.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kguiitem.h> #include <kstdguiitem.h> #include <kapplication.h> -#include <kio/renamedlg.h> +#include <tdeio/renamedlg.h> #include <time.h> diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 3664b4157..4d34280a0 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -36,7 +36,7 @@ #include <kapplication.h> #include <kstandarddirs.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <krun.h> #include <knotifyclient.h> #include <kdebug.h> diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 5c3d840a0..fd05024a3 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -41,7 +41,7 @@ #include <kmimemagic.h> #include <kmessagebox.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <stdlib.h> diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index d5102ed3c..e81a23b08 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -37,7 +37,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktoolbar.h> #include <kmimetype.h> diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index 5251b990a..a11f79304 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -34,7 +34,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kprocess.h> #include <pwd.h> diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp index b5c43ebef..8a6988188 100644 --- a/tdeprint/lpr/kmconfiglpr.cpp +++ b/tdeprint/lpr/kmconfiglpr.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqgroupbox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name) : KMConfigPage(parent, name) diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp index 30b650c17..a539f4160 100644 --- a/tdeprint/lpr/lprsettings.cpp +++ b/tdeprint/lpr/lprsettings.cpp @@ -21,7 +21,7 @@ #include "kmmanager.h" #include "kmfactory.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/tdeprint/management/CMakeLists.txt b/tdeprint/management/CMakeLists.txt index ccaf2a70a..47dcda996 100644 --- a/tdeprint/management/CMakeLists.txt +++ b/tdeprint/management/CMakeLists.txt @@ -24,9 +24,9 @@ include_directories( ${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}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/tdeprint ) diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am index f0d1acd9f..f9f5c0ce4 100644 --- a/tdeprint/management/Makefile.am +++ b/tdeprint/management/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = -D_TDEPRINT_COMPILE -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) +INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = libtdeprint_management.la kde_module_LTLIBRARIES = libtdeprint_management_module.la diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index ee63e9eeb..b3ef6e329 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -32,7 +32,7 @@ #include <tqlayout.h> #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name) : KDialogBase(IconList,i18n("TDE Print Configuration"),Ok|Cancel,Ok,parent,name,true,true) diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index 2eea53b0e..bcbe1b0f7 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -29,7 +29,7 @@ #include <tqapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <klistbox.h> #include <kdialog.h> diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index b933cab00..91861f5ca 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -29,10 +29,10 @@ #include <tqwhatsthis.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kurlrequester.h> -#include <kfile.h> +#include <tdefile.h> #include <klistview.h> #include <kdialog.h> diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index f02cfa854..b7c0a1522 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -30,7 +30,7 @@ #include <kurlrequester.h> #include <krun.h> #include <kmimemagic.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kmessagebox.h> #include <kcursor.h> diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp index 0fb40fb7b..667b40381 100644 --- a/tdeprint/management/kmconfigjobs.cpp +++ b/tdeprint/management/kmconfigjobs.cpp @@ -24,7 +24,7 @@ #include <knuminput.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index 548968701..3d084f735 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kurlrequester.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 704a20db5..1b05f8e9c 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -35,9 +35,9 @@ #include <klocale.h> #include <kcursor.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kguiitem.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) : TQWidget(parent,name) diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index da8a98016..5e4561c19 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -44,7 +44,7 @@ #include <kmenubar.h> #include <kdebug.h> #include <twin.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqtimer.h> #include <tqlayout.h> #include <stdlib.h> @@ -52,7 +52,7 @@ #include <kdialogbase.h> #include <tqcheckbox.h> #include <kurldrag.h> -#include <kconfig.h> +#include <tdeconfig.h> #undef m_manager #define m_manager KMFactory::self()->jobManager() diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index daafbff97..858fca0fc 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -45,7 +45,7 @@ #include <kmessagebox.h> #include <kaction.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktoolbar.h> #include <ktoolbarbutton.h> #include <kdebug.h> diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index 9e3775c14..ba6801769 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -37,7 +37,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kicondialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kseparator.h> KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index 5acc27351..a45a9caa0 100644 --- a/tdeprint/management/kmtimer.cpp +++ b/tdeprint/management/kmtimer.cpp @@ -20,7 +20,7 @@ #include "kmtimer.h" #include "kmfactory.h" -#include <kconfig.h> +#include <tdeconfig.h> KMTimer* KMTimer::m_self = 0; diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 0e0cd306b..4f57762aa 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -32,7 +32,7 @@ #include <kapplication.h> #include <kmessagebox.h> #include <kguiitem.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) : KMWizardPage(parent,name) diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp index 1fbaf45ff..f3b54dcdc 100644 --- a/tdeprint/management/kmwfile.cpp +++ b/tdeprint/management/kmwfile.cpp @@ -26,7 +26,7 @@ #include <kurlrequester.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> KMWFile::KMWFile(TQWidget *parent, const char *name) : KMWizardPage(parent,name) diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index 6f2b4485e..093d2a909 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -33,7 +33,7 @@ #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kseparator.h> #include <kguiitem.h> #include <kactivelabel.h> diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp index c30409e66..d1889dd1c 100644 --- a/tdeprint/printerfilter.cpp +++ b/tdeprint/printerfilter.cpp @@ -21,7 +21,7 @@ #include "kmprinter.h" #include "kmfactory.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index 763282ecd..a2a3e6a85 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqvalidator.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcursor.h> KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 628205a31..5e927a940 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> KRlprPrinterImpl::KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) diff --git a/tdeprint/specials.desktop b/tdeprint/specials.desktop index f6edcea32..467a26d7e 100644 --- a/tdeprint/specials.desktop +++ b/tdeprint/specials.desktop @@ -768,7 +768,7 @@ Extension= Require=exec:/tdeprintfax [Printer 3] -Command=ps2pdf -sPAPERSIZE=%psl %in %out && kmailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out +Command=ps2pdf -sPAPERSIZE=%psl %in %out && tdemailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out Comment=Attachment for KMail Composer Comment[af]=Aanhegsel vir Kpos Saamsteller Comment[ar]=مرفقات كاتب KMail diff --git a/tdeprint/kfilelist.cpp b/tdeprint/tdefilelist.cpp index 44bd13a87..9d02b77f6 100644 --- a/tdeprint/kfilelist.cpp +++ b/tdeprint/tdefilelist.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. **/ -#include "kfilelist.h" +#include "tdefilelist.h" #include <tqtoolbutton.h> #include <tqlabel.h> @@ -26,9 +26,9 @@ #include <tqheader.h> #include <tqwhatsthis.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurldrag.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kiconloader.h> #include <klistview.h> @@ -323,4 +323,4 @@ void KFileList::slotDown() } } -#include "kfilelist.moc" +#include "tdefilelist.moc" diff --git a/tdeprint/kfilelist.h b/tdeprint/tdefilelist.h index d5ef3ada1..d5ef3ada1 100644 --- a/tdeprint/kfilelist.h +++ b/tdeprint/tdefilelist.h diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h index bb839063f..7ffdf8d6c 100644 --- a/tdeprint/tdeprintcheck.h +++ b/tdeprint/tdeprintcheck.h @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> class TDEPRINT_EXPORT KdeprintChecker diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 617fddf8f..02d32ab77 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -26,8 +26,8 @@ #include <kmessagebox.h> #include <kdebug.h> #include <dcopclient.h> -#include <kio/passdlg.h> -#include <kio/authinfo.h> +#include <tdeio/passdlg.h> +#include <tdeio/authinfo.h> #include <tqlabel.h> #include <kpushbutton.h> #include <kiconloader.h> |