diff options
Diffstat (limited to 'tdeprint/cups')
-rw-r--r-- | tdeprint/cups/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tdeprint/cups/Makefile.am | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsaddsmb2.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/Makefile.am | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/cupsdconf.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/cupsdlogpage.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/qdirlineedit.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/cupsinfos.cpp | 6 | ||||
-rw-r--r-- | tdeprint/cups/kmconfigcups.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/kmconfigcupsdir.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/kmcupsconfigwidget.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/kmcupsmanager.cpp | 2 |
15 files changed, 22 insertions, 22 deletions
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> |