diff options
Diffstat (limited to 'tdeprint')
242 files changed, 933 insertions, 933 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/ChangeLog b/tdeprint/ChangeLog index 5ce11bd36..86f8bbf16 100644 --- a/tdeprint/ChangeLog +++ b/tdeprint/ChangeLog @@ -59,7 +59,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be> printers (to not confuse the CUPS daemon for example) * Improved how the default printer is selected in print dialog to work in any cases - * General: make use of KLocale::pageSize() to determine the default + * General: make use of TDELocale::pageSize() to determine the default page size (used for example for pseudo printers and classes) * Wizard: fix buffer overflow when adding a remote LPD queue having a lot of jobs waiting @@ -108,7 +108,7 @@ Since 2.2 release, 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. + in file names + system --> TDEProcess. 07/11/2001 Michael Goffioul <tdeprint@swing.be> * tdeprint: fixed some problems: @@ -389,7 +389,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be> page ranges (problem with option encoding in CUPS). 15/02/2002 Michael Goffioul <tdeprint@swing.be> - * general: fixed infinite recursion bug in KIconSelectAction + * general: fixed infinite recursion bug in TDEIconSelectAction * 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 diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am index b70e46e93..e3461ed84 100644 --- a/tdeprint/Makefile.am +++ b/tdeprint/Makefile.am @@ -23,14 +23,14 @@ 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 \ fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp libtdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined -libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE) +libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE) libtdeprint_la_DEPENDENCIES = $(LIB_KPARTS) libtdeprint_la_METASOURCES = AUTO @@ -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 f0cb1c359..256f5ee23 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -26,11 +26,11 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqlineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqmessagebox.h> #include <tqfile.h> -#include <kio/passdlg.h> +#include <tdeio/passdlg.h> #include <kdebug.h> #include <kseparator.h> #include <kactivelabel.h> @@ -47,9 +47,9 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); m_side = new SidePixmap(this); m_doit = new TQPushButton(i18n("&Export"), this); @@ -145,7 +145,7 @@ void CupsAddSmb::slotActionClicked() m_proc.kill(); } -void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) +void CupsAddSmb::slotReceived(TDEProcess*, char *buf, int buflen) { TQString line; int index(0); @@ -309,7 +309,7 @@ void CupsAddSmb::doNextAction() } } -void CupsAddSmb::slotProcessExited(KProcess*) +void CupsAddSmb::slotProcessExited(TDEProcess*) { kdDebug(500) << "PROCESS EXITED (" << m_state << ")" << endl; if (m_proc.normalExit() && m_state != Start && m_status) @@ -470,7 +470,7 @@ bool CupsAddSmb::startProcess() m_actionindex = 0; m_buffer.clear(); kdDebug(500) << "PROCESS STARTED = " << m_proc.args()[0] << endl; - return m_proc.start(KProcess::NotifyOnExit, KProcess::All); + return m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::All); } #include "cupsaddsmb2.moc" diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h index 84166f53c..9aeccdd4a 100644 --- a/tdeprint/cups/cupsaddsmb2.h +++ b/tdeprint/cups/cupsaddsmb2.h @@ -44,9 +44,9 @@ public: static bool exportDest(const TQString& dest, const TQString& datadir); protected slots: - void slotReceived(KProcess*, char*, int); + void slotReceived(TDEProcess*, char*, int); void doNextAction(); - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); void slotActionClicked(); protected: @@ -58,7 +58,7 @@ protected: void showError(const TQString& msg); private: - KProcess m_proc; + TDEProcess m_proc; TQStringList m_buffer; int m_state; TQStringList m_actions; 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/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp index fab6a6fba..83b4d0813 100644 --- a/tdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> AddressDialog::AddressDialog(TQWidget *parent, const char *name) : KDialogBase(Swallow, i18n("ACL Address"), Ok|Cancel, Ok, parent, name, true, true) diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp index b337eb883..3268c72bc 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp @@ -28,7 +28,7 @@ #include <tqwhatsthis.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 4b056cdb0..e66048b73 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -28,7 +28,7 @@ #include <tqcombobox.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp index d17c8bd0c..8a788cad3 100644 --- a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -21,7 +21,7 @@ #include <tqfile.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> TQString Comment::comment() diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp index 971da38ff..2c5610411 100644 --- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -22,9 +22,9 @@ #include <tqfile.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <stdlib.h> #include <cups/cups.h> @@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line) bool CupsdConf::loadAvailableResources() { - KConfig conf("tdeprintrc"); + TDEConfig conf("tdeprintrc"); conf.setGroup("CUPS"); TQString host = conf.readEntry("Host",cupsServer()); int port = conf.readNumEntry("Port",ippPort()); diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index bc91f9ffe..22a3b2d54 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -33,15 +33,15 @@ #include <tqdir.h> #include <tqvbox.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqstringlist.h> #include <tqwhatsthis.h> -#include <kio/passdlg.h> +#include <tdeio/passdlg.h> #include <kguiitem.h> #include <kprocess.h> @@ -95,7 +95,7 @@ const char* getPassword(const char*) TQString user(cupsUser()); TQString pass; - if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) + if (TDEIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) { cupsSetUser(user.latin1()); pass_string = pass; @@ -113,8 +113,8 @@ 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("tdeprint"); - KGlobal::locale()->insertCatalogue("cupsdconf"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("cupsdconf"); setShowIconsInTreeList(true); setRootIsDecorated(false); @@ -136,10 +136,10 @@ CupsdDialog::~CupsdDialog() void CupsdDialog::addConfPage(CupsdPage *page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pixmap(), - KIcon::NoGroup, - KIcon::SizeMedium + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); TQVBox *box = addVBoxPage(page->pageLabel(), page->header(), icon); @@ -207,9 +207,9 @@ bool CupsdDialog::restartServer(TQString& msg) else { bool success = false; - KProcess proc; + TDEProcess proc; proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart"; - success = proc.start( KProcess::Block ) && proc.normalExit(); + success = proc.start( TDEProcess::Block ) && proc.normalExit(); if( !success ) msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); } @@ -256,7 +256,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString } else { - KGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" + TDEGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" CupsdDialog dlg(parent); if (dlg.setConfigFile(fn) && dlg.exec()) { diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp index 268465a76..282657255 100644 --- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index 79c8a9401..e9cb1a0ad 100644 --- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -27,7 +27,7 @@ #include <tqwhatsthis.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp index f12f82f1e..49fdecc7c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp index 61a89f933..22128b39c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -27,8 +27,8 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> -#include <kfiledialog.h> +#include <tdelocale.h> +#include <tdefiledialog.h> CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index 9edca5868..e939c151f 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -29,7 +29,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index d11851c60..6d6061264 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -28,9 +28,9 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp index cfd731430..e89356af9 100644 --- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -27,7 +27,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> int findComboItem(TQComboBox *cb, const TQString& str) { diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp index a058299f0..c28329e67 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqpixmap.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp index 754c9659e..936dee212 100644 --- a/tdeprint/cups/cupsdconf2/editlist.cpp +++ b/tdeprint/cups/cupsdconf2/editlist.cpp @@ -19,17 +19,17 @@ #include "editlist.h" -#include <klistbox.h> +#include <tdelistbox.h> #include <kpushbutton.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kguiitem.h> EditList::EditList(TQWidget *parent, const char *name) : TQWidget(parent, name) { - list_ = new KListBox(this); + list_ = new TDEListBox(this); addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "filenew"), this); editbtn_ = new KPushButton(KGuiItem(i18n("Edit..."), "edit"), this); delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "editdelete"), this); diff --git a/tdeprint/cups/cupsdconf2/editlist.h b/tdeprint/cups/cupsdconf2/editlist.h index a0fc7ee0a..19a2da8c8 100644 --- a/tdeprint/cups/cupsdconf2/editlist.h +++ b/tdeprint/cups/cupsdconf2/editlist.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqpixmap.h> -class KListBox; +class TDEListBox; class TQPushButton; class EditList : public TQWidget @@ -53,7 +53,7 @@ protected slots: void slotSelected(int); private: - KListBox *list_; + TDEListBox *list_; TQPushButton *addbtn_, *editbtn_, *delbtn_, *defbtn_; }; diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index 3896f7845..0754ae573 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp @@ -29,7 +29,7 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> LocationDialog::LocationDialog(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp index f3c317afd..78b0e1edf 100644 --- a/tdeprint/cups/cupsdconf2/main.cpp +++ b/tdeprint/cups/cupsdconf2/main.cpp @@ -20,24 +20,24 @@ #include "cupsddialog.h" #include <tqfile.h> -#include <klocale.h> -#include <kcmdlineargs.h> -#include <kapplication.h> +#include <tdelocale.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[file]", I18N_NOOP("Configuration file to load"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { - KCmdLineArgs::init(argc,argv,"cupsdconf", + TDECmdLineArgs::init(argc,argv,"cupsdconf", I18N_NOOP("A CUPS configuration tool"), I18N_NOOP("A CUPS configuration tool"),"0.0.1"); - KCmdLineArgs::addCmdLineOptions(options); - KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::addCmdLineOptions(options); + TDEApplication app; + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL configfile; if (args->count() > 0) diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp index 18cade9fc..f758d5d1e 100644 --- a/tdeprint/cups/cupsdconf2/portdialog.cpp +++ b/tdeprint/cups/cupsdconf2/portdialog.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> PortDialog::PortDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) 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..0992e2935 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -22,15 +22,15 @@ #include <tqlayout.h> #include <tqheader.h> #include <tqpushbutton.h> -#include <klistview.h> -#include <klocale.h> -#include <kfiledialog.h> +#include <tdelistview.h> +#include <tdelocale.h> +#include <tdefiledialog.h> #include <kiconloader.h> QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) : TQWidget(parent, name) { - m_view = new KListView(this); + m_view = new TDEListView(this); m_view->header()->hide(); m_view->addColumn(""); m_view->setFullWidth(true); diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h index c3765362e..a55f3355e 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -22,7 +22,7 @@ #include <tqwidget.h> -class KListView; +class TDEListView; class TQListViewItem; class TQPushButton; @@ -46,7 +46,7 @@ private slots: void slotSelected(TQListViewItem*); private: - KListView *m_view; + TDEListView *m_view; TQPushButton *m_add, *m_remove; }; diff --git a/tdeprint/cups/cupsdconf2/sizewidget.cpp b/tdeprint/cups/cupsdconf2/sizewidget.cpp index 742702e48..eaa39152f 100644 --- a/tdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/tdeprint/cups/cupsdconf2/sizewidget.cpp @@ -23,7 +23,7 @@ #include <tqspinbox.h> #include <tqlayout.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> SizeWidget::SizeWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp index 2f7031503..f6d392bd9 100644 --- a/tdeprint/cups/cupsinfos.cpp +++ b/tdeprint/cups/cupsinfos.cpp @@ -22,11 +22,11 @@ #include "kmtimer.h" #include "messagewindow.h" -#include <kio/passdlg.h> -#include <kio/authinfo.h> -#include <klocale.h> -#include <kconfig.h> -#include <kapplication.h> +#include <tdeio/passdlg.h> +#include <tdeio/authinfo.h> +#include <tdelocale.h> +#include <tdeconfig.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <kdebug.h> #include <kstringhandler.h> @@ -117,7 +117,7 @@ const char* CupsInfos::getPasswordCB() void CupsInfos::load() { - KConfig *conf_ = KMFactory::self()->printConfig(); + TDEConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer())); port_ = conf_->readNumEntry("Port",ippPort()); @@ -141,7 +141,7 @@ void CupsInfos::load() void CupsInfos::save() { - KConfig *conf_ = KMFactory::self()->printConfig(); + TDEConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); conf_->writeEntry("Host",host_); conf_->writeEntry("Port",port_); diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp index 1e07789ac..ed56804bc 100644 --- a/tdeprint/cups/ippreportdlg.cpp +++ b/tdeprint/cups/ippreportdlg.cpp @@ -21,9 +21,9 @@ #include "ipprequest.h" #include "kprinter.h" -#include <klocale.h> +#include <tdelocale.h> #include <kguiitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <ktextedit.h> #include <tqsimplerichtext.h> diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp index 0fde06159..ebbefefe9 100644 --- a/tdeprint/cups/ipprequest.cpp +++ b/tdeprint/cups/ipprequest.cpp @@ -24,8 +24,8 @@ #include <string> #include <cups/language.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqdatetime.h> #include <tqregexp.h> #include <cups/cups.h> @@ -208,8 +208,8 @@ void IppRequest::init() request_ = 0; } request_ = ippNew(); - //kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; - TQCString langstr = KGlobal::locale()->language().latin1(); + //kdDebug(500) << "tdeprint: IPP request, lang=" << TDEGlobal::locale()->language() << endl; + TQCString langstr = TDEGlobal::locale()->language().latin1(); cups_lang_t* lang = cupsLangGet(langstr.data()); // default charset to UTF-8 (ugly hack) lang->encoding = CUPS_UTF8; diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp index 5c2de105b..5c2245e8d 100644 --- a/tdeprint/cups/kcupsprinterimpl.cpp +++ b/tdeprint/cups/kcupsprinterimpl.cpp @@ -155,5 +155,5 @@ static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd } } if (!optstr.isEmpty()) - cmd.append(" -o ").append( KProcess::quote( optstr ) ); + cmd.append(" -o ").append( TDEProcess::quote( optstr ) ); } diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp index 7e03dae01..6bc9ec155 100644 --- a/tdeprint/cups/kmconfigcups.cpp +++ b/tdeprint/cups/kmconfigcups.cpp @@ -20,8 +20,8 @@ #include "kmconfigcups.h" #include "kmcupsconfigwidget.h" -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kdialog.h> #include <tqlayout.h> @@ -40,12 +40,12 @@ KMConfigCups::KMConfigCups(TQWidget *parent) lay0->addStretch(1); } -void KMConfigCups::loadConfig(KConfig *) +void KMConfigCups::loadConfig(TDEConfig *) { m_widget->load(); } -void KMConfigCups::saveConfig(KConfig *conf) +void KMConfigCups::saveConfig(TDEConfig *conf) { m_widget->saveConfig(conf); } diff --git a/tdeprint/cups/kmconfigcups.h b/tdeprint/cups/kmconfigcups.h index c0f1ab2ba..5d7032403 100644 --- a/tdeprint/cups/kmconfigcups.h +++ b/tdeprint/cups/kmconfigcups.h @@ -29,8 +29,8 @@ class KMConfigCups : public KMConfigPage public: KMConfigCups(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KMCupsConfigWidget *m_widget; diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index fbec34f2a..10a455226 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -21,9 +21,9 @@ #include <tqcheckbox.h> #include <kurlrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqgroupbox.h> #include <tqlayout.h> #include <kcursor.h> @@ -52,7 +52,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) m_stddir->setChecked(true); } -void KMConfigCupsDir::loadConfig(KConfig *conf) +void KMConfigCupsDir::loadConfig(TDEConfig *conf) { conf->setGroup("CUPS"); QString dir = conf->readPathEntry("InstallDir"); @@ -60,7 +60,7 @@ void KMConfigCupsDir::loadConfig(KConfig *conf) m_installdir->setURL(dir); } -void KMConfigCupsDir::saveConfig(KConfig *conf) +void KMConfigCupsDir::saveConfig(TDEConfig *conf) { conf->setGroup("CUPS"); conf->writePathEntry("InstallDir",(m_stddir->isChecked() ? TQString::null : m_installdir->url())); diff --git a/tdeprint/cups/kmconfigcupsdir.h b/tdeprint/cups/kmconfigcupsdir.h index 352388c99..6affa62b0 100644 --- a/tdeprint/cups/kmconfigcupsdir.h +++ b/tdeprint/cups/kmconfigcupsdir.h @@ -30,8 +30,8 @@ class KMConfigCupsDir : public KMConfigPage public: KMConfigCupsDir(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KURLRequester *m_installdir; diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index ca2f4aedb..f93c1a4b3 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -28,9 +28,9 @@ #include <tqpushbutton.h> #include <tqvalidator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstringhandler.h> class PortValidator : public TQIntValidator @@ -143,7 +143,7 @@ void KMCupsConfigWidget::save(bool sync) if (sync) inf->save(); } -void KMCupsConfigWidget::saveConfig(KConfig *conf) +void KMCupsConfigWidget::saveConfig(TDEConfig *conf) { conf->setGroup("CUPS"); conf->writeEntry("Host",m_host->text()); diff --git a/tdeprint/cups/kmcupsconfigwidget.h b/tdeprint/cups/kmcupsconfigwidget.h index 7eee42d80..b8e253ba8 100644 --- a/tdeprint/cups/kmcupsconfigwidget.h +++ b/tdeprint/cups/kmcupsconfigwidget.h @@ -24,7 +24,7 @@ class TQLineEdit; class TQCheckBox; -class KConfig; +class TDEConfig; class KMCupsConfigWidget : public TQWidget { @@ -33,7 +33,7 @@ public: void load(); void save(bool sync = true); - void saveConfig(KConfig*); + void saveConfig(TDEConfig*); protected: TQLineEdit *m_host, *m_port, *m_login, *m_password; diff --git a/tdeprint/cups/kmcupsfactory.cpp b/tdeprint/cups/kmcupsfactory.cpp index 47384eab6..f42bc449e 100644 --- a/tdeprint/cups/kmcupsfactory.cpp +++ b/tdeprint/cups/kmcupsfactory.cpp @@ -22,7 +22,7 @@ #include "kmcupsuimanager.h" #include "kcupsprinterimpl.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kgenericfactory.h> typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products; diff --git a/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp index 0b31489cc..fa208e551 100644 --- a/tdeprint/cups/kmcupsjobmanager.cpp +++ b/tdeprint/cups/kmcupsjobmanager.cpp @@ -32,7 +32,7 @@ #include "kpcopiespage.h" #include "kptagspage.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kurl.h> @@ -352,10 +352,10 @@ bool KMCupsJobManager::jobIppReport(KMJob *j) return result; } -TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *coll) +TQValueList<TDEAction*> KMCupsJobManager::createPluginActions(TDEActionCollection *coll) { - TQValueList<KAction*> list; - KAction *act(0); + TQValueList<TDEAction*> list; + TDEAction *act(0); list << (act = new PluginAction(0, i18n("&Job IPP Report"), "tdeprint_report", 0, coll, "plugin_ipp")); act->setGroup("plugin"); @@ -369,7 +369,7 @@ TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *c return list; } -void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const TQPtrList<KMJob>& joblist) +void KMCupsJobManager::validatePluginActions(TDEActionCollection *coll, const TQPtrList<KMJob>& joblist) { TQPtrListIterator<KMJob> it(joblist); bool flag(true); @@ -380,7 +380,7 @@ void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const TQPt /*&& !it.current()->isRemote()*/); } flag = (flag && joblist.count() > 0); - KAction *a; + TDEAction *a; if ( ( a = coll->action( "plugin_ipp" ) ) ) a->setEnabled( joblist.count() == 1 ); if ( ( a = coll->action( "plugin_prioup" ) ) ) diff --git a/tdeprint/cups/kmcupsjobmanager.h b/tdeprint/cups/kmcupsjobmanager.h index 7e8a75a53..0635dd8ea 100644 --- a/tdeprint/cups/kmcupsjobmanager.h +++ b/tdeprint/cups/kmcupsjobmanager.h @@ -35,8 +35,8 @@ public: virtual ~KMCupsJobManager(); int actions(); - TQValueList<KAction*> createPluginActions(KActionCollection*); - void validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&); + TQValueList<TDEAction*> createPluginActions(TDEActionCollection*); + void validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&); bool doPluginAction(int, const TQPtrList<KMJob>&); protected: diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index 66acb8daf..eaf5070b8 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -41,14 +41,14 @@ #include <tqdatetime.h> #include <kdebug.h> -#include <kapplication.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdeapplication.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <tdesocketbase.h> #include <klibloader.h> -#include <kmessagebox.h> -#include <kaction.h> +#include <tdemessagebox.h> +#include <tdeaction.h> #include <kdialogbase.h> #include <kextendedsocket.h> #include <kprocess.h> @@ -111,7 +111,7 @@ TQString KMCupsManager::driverDirectory() TQString KMCupsManager::cupsInstallDir() { - KConfig *conf= KMFactory::self()->printConfig(); + TDEConfig *conf= KMFactory::self()->printConfig(); conf->setGroup("CUPS"); TQString dir = conf->readPathEntry("InstallDir"); return dir; @@ -628,7 +628,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) TQStringList comps = TQStringList::split('/', drname, false); TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); - TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); + TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { setErrorMsg(i18n("Unable to find the executable foomatic-datafile " @@ -638,11 +638,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t cups -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); @@ -915,15 +915,15 @@ TQStringList KMCupsManager::detectLocalPrinters() return list; } -void KMCupsManager::createPluginActions(KActionCollection *coll) +void KMCupsManager::createPluginActions(TDEActionCollection *coll) { - KAction *act = new KAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); + TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new KAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } -void KMCupsManager::validatePluginActions(KActionCollection *coll, KMPrinter *pr) +void KMCupsManager::validatePluginActions(TDEActionCollection *coll, KMPrinter *pr) { // save selected printer for future use in slots m_currentprinter = pr; @@ -992,7 +992,7 @@ void KMCupsManager::checkUpdatePossibleInternal() { kdDebug(500) << "Checking for update possible" << endl; delete m_socket; - m_socket = new KNetwork::KBufferedSocket; + m_socket = new KNetwork::TDEBufferedSocket; m_socket->setTimeout( 1500 ); connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), TQT_SLOT( slotConnectionSuccess() ) ); @@ -1055,14 +1055,14 @@ void KMCupsManager::slotConnectionFailed( int errcode ) TQString einfo; switch (errcode) { - case KNetwork::KSocketBase::ConnectionRefused: - case KNetwork::KSocketBase::ConnectionTimedOut: + case KNetwork::TDESocketBase::ConnectionRefused: + case KNetwork::TDESocketBase::ConnectionTimedOut: einfo = i18n("connection refused") + TQString(" (%1)").arg(errcode); break; - case KNetwork::KSocketBase::LookupFailure: + case KNetwork::TDESocketBase::LookupFailure: einfo = i18n("host not found") + TQString(" (%1)").arg(errcode); break; - case KNetwork::KSocketBase::WouldBlock: + case KNetwork::TDESocketBase::WouldBlock: default: einfo = i18n("read failed (%1)").arg(errcode); break; diff --git a/tdeprint/cups/kmcupsmanager.h b/tdeprint/cups/kmcupsmanager.h index d574bb686..1e7c21b19 100644 --- a/tdeprint/cups/kmcupsmanager.h +++ b/tdeprint/cups/kmcupsmanager.h @@ -63,8 +63,8 @@ public: bool configureServer(TQWidget *parent = 0); TQStringList detectLocalPrinters(); - void createPluginActions(KActionCollection*); - void validatePluginActions(KActionCollection*, KMPrinter*); + void createPluginActions(TDEActionCollection*); + void validatePluginActions(TDEActionCollection*, KMPrinter*); TQString stateInformation(); public slots: diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp index d0dfe3cdc..03b85bb0a 100644 --- a/tdeprint/cups/kmcupsuimanager.cpp +++ b/tdeprint/cups/kmcupsuimanager.cpp @@ -55,10 +55,10 @@ #include <tqlistview.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kaction.h> -#include <kmessagebox.h> +#include <tdeaction.h> +#include <tdemessagebox.h> #include "config.h" diff --git a/tdeprint/cups/kmpropbanners.cpp b/tdeprint/cups/kmpropbanners.cpp index 22098cdff..602af7f6d 100644 --- a/tdeprint/cups/kmpropbanners.cpp +++ b/tdeprint/cups/kmpropbanners.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMPropBanners::KMPropBanners(TQWidget *parent, const char *name) : KMPropWidget(parent,name) diff --git a/tdeprint/cups/kmpropquota.cpp b/tdeprint/cups/kmpropquota.cpp index 9df6cbcb2..773e667e9 100644 --- a/tdeprint/cups/kmpropquota.cpp +++ b/tdeprint/cups/kmpropquota.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> // some forward declarations (see kmwquota.cpp) const char* unitKeyword(int); diff --git a/tdeprint/cups/kmpropusers.cpp b/tdeprint/cups/kmpropusers.cpp index 0f67205b0..2a2147aed 100644 --- a/tdeprint/cups/kmpropusers.cpp +++ b/tdeprint/cups/kmpropusers.cpp @@ -23,7 +23,7 @@ #include <tqtextview.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMPropUsers::KMPropUsers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) diff --git a/tdeprint/cups/kmwbanners.cpp b/tdeprint/cups/kmwbanners.cpp index c221f69d7..86f1347fb 100644 --- a/tdeprint/cups/kmwbanners.cpp +++ b/tdeprint/cups/kmwbanners.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqmap.h> -#include <klocale.h> +#include <tdelocale.h> TQStringList defaultBanners() { diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp index 51ecbab73..15d4f8180 100644 --- a/tdeprint/cups/kmwfax.cpp +++ b/tdeprint/cups/kmwfax.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klistbox.h> -#include <klocale.h> +#include <tdelistbox.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kurl.h> @@ -41,7 +41,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name) TQLabel *lab = new TQLabel(this); lab->setText(i18n("<p>Select the device which your serial Fax/Modem is connected to.</p>")); - m_list = new KListBox(this); + m_list = new TDEListBox(this); TQVBoxLayout *l1 = new TQVBoxLayout(this,0,10); l1->addWidget(lab,0); diff --git a/tdeprint/cups/kmwfax.h b/tdeprint/cups/kmwfax.h index 1a822165e..50b2aec0c 100644 --- a/tdeprint/cups/kmwfax.h +++ b/tdeprint/cups/kmwfax.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" -class KListBox; +class TDEListBox; class KMWFax : public KMWizardPage { @@ -33,7 +33,7 @@ public: void updatePrinter(KMPrinter*); private: - KListBox *m_list; + TDEListBox *m_list; }; #endif diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp index cb9dedd6c..a8ec8d425 100644 --- a/tdeprint/cups/kmwipp.cpp +++ b/tdeprint/cups/kmwipp.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqvalidator.h> #include <cups/http.h> diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp index 044f9cb6d..f7a4f0593 100644 --- a/tdeprint/cups/kmwippprinter.cpp +++ b/tdeprint/cups/kmwippprinter.cpp @@ -24,17 +24,17 @@ #include "kmcupsmanager.h" #include "networkscanner.h" -#include <klistview.h> +#include <tdelistview.h> #include <tqheader.h> #include <kpushbutton.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqtextview.h> #include <tqlayout.h> #include <tqregexp.h> #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kguiitem.h> #include <kurl.h> @@ -46,7 +46,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) m_ID = KMWizard::Custom+1; m_nextpage = KMWizard::Driver; - m_list = new KListView(this); + m_list = new TDEListView(this); m_list->addColumn(""); m_list->header()->hide(); m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); diff --git a/tdeprint/cups/kmwippprinter.h b/tdeprint/cups/kmwippprinter.h index 5d9d33f7a..f578afba9 100644 --- a/tdeprint/cups/kmwippprinter.h +++ b/tdeprint/cups/kmwippprinter.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" -class KListView; +class TDEListView; class TQListViewItem; class TQLineEdit; class TQTextView; @@ -46,7 +46,7 @@ protected slots: void slotIppReport(); private: - KListView *m_list; + TDEListView *m_list; NetworkScanner *m_scanner; TQLineEdit *m_uri; TQTextView *m_info; diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp index a10a14ba5..237d74fd1 100644 --- a/tdeprint/cups/kmwippselect.cpp +++ b/tdeprint/cups/kmwippselect.cpp @@ -23,9 +23,9 @@ #include "cupsinfos.h" #include "ipprequest.h" -#include <klistbox.h> +#include <tdelistbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> @@ -38,7 +38,7 @@ KMWIppSelect::KMWIppSelect(TQWidget *parent, const char *name) m_title = i18n("Remote IPP Printer Selection"); m_nextpage = KMWizard::Driver; - m_list = new KListBox(this); + m_list = new TDEListBox(this); TQVBoxLayout *lay = new TQVBoxLayout(this, 0, 0); lay->addWidget(m_list); diff --git a/tdeprint/cups/kmwippselect.h b/tdeprint/cups/kmwippselect.h index 8d1711e8c..6b8d788e6 100644 --- a/tdeprint/cups/kmwippselect.h +++ b/tdeprint/cups/kmwippselect.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" -class KListBox; +class TDEListBox; class KMWIppSelect : public KMWizardPage { @@ -34,7 +34,7 @@ public: void updatePrinter(KMPrinter*); private: - KListBox *m_list; + TDEListBox *m_list; }; #endif diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp index 596f61990..497fa03c3 100644 --- a/tdeprint/cups/kmwother.cpp +++ b/tdeprint/cups/kmwother.cpp @@ -29,8 +29,8 @@ #include <tqheader.h> #include <tqdict.h> -#include <klocale.h> -#include <klistview.h> +#include <tdelocale.h> +#include <tdelistview.h> #include <kiconloader.h> #include <kdebug.h> @@ -49,7 +49,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name) "<li>lpd://server/queue</li>" "<li>parallel:/dev/lp0</li></ul>")); TQLabel *l2 = new TQLabel(i18n("URI:"), this); - m_uriview = new KListView( this ); + m_uriview = new TDEListView( this ); m_uriview->addColumn( "" ); m_uriview->header()->hide(); m_uriview->setSorting( -1 ); diff --git a/tdeprint/cups/kmwother.h b/tdeprint/cups/kmwother.h index eba5ac2b1..a650482f4 100644 --- a/tdeprint/cups/kmwother.h +++ b/tdeprint/cups/kmwother.h @@ -23,7 +23,7 @@ #include "kmwizardpage.h" class TQLineEdit; -class KListView; +class TDEListView; class TQListViewItem; class KMWOther : public KMWizardPage @@ -40,7 +40,7 @@ protected slots: private: TQLineEdit *m_uri; - KListView *m_uriview; + TDEListView *m_uriview; }; #endif diff --git a/tdeprint/cups/kmwquota.cpp b/tdeprint/cups/kmwquota.cpp index 67245fb20..5085913d0 100644 --- a/tdeprint/cups/kmwquota.cpp +++ b/tdeprint/cups/kmwquota.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqcombobox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #ifdef HAVE_LIMITS_H #include <limits.h> diff --git a/tdeprint/cups/kmwusers.cpp b/tdeprint/cups/kmwusers.cpp index 714f6f4d4..eed7c08af 100644 --- a/tdeprint/cups/kmwusers.cpp +++ b/tdeprint/cups/kmwusers.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <keditlistbox.h> KMWUsers::KMWUsers(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp index 67ad61aec..f804b249d 100644 --- a/tdeprint/cups/kphpgl2page.cpp +++ b/tdeprint/cups/kphpgl2page.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 669bab190..8d23fe3e0 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kseparator.h> #include <kstandarddirs.h> diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp index f778139dc..d7f13c8a4 100644 --- a/tdeprint/cups/kpschedulepage.cpp +++ b/tdeprint/cups/kpschedulepage.cpp @@ -27,7 +27,7 @@ #include <tqdatetime.h> #include <tqlineedit.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <knuminput.h> diff --git a/tdeprint/cups/kptagspage.cpp b/tdeprint/cups/kptagspage.cpp index a5d465683..db134d9ba 100644 --- a/tdeprint/cups/kptagspage.cpp +++ b/tdeprint/cups/kptagspage.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index eb8bc3553..955434da4 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -29,7 +29,7 @@ #include <tqradiobutton.h> #include <tqwhatsthis.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kseparator.h> #include <kdebug.h> diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp index abc468f7a..6afc75d0f 100644 --- a/tdeprint/driver.cpp +++ b/tdeprint/driver.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdlib.h> #include <math.h> diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp index 68e705a7d..fece6c40c 100644 --- a/tdeprint/driverview.cpp +++ b/tdeprint/driverview.cpp @@ -27,10 +27,10 @@ #include <tqheader.h> #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> DrListView::DrListView(TQWidget *parent, const char *name) -: KListView(parent,name) +: TDEListView(parent,name) { addColumn(""); header()->hide(); diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h index a975fd26e..7e06648fa 100644 --- a/tdeprint/driverview.h +++ b/tdeprint/driverview.h @@ -22,7 +22,7 @@ #define DRIVERVIEW_H #include <tqwidget.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqmap.h> #include <tdelibs_export.h> @@ -30,7 +30,7 @@ class DrOptionView; class DrMain; -class TDEPRINT_EXPORT DrListView : public KListView +class TDEPRINT_EXPORT DrListView : public TDEListView { public: DrListView(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp index 2ba4d1799..77a910b0c 100644 --- a/tdeprint/droptionview.cpp +++ b/tdeprint/droptionview.cpp @@ -25,7 +25,7 @@ #include <tqlineedit.h> #include <tqslider.h> #include <tqlabel.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <tqvbuttongroup.h> #include <tqradiobutton.h> #include <tqwidgetstack.h> @@ -34,7 +34,7 @@ #include <kcursor.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> OptionBaseView::OptionBaseView(TQWidget *parent, const char *name) : TQWidget(parent,name) @@ -191,7 +191,7 @@ void OptionStringView::setValue(const TQString& val) OptionListView::OptionListView(TQWidget *parent, const char *name) : OptionBaseView(parent,name) { - m_list = new KListBox(this); + m_list = new TDEListBox(this); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(m_list); diff --git a/tdeprint/droptionview.h b/tdeprint/droptionview.h index 70f60a814..6114efcbd 100644 --- a/tdeprint/droptionview.h +++ b/tdeprint/droptionview.h @@ -27,7 +27,7 @@ class TQLineEdit; class TQSlider; class TQLabel; -class KListBox; +class TDEListBox; class TQListBoxItem; class TQVButtonGroup; class TQWidgetStack; @@ -92,7 +92,7 @@ protected slots: void slotSelectionChanged(); private: - KListBox *m_list; + TDEListBox *m_list; TQStringList m_choices; }; diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp index c976f54e0..7923ea729 100644 --- a/tdeprint/ext/kextprinterimpl.cpp +++ b/tdeprint/ext/kextprinterimpl.cpp @@ -22,8 +22,8 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdelocale.h> KExtPrinterImpl::KExtPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) : KPrinterImpl(parent,name) diff --git a/tdeprint/ext/kmextmanager.cpp b/tdeprint/ext/kmextmanager.cpp index 598dd6648..abc832d6f 100644 --- a/tdeprint/ext/kmextmanager.cpp +++ b/tdeprint/ext/kmextmanager.cpp @@ -20,7 +20,7 @@ #include "kmextmanager.h" #include "kmprinter.h" -#include <klocale.h> +#include <tdelocale.h> KMExtManager::KMExtManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMManager(parent,name) diff --git a/tdeprint/ext/kmextuimanager.cpp b/tdeprint/ext/kmextuimanager.cpp index 2fa200848..ee1c4e186 100644 --- a/tdeprint/ext/kmextuimanager.cpp +++ b/tdeprint/ext/kmextuimanager.cpp @@ -21,7 +21,7 @@ #include "kpqtpage.h" #include "kprinterpropertydialog.h" -#include <klocale.h> +#include <tdelocale.h> KMExtUiManager::KMExtUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMUiManager(parent,name) diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp index b628ac6d9..dd694b31b 100644 --- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> KFoomaticPrinterImpl::KFoomaticPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) : KPrinterImpl(parent,name) @@ -35,7 +35,7 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl() // look for executable TQString KFoomaticPrinterImpl::executable() { - QString exe = KStandardDirs::findExe("foomatic-printjob"); + QString exe = TDEStandardDirs::findExe("foomatic-printjob"); return exe; } diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp index 6a4de31eb..e1e741003 100644 --- a/tdeprint/foomatic/kmfoomaticmanager.cpp +++ b/tdeprint/foomatic/kmfoomaticmanager.cpp @@ -22,7 +22,7 @@ #include "driver.h" #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kprocess.h> @@ -77,9 +77,9 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool) } QString cmd = "foomatic-combo-xml -p "; - cmd += KProcess::quote(printer->option("printer")); + cmd += TDEProcess::quote(printer->option("printer")); cmd += " -d "; - cmd += KProcess::quote(printer->option("driver")); + cmd += TDEProcess::quote(printer->option("driver")); KPipeProcess proc(cmd); QDomDocument doc; doc.setContent(&proc); diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp index 6add13378..0d0637c90 100644 --- a/tdeprint/foomatic2loader.cpp +++ b/tdeprint/foomatic2loader.cpp @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <tqbuffer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> void tdeprint_foomatic2scanner_init( TQIODevice* ); void tdeprint_foomatic2scanner_terminate(); diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 8daa2fe20..16ec56c32 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -32,18 +32,18 @@ #include <tqsettings.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstaticdeleter.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <dcopref.h> -#include <kio/authinfo.h> +#include <tdeio/authinfo.h> #include <unistd.h> @@ -113,8 +113,8 @@ KMFactory::KMFactory() if ( !ok ) settings.writeEntry( "/qt/embedFonts", true ); - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("tdeprint"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("tdeprint"); // create DCOP signal connection connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); @@ -224,11 +224,11 @@ void KMFactory::loadFactory(const TQString& syst) } } -KConfig* KMFactory::printConfig(const TQString& group) +TDEConfig* KMFactory::printConfig(const TQString& group) { if (!m_printconfig) { - m_printconfig = new KConfig("tdeprintrc"); + m_printconfig = new TDEConfig("tdeprintrc"); TQ_CHECK_PTR(m_printconfig); } if (!group.isEmpty()) @@ -238,7 +238,7 @@ KConfig* KMFactory::printConfig(const TQString& group) TQString KMFactory::printSystem() { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->setGroup("General"); TQString sys = conf->readEntry("PrintSystem"); if (sys.isEmpty()) @@ -276,7 +276,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst) unload(); if (saveSyst) { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->setGroup("General"); conf->writeEntry("PrintSystem", syst); conf->sync(); @@ -403,7 +403,7 @@ void KMFactory::slot_configChanged() void KMFactory::saveConfig() { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->sync(); kdDebug(500) << "KMFactory (" << getpid() << ") emitting DCOP signal configChanged()" << endl; emit configChanged(); diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h index 8bfc9961d..baaf48477 100644 --- a/tdeprint/kmfactory.h +++ b/tdeprint/kmfactory.h @@ -39,7 +39,7 @@ class KXmlCommandManager; class KMSpecialManager; class KPrinterImpl; class KLibFactory; -class KConfig; +class TDEConfig; class KPReloadObject; class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject @@ -72,7 +72,7 @@ public: KMSpecialManager* specialManager(); KXmlCommandManager* commandManager(); KPrinterImpl* printerImplementation(); - KConfig* printConfig(const TQString& group = TQString::null); + TDEConfig* printConfig(const TQString& group = TQString::null); TQString printSystem(); TQValueList<PluginInfo> pluginList(); PluginInfo pluginInfo(const TQString& name); @@ -121,7 +121,7 @@ private: KPrinterImpl *m_implementation; KLibFactory *m_factory; - KConfig *m_printconfig; + TDEConfig *m_printconfig; Settings *m_settings; TQPtrList<KPReloadObject> m_objects; }; diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp index 7ff1efb95..2b42506f5 100644 --- a/tdeprint/kmjob.cpp +++ b/tdeprint/kmjob.cpp @@ -19,7 +19,7 @@ #include "kmjob.h" -#include <klocale.h> +#include <tdelocale.h> KMJob::KMJob() : KMObject() diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index 30a1fb993..de71d4dc7 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -22,9 +22,9 @@ #include "kmthreadjob.h" #include "kmfactory.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> KMJobManager::KMJobManager(TQObject *parent, const char *name) : TQObject(parent,name) @@ -203,12 +203,12 @@ int KMJobManager::actions() return 0; } -TQValueList<KAction*> KMJobManager::createPluginActions(KActionCollection*) +TQValueList<TDEAction*> KMJobManager::createPluginActions(TDEActionCollection*) { - return TQValueList<KAction*>(); + return TQValueList<TDEAction*>(); } -void KMJobManager::validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&) +void KMJobManager::validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&) { } @@ -242,14 +242,14 @@ bool KMJobManager::doPluginAction(int, const TQPtrList<KMJob>&) void KMJobManager::setLimit(int val) { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); conf->writeEntry("Limit", val); } int KMJobManager::limit() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); return conf->readNumEntry("Limit", 0); } diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h index b1cdac627..fce6e61d2 100644 --- a/tdeprint/kmjobmanager.h +++ b/tdeprint/kmjobmanager.h @@ -33,8 +33,8 @@ class KMJob; class KMThreadJob; -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; /** * @internal @@ -78,8 +78,8 @@ public: KMThreadJob* threadJob(); virtual int actions(); - virtual TQValueList<KAction*> createPluginActions(KActionCollection*); - virtual void validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&); + virtual TQValueList<TDEAction*> createPluginActions(TDEActionCollection*); + virtual void validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&); virtual bool doPluginAction(int, const TQPtrList<KMJob>&); protected: diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index c9730adba..d43239fd7 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -29,10 +29,10 @@ #include <zlib.h> #include <tqfile.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <klibloader.h> #include <unistd.h> @@ -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","tdeprint_") + KApplication::randomString(8); + destname = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); f.setName(destname); if (f.open(IO_WriteOnly)) @@ -418,7 +418,7 @@ bool KMManager::configureServer(TQWidget*) TQString KMManager::testPage() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); QString tpage = conf->readPathEntry("TestPage"); if (tpage.isEmpty()) @@ -511,11 +511,11 @@ bool KMManager::invokeOptionsDialog(TQWidget *parent) return false; } -void KMManager::createPluginActions(KActionCollection*) +void KMManager::createPluginActions(TDEActionCollection*) { } -void KMManager::validatePluginActions(KActionCollection*, KMPrinter*) +void KMManager::validatePluginActions(TDEActionCollection*, KMPrinter*) { } diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h index be69c73e6..9c5820f3a 100644 --- a/tdeprint/kmmanager.h +++ b/tdeprint/kmmanager.h @@ -35,7 +35,7 @@ class KMDBEntry; class KMVirtualManager; class KMSpecialManager; class TQWidget; -class KActionCollection; +class TDEActionCollection; class PrinterFilter; /** @@ -135,8 +135,8 @@ public: virtual TQStringList detectLocalPrinters(); // additional actions (for print manager) - virtual void createPluginActions(KActionCollection*); - virtual void validatePluginActions(KActionCollection*, KMPrinter*); + virtual void createPluginActions(TDEActionCollection*); + virtual void validatePluginActions(TDEActionCollection*, KMPrinter*); // utility function void checkUpdatePossible(); diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp index b18116ef8..c7676e382 100644 --- a/tdeprint/kmprinter.cpp +++ b/tdeprint/kmprinter.cpp @@ -21,8 +21,8 @@ #include "kprinter.h" #include "driver.h" -#include <klocale.h> -#include <kfiledialog.h> +#include <tdelocale.h> +#include <tdefiledialog.h> KMPrinter::KMPrinter() : KMObject() diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index d26515a16..910de4931 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -26,9 +26,9 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <unistd.h> @@ -47,7 +47,7 @@ bool KMSpecialManager::savePrinters() if (getuid() == 0) { confname = locate("data", "tdeprint/specials.desktop"); - if (confname.startsWith(KGlobal::dirs()->localtdedir())) + if (confname.startsWith(TDEGlobal::dirs()->localtdedir())) { // seems there's a problem here m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " @@ -107,8 +107,8 @@ bool KMSpecialManager::loadPrinters() if (m_loaded) return true; bool result(true); - TQString localDir = KGlobal::dirs()->localtdedir(); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); + TQString localDir = TDEGlobal::dirs()->localtdedir(); + TQStringList files = TDEGlobal::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/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp index 962653dd2..4dd6966d3 100644 --- a/tdeprint/kmuimanager.cpp +++ b/tdeprint/kmuimanager.cpp @@ -36,7 +36,7 @@ #include "kxmlcommand.h" #include "kpposterpage.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> KMUiManager::KMUiManager(TQObject *parent, const char *name) diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp index 2f1d80e54..dabad3093 100644 --- a/tdeprint/kmvirtualmanager.cpp +++ b/tdeprint/kmvirtualmanager.cpp @@ -28,11 +28,11 @@ #include <tqtextstream.h> #include <tqdir.h> #include <tqfileinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kurl.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <unistd.h> @@ -297,7 +297,7 @@ void KMVirtualManager::triggerSave() QString filename; if (getuid() == 0) { - if (KStandardDirs::makeDir(TQFile::decodeName("/etc/cups"))) + if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups"))) filename = TQFile::decodeName("/etc/cups/lpoptions"); } else diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp index 3557fe4d4..10eb6e204 100644 --- a/tdeprint/kpcopiespage.cpp +++ b/tdeprint/kpcopiespage.cpp @@ -34,8 +34,8 @@ #include <tqwhatsthis.h> #include <tqlayout.h> -#include <kapplication.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kseparator.h> diff --git a/tdeprint/kpdriverpage.cpp b/tdeprint/kpdriverpage.cpp index 18cfeb207..2bea47bc8 100644 --- a/tdeprint/kpdriverpage.cpp +++ b/tdeprint/kpdriverpage.cpp @@ -22,7 +22,7 @@ #include "driver.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KPDriverPage::KPDriverPage(KMPrinter *p, DrMain *d, TQWidget *parent, const char *name) : KPrintDialogPage(p,d,parent,name) diff --git a/tdeprint/kpfileselectpage.cpp b/tdeprint/kpfileselectpage.cpp index f3131717a..8b20386bd 100644 --- a/tdeprint/kpfileselectpage.cpp +++ b/tdeprint/kpfileselectpage.cpp @@ -18,13 +18,13 @@ **/ #include "kpfileselectpage.h" -#include "kfilelist.h" +#include "tdefilelist.h" #include <tqlayout.h> #include <tqstringlist.h> #include <tqregexp.h> #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> KPFileSelectPage::KPFileSelectPage(TQWidget *parent, const char *name) diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp index 66eda203d..6f46085ee 100644 --- a/tdeprint/kpfilterpage.cpp +++ b/tdeprint/kpfilterpage.cpp @@ -26,13 +26,13 @@ #include <tqtooltip.h> #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klistview.h> -#include <klocale.h> +#include <tdelistview.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kactivelabel.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdialog.h> KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) @@ -126,7 +126,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_activefilters.setAutoDelete(true); m_valid = true; - m_view = new KListView(this); + m_view = new TDEListView(this); TQWhatsThis::add(m_view, whatsThisFilterchainListView); m_view->addColumn(""); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); diff --git a/tdeprint/kpfilterpage.h b/tdeprint/kpfilterpage.h index 72065b3f1..a5bc7f757 100644 --- a/tdeprint/kpfilterpage.h +++ b/tdeprint/kpfilterpage.h @@ -25,7 +25,7 @@ #include <tqdict.h> #include <tqstringlist.h> -class KListView; +class TDEListView; class KXmlCommand; class TQListViewItem; class TQToolButton; @@ -57,7 +57,7 @@ protected: TQStringList activeList(); void updateButton(); private: - KListView *m_view; + TDEListView *m_view; TQStringList m_filters; // <idname,description> pairs TQDict<KXmlCommand> m_activefilters; TQToolButton *m_add, *m_remove, *m_up, *m_down, *m_configure; diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index b64ce075e..821290704 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> // Some ID's #define ORIENT_PORTRAIT_ID 0 @@ -440,7 +440,7 @@ void KPGeneralPage::initialize() for ( int i=HIGHSIZE_BEGIN+1; i<DEFAULT_SIZE; i+=2 ) m_pagesize->insertItem(i18n(default_size[i])); // set default page size using locale settings - TQString psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize())); + TQString psname = pageSizeToPageName((KPrinter::PageSize)(TDEGlobal::locale()->pageSize())); int index = findOption(default_size, DEFAULT_SIZE, psname); if (index >= 0) m_pagesize->setCurrentItem(index); diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp index 554679ee7..78b9ca6ef 100644 --- a/tdeprint/kpmarginpage.cpp +++ b/tdeprint/kpmarginpage.cpp @@ -31,9 +31,9 @@ #include <tqpaintdevicemetrics.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, const char *name) : KPrintDialogPage(0, driver, parent, name) @@ -62,7 +62,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) // first retrieve the Qt values for page size and margins TQPrinter prt(TQPrinter::PrinterResolution); prt.setFullPage(true); - prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : ps.toInt())); + prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? TDEGlobal::locale()->pageSize() : ps.toInt())); TQPaintDeviceMetrics metrics(&prt); float w = metrics.width(); float h = metrics.height(); diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp index f719e251b..9c0a42501 100644 --- a/tdeprint/kpposterpage.cpp +++ b/tdeprint/kpposterpage.cpp @@ -31,7 +31,7 @@ #include <tqlineedit.h> #include <tqwhatsthis.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kiconloader.h> diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index 3a0982661..c0ca5656e 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -32,7 +32,7 @@ #include <tqwhatsthis.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #define ORIENT_PORTRAIT_ID 0 @@ -203,7 +203,7 @@ void KPQtPage::init() for (int i=0; i<KPrinter::NPageSize-1; i++) m_pagesize->insertItem(i18n(page_sizes[i].text)); // default page size to locale settings - m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize()))); + m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(TDEGlobal::locale()->pageSize()))); } else { diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp index a9e1b2bb8..4a4aac597 100644 --- a/tdeprint/kprintaction.cpp +++ b/tdeprint/kprintaction.cpp @@ -22,8 +22,8 @@ #include <kprinter.h> #include <tdeprint/kmmanager.h> #include <kiconloader.h> -#include <kpopupmenu.h> -#include <klocale.h> +#include <tdepopupmenu.h> +#include <tdelocale.h> class KPrintAction::KPrintActionPrivate { @@ -40,21 +40,21 @@ public: }; KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) -: KActionMenu(text, parent, name) +: TDEActionMenu(text, parent, name) { d = new KPrintActionPrivate(); initialize(type, parentWidget); } KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) -: KActionMenu(text, icon, parent, name) +: TDEActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); initialize(type, parentWidget); } KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) -: KActionMenu(text, icon, parent, name) +: TDEActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); initialize(type, parentWidget); diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h index 5c8688e8f..94549402f 100644 --- a/tdeprint/kprintaction.h +++ b/tdeprint/kprintaction.h @@ -20,11 +20,11 @@ #ifndef KPRINTACTION_H #define KPRINTACTION_H -#include <kaction.h> +#include <tdeaction.h> class KPrinter; -class TDEPRINT_EXPORT KPrintAction : public KActionMenu +class TDEPRINT_EXPORT KPrintAction : public TDEActionMenu { Q_OBJECT public: diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 1e0e141a9..d881971ff 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -46,23 +46,23 @@ #include <tqvbox.h> #include <tqlayout.h> #include <tqregexp.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqdir.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.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 <tdeglobal.h> +#include <tdeconfig.h> #include <kguiitem.h> #include <kstdguiitem.h> -#include <kapplication.h> -#include <kio/renamedlg.h> +#include <tdeapplication.h> +#include <tdeio/renamedlg.h> #include <time.h> @@ -439,7 +439,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) } else { - KConfig *config = KGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); expandDialog(!config->readBoolEntry("DialogReduced", (KMFactory::self()->settings()->application != KPrinter::StandAlone))); } @@ -447,7 +447,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) KPrintDialog::~KPrintDialog() { - KConfig *config = KGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); config->writeEntry("DialogReduced", d->m_reduced); @@ -570,7 +570,7 @@ void KPrintDialog::initialize(KPrinter *printer) sep = true; d->m_printers->insertItem(TQPixmap(), TQString::fromLatin1("--------")); } - d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay)),it.current()->name(),false/*sep*/); + d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay)),it.current()->name(),false/*sep*/); if (it.current()->isSoftDefault()) defsoft = d->m_printers->count()-1; if (it.current()->isHardDefault()) @@ -730,19 +730,19 @@ bool KPrintDialog::checkOutputFile() { //value = (KMessageBox::warningYesNo(this,i18n("File \"%1\" already exists. Overwrite?").arg(f.absFilePath())) == KMessageBox::Yes); time_t mtimeDest = f.lastModified().toTime_t(); - KIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(), - KIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true ); + TDEIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(), + TDEIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true ); int result = dlg.exec(); switch ( result ) { - case KIO::R_OVERWRITE: + case TDEIO::R_OVERWRITE: value = true; break; default: - case KIO::R_CANCEL: + case TDEIO::R_CANCEL: value = false; break; - case KIO::R_RENAME: + case TDEIO::R_RENAME: url = dlg.newDestURL(); d->m_file->setURL( url.path() ); value = true; diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 86ef04f66..4b9a1c98f 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -33,17 +33,17 @@ #include <tqtl.h> #include <tqdir.h> #include <tqguardedptr.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> -#include <kglobal.h> -#include <kconfig.h> +#include <tdeglobal.h> +#include <tdeconfig.h> #include <krun.h> #include <knotifyclient.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> static void dumpOptions(const TQMap<TQString,TQString>& opts); static void reportError(KPrinter*); @@ -174,7 +174,7 @@ void KPrinter::loadSettings() setSearchName(option("kde-searchname")); d->m_options.remove("kde-searchname"); - KConfig *conf = KGlobal::config(), *pconf = KMFactory::self()->printConfig(); + TDEConfig *conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig(); conf->setGroup("KPrinter Settings"); pconf->setGroup("General"); @@ -199,7 +199,7 @@ void KPrinter::saveSettings() } // save latest used printer to config file - KConfig *conf = KGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("Printer",searchName()); // latest used print command @@ -850,7 +850,7 @@ void KPrinter::setFromTo(int m, int M) // if no page size defined, use the localized one KPrinter::PageSize KPrinter::pageSize() const -{ return (option("kde-pagesize").isEmpty() ? (PageSize)KGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } +{ return (option("kde-pagesize").isEmpty() ? (PageSize)TDEGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } KPrinter::PageSetType KPrinter::pageSet() const { return (option("kde-pageset").isEmpty() ? AllPages : (PageSetType)(option("kde-pageset").toInt())); } diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 05e1aa0df..edd380009 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -32,16 +32,16 @@ #include <tqfile.h> #include <tqregexp.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> #include <kdatastream.h> #include <kdebug.h> #include <kmimemagic.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <stdlib.h> @@ -158,9 +158,9 @@ bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag) } else { - KProcess proc; + TDEProcess proc; proc << (flag?"mv":"cp") << f[0] << p->outputFileName(); - if (!proc.start(KProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) + if (!proc.start(TDEProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) { p->setErrorMessage(i18n("Cannot save print file to %1. Check that you have write access to it.").arg(p->outputFileName())); return false; @@ -223,7 +223,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) { kdDebug(500) << "tdeprint: status message: " << msg << endl; - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); if (!conf->readBoolEntry("ShowStatusMsg", true)) return; @@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile() { TQString f; // be sure the file doesn't exist - do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); + do f = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); while (TQFile::exists(f)); return f; } @@ -573,7 +573,7 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin } TQString KPrinterImpl::quote(const TQString& s) -{ return KProcess::quote(s); } +{ return TDEProcess::quote(s); } void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) { @@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) void KPrinterImpl::loadAppOptions() { - KConfig *conf = KGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); TQStringList opts = conf->readListEntry("ApplicationOptions"); for (uint i=0; i<opts.count(); i+=2) @@ -598,7 +598,7 @@ void KPrinterImpl::saveAppOptions() if (it.key().startsWith("app-")) optlist << it.key() << it.data(); - KConfig *conf = KGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("ApplicationOptions", optlist); } diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp index 1128a7d3a..c120ba843 100644 --- a/tdeprint/kprinterpropertydialog.cpp +++ b/tdeprint/kprinterpropertydialog.cpp @@ -25,9 +25,9 @@ #include "kmprinter.h" #include "driver.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqtabwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kguiitem.h> diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index 32381af28..623a7f934 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -25,27 +25,27 @@ #include <tqlayout.h> #include <tqvbox.h> -#include <kparts/part.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeparts/part.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <klibloader.h> #include <ktrader.h> #include <kuserprofile.h> #include <krun.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <kconfig.h> -#include <ktoolbar.h> +#include <tdeconfig.h> +#include <tdetoolbar.h> #include <kmimetype.h> KPreviewProc::KPreviewProc() -: KProcess() +: TDEProcess() { m_bOk = false; - connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); } KPreviewProc::~KPreviewProc() @@ -63,7 +63,7 @@ bool KPreviewProc::startPreview() return false; } -void KPreviewProc::slotProcessExited(KProcess* proc) +void KPreviewProc::slotProcessExited(TDEProcess* proc) { kapp->exit_loop(); if ( proc->normalExit() && proc->exitStatus() == 0 ) @@ -81,26 +81,26 @@ public: KPrintPreviewPrivate(KPrintPreview *dlg) : gvpart_(0) { mainwidget_ = new TQWidget(dlg, "MainWidget"); - toolbar_ = new KToolBar(mainwidget_, "PreviewToolBar", true); - actions_ = new KActionCollection(dlg); - accel_ = new KAccel(dlg); + toolbar_ = new TDEToolBar(mainwidget_, "PreviewToolBar", true); + actions_ = new TDEActionCollection(dlg); + accel_ = new TDEAccel(dlg); previewonly_ = false; } ~KPrintPreviewPrivate() { if (gvpart_) delete gvpart_; } - void plugAction(KAction *act) + void plugAction(TDEAction *act) { act->plug(toolbar_); act->plugAccel(accel_); } KParts::ReadOnlyPart *gvpart_; - KToolBar *toolbar_; - KActionCollection *actions_; + TDEToolBar *toolbar_; + TDEActionCollection *actions_; TQWidget *mainwidget_; - KAccel *accel_; + TDEAccel *accel_; bool previewonly_; }; @@ -111,8 +111,8 @@ static KLibFactory* componentFactory() factory = KLibLoader::self()->factory("libkghostviewpart"); if( factory ) return factory; - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null); - for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) + TDETrader::OfferList offers = TDETrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null); + for (TDETrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) { KService::Ptr service = *it; factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); @@ -157,8 +157,8 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); else { - new KAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); - new KAction(i18n("Cancel"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); + new TDEAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); + new TDEAction(i18n("Cancel"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); } } @@ -193,13 +193,13 @@ void KPrintPreview::initView(KLibFactory *factory) TQDomElement a = acts.item( i ).toElement(); if ( a.attribute( "name" ) == "goToPage" ) continue; - KAction *act = d->gvpart_->action( a ); + TDEAction *act = d->gvpart_->action( a ); if ( act != 0 ) d->plugAction( act ); } } /* - KAction *act; + TDEAction *act; d->toolbar_->insertLineSeparator(); if ((act = d->gvpart_->action("zoomIn")) != 0) d->plugAction(act); @@ -212,8 +212,8 @@ void KPrintPreview::initView(KLibFactory *factory) d->plugAction(act); */ } - d->toolbar_->setIconText(KToolBar::IconTextRight); - d->toolbar_->setBarPos(KToolBar::Top); + d->toolbar_->setIconText(TDEToolBar::IconTextRight); + d->toolbar_->setBarPos(TDEToolBar::Top); d->toolbar_->setMovingEnabled(false); //d->adjustSize(); @@ -244,7 +244,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId if ( !isPS ) kdDebug( 500 ) << "Previewing a non PostScript file, built-in preview disabled" << endl; - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); KLibFactory *factory(0); bool externalPreview = conf->readBoolEntry("ExternalPreview", false); @@ -273,7 +273,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId if (externalPreview && isPS ) { exe = conf->readPathEntry("PreviewCommand", "gv"); - if (KStandardDirs::findExe(exe).isEmpty()) + if (TDEStandardDirs::findExe(exe).isEmpty()) { QString msg = i18n("The preview program %1 cannot be found. " "Check that the program is correctly installed and " diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h index 5fd581fe7..ae99fb405 100644 --- a/tdeprint/kprintpreview.h +++ b/tdeprint/kprintpreview.h @@ -47,7 +47,7 @@ private: KPrintPreviewPrivate *d; }; -class KPreviewProc : public KProcess +class KPreviewProc : public TDEProcess { Q_OBJECT public: @@ -57,7 +57,7 @@ public: bool startPreview(); protected slots: - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); private: bool m_bOk; }; diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index fb1df2840..89ef5e2ca 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -18,17 +18,17 @@ **/ #include "kprintprocess.h" -#include <kapplication.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdelocale.h> #include <tqfile.h> KPrintProcess::KPrintProcess() : KShellProcess() { // redirect everything to a single buffer - connect(this,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(this,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect( this, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotExited( KProcess* ) ) ); + connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) ); m_state = None; } @@ -53,7 +53,7 @@ bool KPrintProcess::print() return start(NotifyOnExit,All); } -void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) +void KPrintProcess::slotReceivedStderr(TDEProcess *proc, char *buf, int len) { if (proc == this) { @@ -62,7 +62,7 @@ void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) } } -void KPrintProcess::slotExited( KProcess* ) +void KPrintProcess::slotExited( TDEProcess* ) { switch ( m_state ) { diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h index 976b35afe..5ceb3835e 100644 --- a/tdeprint/kprintprocess.h +++ b/tdeprint/kprintprocess.h @@ -50,8 +50,8 @@ signals: void printError( KPrintProcess*, const TQString& ); protected slots: - void slotReceivedStderr(KProcess*, char*, int); - void slotExited( KProcess* ); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotExited( TDEProcess* ); private: QString m_buffer; diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 212b53fb5..2d5712674 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -30,13 +30,13 @@ #include <tqmap.h> #include <tqvaluelist.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kdialogbase.h> #include <kdebug.h> #include <kprocess.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> static void setOptionText(DrBase *opt, const TQString& s) { @@ -393,7 +393,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi } else { - format.replace( re, KProcess::quote( dopt->valueText() ) ); + format.replace( re, TDEProcess::quote( dopt->valueText() ) ); } str.append(format).append(" "); } @@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList() { if (d->m_cmdlist.isEmpty()) { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeprint/filters/"); for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) { diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp index 2704cc46a..3647f0b38 100644 --- a/tdeprint/lpd/klpdprinterimpl.cpp +++ b/tdeprint/lpd/klpdprinterimpl.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> KLpdPrinterImpl::KLpdPrinterImpl(TQObject *parent, const char *name) : KPrinterImpl(parent,name) @@ -35,7 +35,7 @@ KLpdPrinterImpl::~KLpdPrinterImpl() TQString KLpdPrinterImpl::executable() { - return KStandardDirs::findExe("lpr"); + return TDEStandardDirs::findExe("lpr"); } bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index fcb79a052..e72733f89 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -32,9 +32,9 @@ #include <tqmap.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kprocess.h> #include <pwd.h> @@ -185,9 +185,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer) // 4) change permissions of spool directory TQCString cmd = "chmod -R o-rwx,g+rwX "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); cmd += "&& chown -R lp.lp "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); if (system(cmd.data()) != 0) { setErrorMsg(i18n("Unable to set correct permissions on spool directory %1 for printer <b>%2</b>.").arg(ent->arg("sd")).arg(ent->m_name)); @@ -209,7 +209,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer) return false; } TQCString cmd = "rm -rf "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); system(cmd.data()); delete ent; return true; @@ -225,7 +225,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) cmd += " "; cmd += state ? "up" : "down"; cmd += " "; - cmd += KProcess::quote(printer->printerName()); + cmd += TDEProcess::quote(printer->printerName()); if (proc.open(cmd)) { QTextStream t(&proc); @@ -273,7 +273,7 @@ void KMLpdManager::listPrinters() TQString KMLpdManager::programName(int f) { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("LPD"); switch (f) { @@ -549,9 +549,9 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) return false; // write various driver files using templates TQCString cmd = "cp "; - cmd += TQFile::encodeName(KProcess::quote(driverDirectory()+"/master-filter")); + cmd += TQFile::encodeName(TDEProcess::quote(driverDirectory()+"/master-filter")); cmd += " "; - cmd += TQFile::encodeName(KProcess::quote(spooldir + "/filter")); + cmd += TQFile::encodeName(TDEProcess::quote(spooldir + "/filter")); if (system(cmd.data()) == 0 && savePrinttoolCfgFile(driverDirectory()+"/general.cfg.in",spooldir,options) && savePrinttoolCfgFile(driverDirectory()+"/postscript.cfg.in",spooldir,options) && @@ -620,9 +620,9 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry) if (entry->arg("sd").isEmpty()) entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name; QString sd = entry->arg("sd"); - if (!KStandardDirs::exists(sd)) + if (!TDEStandardDirs::exists(sd)) { - if (!KStandardDirs::makeDir(sd,0750)) + if (!TDEStandardDirs::makeDir(sd,0750)) return false; struct passwd *lp_pw = getpwnam("lp"); if (lp_pw && chown(TQFile::encodeName(sd),lp_pw->pw_uid,lp_pw->pw_gid) != 0) diff --git a/tdeprint/lpd/kmlpduimanager.cpp b/tdeprint/lpd/kmlpduimanager.cpp index fad3fcd58..173c03b2b 100644 --- a/tdeprint/lpd/kmlpduimanager.cpp +++ b/tdeprint/lpd/kmlpduimanager.cpp @@ -27,7 +27,7 @@ #include "kmpropdriver.h" #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> KMLpdUiManager::KMLpdUiManager(TQObject *parent, const char *name) : KMUiManager(parent,name) diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp index 5131b33f3..54f19c405 100644 --- a/tdeprint/lpd/lpdtools.cpp +++ b/tdeprint/lpd/lpdtools.cpp @@ -22,7 +22,7 @@ #include "kmprinter.h" #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> static const char *pt_pagesize[] = { "ledger", I18N_NOOP("Ledger"), diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp index e8ee34fd5..e628a1c41 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmacroexpander.h> KLpdUnixPrinterImpl::KLpdUnixPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) @@ -47,9 +47,9 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer) // look for executable, starting with "lpr" TQString KLpdUnixPrinterImpl::executable() { - QString exe = KStandardDirs::findExe("lpr"); + QString exe = TDEStandardDirs::findExe("lpr"); if (exe.isEmpty()) - exe = KStandardDirs::findExe("lp"); + exe = TDEStandardDirs::findExe("lp"); return exe; } diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.h b/tdeprint/lpdunix/klpdunixprinterimpl.h index bbbda4104..c4a1ac671 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.h +++ b/tdeprint/lpdunix/klpdunixprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KLpdUnixPrinterImpl : public KPrinterImpl { diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp index 577575e7f..7a291f6df 100644 --- a/tdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp @@ -26,7 +26,7 @@ #include <tqfileinfo.h> #include <tqtextstream.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -230,7 +230,7 @@ void KMLpdUnixManager::parseEtcPrintcap() TQString getEtcPrintersConfName() { TQString printersconf("/etc/printers.conf"); - if (!TQFile::exists(printersconf) && !KStandardDirs::findExe( "ypcat" ).isEmpty()) + if (!TQFile::exists(printersconf) && !TDEStandardDirs::findExe( "ypcat" ).isEmpty()) { // standard file not found, try NIS printersconf = locateLocal("tmp","printers.conf"); diff --git a/tdeprint/lpdunix/kmlpdunixuimanager.cpp b/tdeprint/lpdunix/kmlpdunixuimanager.cpp index 686dfecbb..b7f059f1a 100644 --- a/tdeprint/lpdunix/kmlpdunixuimanager.cpp +++ b/tdeprint/lpdunix/kmlpdunixuimanager.cpp @@ -21,7 +21,7 @@ #include "kpqtpage.h" #include "kprinterpropertydialog.h" -#include <klocale.h> +#include <tdelocale.h> KMLpdUnixUiManager::KMLpdUnixUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMUiManager(parent,name) diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp index f6eb1f8aa..acb0e0c2d 100644 --- a/tdeprint/lpr/apshandler.cpp +++ b/tdeprint/lpr/apshandler.cpp @@ -31,7 +31,7 @@ #include <tqtextstream.h> #include <tqvaluestack.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <sys/types.h> @@ -216,7 +216,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt) return NULL; } TQString path = sysconfDir() + "/" + prt->printerName(); - if (!KStandardDirs::makeDir(path, 0755)) + if (!TDEStandardDirs::makeDir(path, 0755)) { manager()->setErrorMsg(i18n("Unable to create directory %1.").arg(path)); return NULL; diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp index 6c4ecc30c..9a8f9caa2 100644 --- a/tdeprint/lpr/editentrydialog.cpp +++ b/tdeprint/lpr/editentrydialog.cpp @@ -25,10 +25,10 @@ #include <tqcombobox.h> #include <tqlabel.h> #include <tqheader.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqlayout.h> #include <tqwidgetstack.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const char *name) @@ -39,7 +39,7 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c TQLabel *lab0 = new TQLabel(i18n("Aliases:"), w); m_aliases = new TQLineEdit(w); - m_view = new KListView(w); + m_view = new TDEListView(w); m_view->addColumn(""); m_view->header()->hide(); m_type = new TQComboBox(w); diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp index 92928a0cc..4dbe5e378 100644 --- a/tdeprint/lpr/klprprinterimpl.cpp +++ b/tdeprint/lpr/klprprinterimpl.cpp @@ -28,7 +28,7 @@ KLprPrinterImpl::KLprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) : KPrinterImpl(parent,name) { - m_exepath = KStandardDirs::findExe("lpr"); + m_exepath = TDEStandardDirs::findExe("lpr"); } KLprPrinterImpl::~KLprPrinterImpl() diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp index f43a8da2d..fed1dd17d 100644 --- a/tdeprint/lpr/kmconfiglpr.cpp +++ b/tdeprint/lpr/kmconfiglpr.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqgroupbox.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name) : KMConfigPage(parent, name) @@ -45,12 +45,12 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name) l0->addStretch(1); } -void KMConfigLpr::loadConfig(KConfig*) +void KMConfigLpr::loadConfig(TDEConfig*) { m_mode->setCurrentItem(LprSettings::self()->mode()); } -void KMConfigLpr::saveConfig(KConfig *conf) +void KMConfigLpr::saveConfig(TDEConfig *conf) { LprSettings::self()->setMode((LprSettings::Mode)(m_mode->currentItem())); diff --git a/tdeprint/lpr/kmconfiglpr.h b/tdeprint/lpr/kmconfiglpr.h index 7f3d50857..fa7a0ae26 100644 --- a/tdeprint/lpr/kmconfiglpr.h +++ b/tdeprint/lpr/kmconfiglpr.h @@ -29,8 +29,8 @@ class KMConfigLpr : public KMConfigPage public: KMConfigLpr(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: TQComboBox *m_mode; diff --git a/tdeprint/lpr/kmlprjobmanager.cpp b/tdeprint/lpr/kmlprjobmanager.cpp index 851663664..0738d17c1 100644 --- a/tdeprint/lpr/kmlprjobmanager.cpp +++ b/tdeprint/lpr/kmlprjobmanager.cpp @@ -25,7 +25,7 @@ #include "lprsettings.h" #include <tqptrlist.h> -#include <klocale.h> +#include <tdelocale.h> KMLprJobManager::KMLprJobManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMJobManager(parent, name) diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 54f987c58..046f082f7 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -30,13 +30,13 @@ #include <tqfileinfo.h> #include <tqptrlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kprinter.h> #include <kprocess.h> -#include <kaction.h> -#include <kmessagebox.h> +#include <tdeaction.h> +#include <tdemessagebox.h> #include <klibloader.h> #include <stdlib.h> @@ -137,7 +137,7 @@ void KMLprManager::initHandlers() insertHandler(new LPRngToolHandler(this)); // now load external handlers - TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); + TQStringList l = TDEGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); @@ -345,7 +345,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt) return false; } sd.append("/").append(prt->printerName()); - if (!KStandardDirs::makeDir(sd, 0755)) + if (!TDEStandardDirs::makeDir(sd, 0755)) { setErrorMsg(i18n("Unable to create the spool directory %1. Check that you " "have the required permissions for that operation.").arg(sd)); @@ -405,7 +405,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt) { // printcap file saved, entry can be deleted now delete entry; - status = (::system(TQFile::encodeName("rm -rf " + KProcess::quote(sd))) == 0); + status = (::system(TQFile::encodeName("rm -rf " + TDEProcess::quote(sd))) == 0); if (!status) setErrorMsg(i18n("Unable to remove spool directory %1. " "Check that you have write permissions " @@ -453,13 +453,13 @@ TQString KMLprManager::printOptions(KPrinter *prt) return TQString::null; } -void KMLprManager::createPluginActions(KActionCollection *coll) +void KMLprManager::createPluginActions(TDEActionCollection *coll) { - KAction *act = new KAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); + TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); act->setGroup("plugin"); } -void KMLprManager::validatePluginActions(KActionCollection *coll, KMPrinter *prt) +void KMLprManager::validatePluginActions(TDEActionCollection *coll, KMPrinter *prt) { m_currentprinter = prt; // FIXME: disabled until completion diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h index 34d38340f..d26af4d77 100644 --- a/tdeprint/lpr/kmlprmanager.h +++ b/tdeprint/lpr/kmlprmanager.h @@ -54,8 +54,8 @@ public: LpcHelper* lpcHelper() { return m_lpchelper; } TQString printOptions(KPrinter*); - void createPluginActions(KActionCollection*); - void validatePluginActions(KActionCollection*, KMPrinter*); + void createPluginActions(TDEActionCollection*); + void validatePluginActions(TDEActionCollection*, KMPrinter*); TQString stateInformation(); protected slots: diff --git a/tdeprint/lpr/kmlpruimanager.cpp b/tdeprint/lpr/kmlpruimanager.cpp index 655309e0c..b7d23bb42 100644 --- a/tdeprint/lpr/kmlpruimanager.cpp +++ b/tdeprint/lpr/kmlpruimanager.cpp @@ -29,7 +29,7 @@ #include "kmwbackend.h" #include "kmconfiglpr.h" -#include <klocale.h> +#include <tdelocale.h> KMLprUiManager::KMLprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMUiManager(parent,name) diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index 05d09c40a..b366537e5 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -26,7 +26,7 @@ #include <tqtextstream.h> #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <stdlib.h> @@ -51,9 +51,9 @@ LpcHelper::LpcHelper(TQObject *parent, const char *name) // add some specific dirs. TQString PATH = getenv("PATH"); PATH.append(":/usr/sbin:/usr/local/sbin:/sbin:/opt/sbin:/opt/local/sbin"); - m_exepath = KStandardDirs::findExe("lpc", PATH); - m_checkpcpath = KStandardDirs::findExe("checkpc", PATH); - m_lprmpath = KStandardDirs::findExe("lprm"); + m_exepath = TDEStandardDirs::findExe("lpc", PATH); + m_checkpcpath = TDEStandardDirs::findExe("checkpc", PATH); + m_lprmpath = TDEStandardDirs::findExe("lprm"); } LpcHelper::~LpcHelper() @@ -235,7 +235,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + " " + op + " " + KProcess::quote(printer)); + TQString result = execute(m_exepath + " " + op + " " + TDEProcess::quote(printer)); int status; switch (LprSettings::self()->mode()) @@ -273,7 +273,7 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm"); return false; } - TQString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_lprmpath + " -P " + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); if (result.find("dequeued") != -1) return true; else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1) @@ -291,7 +291,7 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); TQString answer = lprngAnswer(result, job->printer()); if (answer == "no") { diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp index 30348f591..1c02cafc7 100644 --- a/tdeprint/lpr/lpqhelper.cpp +++ b/tdeprint/lpr/lpqhelper.cpp @@ -29,7 +29,7 @@ LpqHelper::LpqHelper(TQObject *parent, const char *name) : TQObject(parent, name) { - m_exepath = KStandardDirs::findExe("lpq"); + m_exepath = TDEStandardDirs::findExe("lpq"); } LpqHelper::~LpqHelper() @@ -83,7 +83,7 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line) void LpqHelper::listJobs(TQPtrList<KMJob>& jobs, const TQString& prname, int limit) { KPipeProcess proc; - if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname))) + if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + TDEProcess::quote(prname))) { TQTextStream t(&proc); TQString line; diff --git a/tdeprint/lpr/lprhandler.cpp b/tdeprint/lpr/lprhandler.cpp index fcb838bb9..767b55382 100644 --- a/tdeprint/lpr/lprhandler.cpp +++ b/tdeprint/lpr/lprhandler.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tqvaluestack.h> -#include <klocale.h> +#include <tdelocale.h> #include <unistd.h> diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp index d3e283123..960f5adb8 100644 --- a/tdeprint/lpr/lprngtoolhandler.cpp +++ b/tdeprint/lpr/lprngtoolhandler.cpp @@ -28,7 +28,7 @@ #include <tqfile.h> #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp index 0c1cec2a9..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> @@ -53,7 +53,7 @@ LprSettings* LprSettings::self() void LprSettings::init() { // LPR/LPRng mode - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("LPR"); TQString modestr = conf->readEntry("Mode"); if (modestr == "LPRng") diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index 49c33822d..826867cd2 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -29,9 +29,9 @@ #include "util.h" #include "foomatic2loader.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kprocess.h> #include <tqfile.h> @@ -46,10 +46,10 @@ MaticHandler::MaticHandler(KMManager *mgr) { TQString PATH = getenv("PATH"); PATH.append(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); - m_exematicpath = KStandardDirs::findExe("lpdomatic", PATH); - m_ncpath = KStandardDirs::findExe("nc"); - m_smbpath = KStandardDirs::findExe("smbclient"); - m_rlprpath = KStandardDirs::findExe("rlpr"); + m_exematicpath = TDEStandardDirs::findExe("lpdomatic", PATH); + m_ncpath = TDEStandardDirs::findExe("nc"); + m_smbpath = TDEStandardDirs::findExe("smbclient"); + m_rlprpath = TDEStandardDirs::findExe("rlpr"); } bool MaticHandler::validate(PrintcapEntry *entry) @@ -225,7 +225,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool) // changing printer name), the template would be also removed TQString origfilename = maticFile(entry); TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - ::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename))); + ::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename))); DrMain *driver = Foomatic2Loader::loadDriver(filename); if (driver) { @@ -248,7 +248,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); - TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); + TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " @@ -258,11 +258,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t lpd -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); @@ -329,7 +329,7 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai inFile.close(); tmpFile.close(); - TQString cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile); + TQString cmd = "mv " + TDEProcess::quote(tmpFile.name()) + " " + TDEProcess::quote(outFile); int status = ::system(TQFile::encodeName(cmd).data()); TQFile::remove(tmpFile.name()); result = (status != -1 && WEXITSTATUS(status) == 0); @@ -352,7 +352,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) return true; TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); - TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); + TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " 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..0de381d9d 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 @@ -26,7 +26,7 @@ libtdeprint_management_la_SOURCES = \ pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \ kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined -libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) +libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) libtdeprint_management_la_METASOURCES = AUTO libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp index 92ea782e5..5bddffe02 100644 --- a/tdeprint/management/cjanuswidget.cpp +++ b/tdeprint/management/cjanuswidget.cpp @@ -22,7 +22,7 @@ #include <tqwidgetstack.h> #include <tqlabel.h> #include <tqpainter.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <tqlayout.h> #include <kseparator.h> @@ -79,7 +79,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p) //*********************************************************************************** -class CJanusWidget::CListBox : public KListBox +class CJanusWidget::CListBox : public TDEListBox { public: CListBox(TQWidget *parent = 0, const char *name = 0); @@ -92,7 +92,7 @@ protected: }; CJanusWidget::CListBox::CListBox(TQWidget *parent, const char *name) -: KListBox(parent,name) +: TDEListBox(parent,name) { verticalScrollBar()->installEventFilter(this); } @@ -105,7 +105,7 @@ bool CJanusWidget::CListBox::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Show || e->type() == TQEvent::Hide) computeWidth(); - return KListBox::eventFilter(o,e); + return TDEListBox::eventFilter(o,e); } void CJanusWidget::CListBox::computeWidth() diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 106e19e57..466c75853 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -1,28 +1,28 @@ #include "kmmanager.h" -#include <kcmdlineargs.h> -#include <kapplication.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "tdeconfig", I18N_NOOP("Configure TDE Print"), 0 }, { "serverconfig", I18N_NOOP("Configure print server"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { - KCmdLineArgs::init(argc, argv, "kaddprinterwizard", + TDECmdLineArgs::init(argc, argv, "kaddprinterwizard", I18N_NOOP("Start the add printer wizard"), "0.1"); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); - KGlobal::locale()->setMainCatalogue("tdelibs"); + TDEGlobal::locale()->setMainCatalogue("tdelibs"); - KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDEApplication app; + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool doConfig = args->isSet("tdeconfig"); bool doSrvConfig = args->isSet("serverconfig"); diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp index 8bf4d5a10..984d2c128 100644 --- a/tdeprint/management/kiconselectaction.cpp +++ b/tdeprint/management/kiconselectaction.cpp @@ -22,13 +22,13 @@ #include <tqpopupmenu.h> #include <kiconloader.h> #include <kdebug.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> -class KIconSelectActionPrivate +class TDEIconSelectActionPrivate { public: - KIconSelectActionPrivate() + TDEIconSelectActionPrivate() { m_menu = 0; } @@ -36,18 +36,18 @@ public: TQPopupMenu* m_menu; }; -KIconSelectAction::KIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name) -: KSelectAction(text, accel, parent, name) +TDEIconSelectAction::TDEIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name) +: TDESelectAction(text, accel, parent, name) { - d = new KIconSelectActionPrivate; + d = new TDEIconSelectActionPrivate; } -KIconSelectAction::~KIconSelectAction() +TDEIconSelectAction::~TDEIconSelectAction() { delete d; } -void KIconSelectAction::updateIcons() +void TDEIconSelectAction::updateIcons() { if (d->m_menu) { @@ -57,7 +57,7 @@ void KIconSelectAction::updateIcons() } } -void KIconSelectAction::createPopupMenu() +void TDEIconSelectAction::createPopupMenu() { if (!d->m_menu) { @@ -66,25 +66,25 @@ void KIconSelectAction::createPopupMenu() } } -void KIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst) +void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst) { - KSelectAction::setItems(lst); + TDESelectAction::setItems(lst); d->m_iconlst = iconlst; updateIcons(); } -int KIconSelectAction::plug(TQWidget* widget, int index) +int TDEIconSelectAction::plug(TQWidget* widget, int index) { int value(-1); if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { createPopupMenu(); - value = KSelectAction::plug(widget, index); + value = TDESelectAction::plug(widget, index); } - else if (widget->inherits("KToolBar")) + else if (widget->inherits("TDEToolBar")) { - KToolBar* bar = static_cast<KToolBar*>(widget); - int id = KAction::getToolButtonID(); + TDEToolBar* bar = static_cast<TDEToolBar*>(widget); + int id = TDEAction::getToolButtonID(); // To have a correct layout in the toolbar, a non // empty icon has to be used. Use "unknown" by default. TQString iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown"); @@ -101,18 +101,18 @@ int KIconSelectAction::plug(TQWidget* widget, int index) return value; } -void KIconSelectAction::updateCurrentItem(int id) +void TDEIconSelectAction::updateCurrentItem(int id) { TQWidget* w = container(id); - if (w->inherits("KToolBar")) - static_cast<KToolBar*>(w)->getButton(itemId(id))->setIcon(d->m_iconlst[currentItem()]); + if (w->inherits("TDEToolBar")) + static_cast<TDEToolBar*>(w)->getButton(itemId(id))->setIcon(d->m_iconlst[currentItem()]); else - KSelectAction::updateCurrentItem(id); + TDESelectAction::updateCurrentItem(id); } -void KIconSelectAction::setCurrentItem(int index) +void TDEIconSelectAction::setCurrentItem(int index) { - KSelectAction::setCurrentItem(index); + TDESelectAction::setCurrentItem(index); } #include "kiconselectaction.moc" diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h index 84bef60d2..26e703fbf 100644 --- a/tdeprint/management/kiconselectaction.h +++ b/tdeprint/management/kiconselectaction.h @@ -20,16 +20,16 @@ #ifndef KICONSELECTACTION_H #define KICONSELECTACTION_H -#include <kaction.h> +#include <tdeaction.h> -class KIconSelectActionPrivate; +class TDEIconSelectActionPrivate; -class KIconSelectAction : public KSelectAction +class TDEIconSelectAction : public TDESelectAction { Q_OBJECT public: - KIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0); - virtual ~KIconSelectAction(); + TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0); + virtual ~TDEIconSelectAction(); virtual int plug(TQWidget* widget, int index = -1); @@ -43,7 +43,7 @@ protected: virtual void updateCurrentItem(int id); private: - KIconSelectActionPrivate* d; + TDEIconSelectActionPrivate* d; }; #endif diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp index 32fb7db11..4cf33998f 100644 --- a/tdeprint/management/kmconfigcommand.cpp +++ b/tdeprint/management/kmconfigcommand.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index d26b2082d..50eabe9b1 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -30,9 +30,9 @@ #include "kmconfigjobs.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.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) @@ -47,7 +47,7 @@ KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name) KMFactory::self()->uiManager()->setupConfigDialog(this); // initialize pages - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQPtrListIterator<KMConfigPage> it(m_pages); for (;it.current();++it) it.current()->loadConfig(conf); @@ -60,10 +60,10 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) { if (page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pagePixmap(), - KIcon::NoGroup, - KIcon::SizeMedium + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); TQFrame *frame = addPage(page->pageName(),page->pageHeader(),icon); @@ -77,7 +77,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) void KMConfigDialog::slotOk() { // save configuration - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQPtrListIterator<KMConfigPage> it(m_pages); for (;it.current();++it) it.current()->saveConfig(conf); diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index 29d5107e0..b7be0a1e6 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -28,10 +28,10 @@ #include <tqlabel.h> #include <tqapplication.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kdialog.h> KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) @@ -43,10 +43,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); - m_list1 = new KListBox(box); - m_list1->setSelectionMode(KListBox::Extended); - m_list2 = new KListBox(box); - m_list2->setSelectionMode(KListBox::Extended); + m_list1 = new TDEListBox(box); + m_list1->setSelectionMode(TDEListBox::Extended); + m_list2 = new TDEListBox(box); + m_list2->setSelectionMode(TDEListBox::Extended); m_add = new TQToolButton( box ); m_add->setIconSet(TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" )); m_remove = new TQToolButton( box ); @@ -88,7 +88,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) m_remove->setEnabled(false); } -void KMConfigFilter::loadConfig(KConfig *conf) +void KMConfigFilter::loadConfig(TDEConfig *conf) { conf->setGroup("Filter"); TQStringList m_plist = conf->readListEntry("Printers"); @@ -97,7 +97,7 @@ void KMConfigFilter::loadConfig(KConfig *conf) { if (!it.current()->isSpecial() && !it.current()->isVirtual()) { - KListBox *lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2); + TDEListBox *lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2); lb->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName()); } } @@ -106,7 +106,7 @@ void KMConfigFilter::loadConfig(KConfig *conf) m_locationre->setText(conf->readEntry("LocationRe")); } -void KMConfigFilter::saveConfig(KConfig *conf) +void KMConfigFilter::saveConfig(TDEConfig *conf) { conf->setGroup("Filter"); TQStringList plist; @@ -116,7 +116,7 @@ void KMConfigFilter::saveConfig(KConfig *conf) conf->writeEntry("LocationRe", m_locationre->text()); } -void KMConfigFilter::transfer(KListBox *from, KListBox *to) +void KMConfigFilter::transfer(TDEListBox *from, TDEListBox *to) { for (uint i=0; i<from->count();) { @@ -143,7 +143,7 @@ void KMConfigFilter::slotRemoveClicked() void KMConfigFilter::slotSelectionChanged() { - const KListBox *lb = static_cast<const KListBox*>(sender()); + const TDEListBox *lb = static_cast<const TDEListBox*>(sender()); if (!lb) return; TQToolButton *pb = (lb == m_list1 ? m_add : m_remove); diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h index 9571f0d54..8338ebd6f 100644 --- a/tdeprint/management/kmconfigfilter.h +++ b/tdeprint/management/kmconfigfilter.h @@ -22,7 +22,7 @@ #include "kmconfigpage.h" -class KListBox; +class TDEListBox; class TQToolButton; class TQLineEdit; @@ -32,8 +32,8 @@ class KMConfigFilter : public KMConfigPage public: KMConfigFilter(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); protected slots: void slotSelectionChanged(); @@ -41,10 +41,10 @@ protected slots: void slotRemoveClicked(); protected: - void transfer(KListBox *from, KListBox *to); + void transfer(TDEListBox *from, TDEListBox *to); private: - KListBox *m_list1, *m_list2; + TDEListBox *m_list1, *m_list2; TQToolButton *m_add, *m_remove; TQLineEdit *m_locationre; }; diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index 183d0b621..890a42045 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -28,12 +28,12 @@ #include <tqsettings.h> #include <tqwhatsthis.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kurlrequester.h> -#include <kfile.h> -#include <klistview.h> +#include <tdefile.h> +#include <tdelistview.h> #include <kdialog.h> KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) @@ -47,7 +47,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) TQGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); - m_fontpath = new KListView(box2); + m_fontpath = new TDEListView(box2); m_fontpath->addColumn(""); m_fontpath->header()->setStretchEnabled(true, 0); m_fontpath->header()->hide(); @@ -103,7 +103,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) m_down->setEnabled(false); } -void KMConfigFonts::loadConfig(KConfig *) +void KMConfigFonts::loadConfig(TDEConfig *) { TQSettings settings; m_embedfonts->setChecked(settings.readBoolEntry("/qt/embedFonts", true)); @@ -113,7 +113,7 @@ void KMConfigFonts::loadConfig(KConfig *) item = new TQListViewItem(m_fontpath, item, *it); } -void KMConfigFonts::saveConfig(KConfig *) +void KMConfigFonts::saveConfig(TDEConfig *) { TQSettings settings; settings.writeEntry("/qt/embedFonts", m_embedfonts->isChecked()); diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h index a93a26d75..8bd285f38 100644 --- a/tdeprint/management/kmconfigfonts.h +++ b/tdeprint/management/kmconfigfonts.h @@ -22,7 +22,7 @@ #include "kmconfigpage.h" -class KListView; +class TDEListView; class KURLRequester; class TQPushButton; class TQCheckBox; @@ -33,8 +33,8 @@ class KMConfigFonts : public KMConfigPage public: KMConfigFonts(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); protected slots: void slotUp(); @@ -46,7 +46,7 @@ protected slots: private: TQCheckBox *m_embedfonts; - KListView *m_fontpath; + TDEListView *m_fontpath; KURLRequester *m_addpath; TQPushButton *m_up, *m_down, *m_add, *m_remove; }; diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index 2298d7485..635667cec 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -26,13 +26,13 @@ #include <tqwhatsthis.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <krun.h> #include <kmimemagic.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcursor.h> #include <klineedit.h> #include <kguiitem.h> @@ -104,7 +104,7 @@ void KMConfigGeneral::setEnabledPreviewButton(bool b) m_preview->setEnabled(!m_testpage->url().isEmpty() && b); } -void KMConfigGeneral::loadConfig(KConfig *conf) +void KMConfigGeneral::loadConfig(TDEConfig *conf) { conf->setGroup("General"); m_timer->setValue(conf->readNumEntry("TimerDelay",5)); @@ -118,7 +118,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf) m_uselast->setChecked(conf->readBoolEntry("UseLast", true)); } -void KMConfigGeneral::saveConfig(KConfig *conf) +void KMConfigGeneral::saveConfig(TDEConfig *conf) { conf->setGroup("General"); conf->writeEntry("TimerDelay",m_timer->value()); diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h index 8fc6fa5ab..b82a91daa 100644 --- a/tdeprint/management/kmconfiggeneral.h +++ b/tdeprint/management/kmconfiggeneral.h @@ -32,8 +32,8 @@ class KMConfigGeneral : public KMConfigPage public: KMConfigGeneral(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); protected slots: void slotTestPagePreview(); diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp index 1088e1b3a..c31e525be 100644 --- a/tdeprint/management/kmconfigjobs.cpp +++ b/tdeprint/management/kmconfigjobs.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <knuminput.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kdialog.h> KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) @@ -48,13 +48,13 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) l1->addWidget(m_limit); } -void KMConfigJobs::loadConfig(KConfig *conf) +void KMConfigJobs::loadConfig(TDEConfig *conf) { conf->setGroup("Jobs"); m_limit->setValue(conf->readNumEntry("Limit", 0)); } -void KMConfigJobs::saveConfig(KConfig *conf) +void KMConfigJobs::saveConfig(TDEConfig *conf) { conf->setGroup("Jobs"); conf->writeEntry("Limit", m_limit->value()); diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h index 34be5b1ef..29818d68a 100644 --- a/tdeprint/management/kmconfigjobs.h +++ b/tdeprint/management/kmconfigjobs.h @@ -30,8 +30,8 @@ class KMConfigJobs : public KMConfigPage public: KMConfigJobs(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KIntNumInput *m_limit; diff --git a/tdeprint/management/kmconfigpage.cpp b/tdeprint/management/kmconfigpage.cpp index fb967e05d..6a259a062 100644 --- a/tdeprint/management/kmconfigpage.cpp +++ b/tdeprint/management/kmconfigpage.cpp @@ -26,11 +26,11 @@ KMConfigPage::KMConfigPage(TQWidget *parent, const char *name) m_header = "Header"; } -void KMConfigPage::loadConfig(KConfig*) +void KMConfigPage::loadConfig(TDEConfig*) { } -void KMConfigPage::saveConfig(KConfig*) +void KMConfigPage::saveConfig(TDEConfig*) { } #include "kmconfigpage.moc" diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h index 59b93fb3d..f29b8a23e 100644 --- a/tdeprint/management/kmconfigpage.h +++ b/tdeprint/management/kmconfigpage.h @@ -24,7 +24,7 @@ #include <tdelibs_export.h> -class KConfig; +class TDEConfig; class TDEPRINT_EXPORT KMConfigPage : public TQWidget { @@ -32,8 +32,8 @@ class TDEPRINT_EXPORT KMConfigPage : public TQWidget public: KMConfigPage(TQWidget *parent = 0, const char *name = 0); - virtual void loadConfig(KConfig*); - virtual void saveConfig(KConfig*); + virtual void loadConfig(TDEConfig*); + virtual void saveConfig(TDEConfig*); TQString pageName() const { return m_name; } TQString pageHeader() const { return m_header; } diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index 316925d48..2fdcbcb4b 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -24,9 +24,9 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) @@ -59,14 +59,14 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) m_program->setEnabled(false); } -void KMConfigPreview::loadConfig(KConfig *conf) +void KMConfigPreview::loadConfig(TDEConfig *conf) { conf->setGroup("General"); m_useext->setChecked(conf->readBoolEntry("ExternalPreview", false)); m_program->setURL(conf->readPathEntry("PreviewCommand", "gv")); } -void KMConfigPreview::saveConfig(KConfig *conf) +void KMConfigPreview::saveConfig(TDEConfig *conf) { conf->setGroup("General"); conf->writeEntry("ExternalPreview", m_useext->isChecked()); diff --git a/tdeprint/management/kmconfigpreview.h b/tdeprint/management/kmconfigpreview.h index a9c826c98..b8b5ab097 100644 --- a/tdeprint/management/kmconfigpreview.h +++ b/tdeprint/management/kmconfigpreview.h @@ -30,8 +30,8 @@ class KMConfigPreview : public KMConfigPage public: KMConfigPreview(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: TQCheckBox *m_useext; diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 0e72906d7..6154ebea2 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -24,8 +24,8 @@ #include <tqprogressdialog.h> #include <tqfileinfo.h> #include <tqdir.h> -#include <klocale.h> -#include <kapplication.h> +#include <tdelocale.h> +#include <tdeapplication.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -91,11 +91,11 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena if (exestr.isEmpty()) msg = i18n("No executable defined for the creation of the " "driver database. This operation is not implemented."); - else if (KStandardDirs::findExe(exestr).isEmpty()) + else if (TDEStandardDirs::findExe(exestr).isEmpty()) msg = i18n("The executable %1 could not be found in your " "PATH. Check that this program exists and is " "accessible in your PATH variable.").arg(exestr); - else if (!m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + else if (!m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) msg = i18n("Unable to start the creation of the driver " "database. The execution of %1 failed.").arg(exestr); if (!msg.isEmpty()) @@ -124,7 +124,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena return started; } -void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) +void KMDBCreator::slotReceivedStdout(TDEProcess*, char *buf, int len) { // save buffer TQString str( TQCString(buf, len) ); @@ -151,12 +151,12 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) } } -void KMDBCreator::slotReceivedStderr(KProcess*, char*, int) +void KMDBCreator::slotReceivedStderr(TDEProcess*, char*, int) { // just discard it for the moment } -void KMDBCreator::slotProcessExited(KProcess*) +void KMDBCreator::slotProcessExited(TDEProcess*) { // delete the progress dialog if (m_dlg) diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h index 319d270c0..4b1983ae6 100644 --- a/tdeprint/management/kmdbcreator.h +++ b/tdeprint/management/kmdbcreator.h @@ -40,16 +40,16 @@ public: bool status() const { return m_status; } protected slots: - void slotReceivedStdout(KProcess *p, char *bufm, int len); - void slotReceivedStderr(KProcess *p, char *bufm, int len); - void slotProcessExited(KProcess *p); + void slotReceivedStdout(TDEProcess *p, char *bufm, int len); + void slotReceivedStderr(TDEProcess *p, char *bufm, int len); + void slotProcessExited(TDEProcess *p); void slotCancelled(); signals: void dbCreated(); private: - KProcess m_proc; + TDEProcess m_proc; TQProgressDialog *m_dlg; bool m_status; bool m_firstflag; diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index a7d14fe92..5a172281b 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -28,8 +28,8 @@ #include <tqtextstream.h> #include <tqfileinfo.h> #include <kstandarddirs.h> -#include <kapplication.h> -#include <kmessagebox.h> +#include <tdeapplication.h> +#include <tdemessagebox.h> KMDriverDB* KMDriverDB::m_self = 0; diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 579cae5df..50297bdca 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -23,21 +23,21 @@ #include "kmmanager.h" #include "driver.h" -#include <klistbox.h> +#include <tdelistbox.h> #include <kpushbutton.h> #include <tqcheckbox.h> #include <kcursor.h> #include <tqapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqstrlist.h> -#include <klocale.h> +#include <tdelocale.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) @@ -46,8 +46,8 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) m_valid = false; // build widget - m_manu = new KListBox(this); - m_model = new KListBox(this); + m_manu = new TDEListBox(this); + m_model = new TDEListBox(this); m_postscript = new TQCheckBox(i18n("&PostScript printer"),this); m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this); m_postscript->setCursor(KCursor::handCursor()); @@ -234,7 +234,7 @@ void KMDriverDbWidget::slotOtherClicked() if ( !url.isEmpty() ) { TQString filename; - if ( KIO::NetAccess::download( url, filename, this ) ) + if ( TDEIO::NetAccess::download( url, filename, this ) ) { DrMain *driver = KMFactory::self()->manager()->loadFileDriver(filename); if (driver) @@ -255,7 +255,7 @@ void KMDriverDbWidget::slotOtherClicked() } else { - KIO::NetAccess::removeTempFile( filename ); + TDEIO::NetAccess::removeTempFile( filename ); KMessageBox::error(this,"<qt>"+i18n("Wrong driver format.")+"<p>"+KMManager::self()->errorMsg()+"</p></qt>"); } } diff --git a/tdeprint/management/kmdriverdialog.cpp b/tdeprint/management/kmdriverdialog.cpp index ef37e333c..c43017cc7 100644 --- a/tdeprint/management/kmdriverdialog.cpp +++ b/tdeprint/management/kmdriverdialog.cpp @@ -20,8 +20,8 @@ #include "kmdriverdialog.h" #include "driverview.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> KMDriverDialog::KMDriverDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow,i18n("Configure"),KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok,parent,name,true,false) diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 0978c0782..8ab3a7279 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -104,7 +104,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) } if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap)) { - int iconstate = (m_state&0x4 ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay); + int iconstate = (m_state&0x4 ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay); if (p) m_pixmap = p->pixmap(); m_mode = mode; @@ -119,9 +119,9 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) } KMIconView::KMIconView(TQWidget *parent, const char *name) -: KIconView(parent,name) +: TDEIconView(parent,name) { - setMode(KIconView::Select); + setMode(TDEIconView::Select); setSelectionMode(TQIconView::Single); setItemsMovable(false); setResizeMode(TQIconView::Adjust); diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h index 1fd6fbbda..1c8cb197e 100644 --- a/tdeprint/management/kmiconview.h +++ b/tdeprint/management/kmiconview.h @@ -45,7 +45,7 @@ private: bool m_isclass; }; -class KMIconView : public KIconView +class KMIconView : public TDEIconView { Q_OBJECT public: diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp index 9987ccb4c..bae2b6ad6 100644 --- a/tdeprint/management/kminfopage.cpp +++ b/tdeprint/management/kminfopage.cpp @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kseparator.h> diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 25c037516..0cadf3dba 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -30,10 +30,10 @@ #include <tqregexp.h> #include <tqwhatsthis.h> #include <tqpushbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> -#include <klistbox.h> -#include <klocale.h> +#include <tdelistbox.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -41,7 +41,7 @@ KMInstancePage::KMInstancePage(TQWidget *parent, const char *name) : TQWidget(parent,name) { - m_view = new KListBox(this); + m_view = new TDEListBox(this); m_printer = 0; initActions(); diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h index 7a3075d73..56b045fe2 100644 --- a/tdeprint/management/kminstancepage.h +++ b/tdeprint/management/kminstancepage.h @@ -24,7 +24,7 @@ #include <tqvaluelist.h> #include <tqwidget.h> -class KListBox; +class TDEListBox; class KMPrinter; class TQButton; @@ -50,7 +50,7 @@ protected: void addButton(const TQString& text, const TQString& pixmap, const char *receiver); private: - KListBox *m_view; + TDEListBox *m_view; TQValueList<TQButton*> m_buttons; KMPrinter *m_printer; }; diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 19c46224f..98e9595f9 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -30,21 +30,21 @@ #include "kmconfigpage.h" #include "kprinter.h" -#include <klistview.h> +#include <tdelistview.h> #include <kstatusbar.h> #include <tqpopupmenu.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kcursor.h> -#include <kmenubar.h> +#include <tdemenubar.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,12 +52,12 @@ #include <kdialogbase.h> #include <tqcheckbox.h> #include <kurldrag.h> -#include <kconfig.h> +#include <tdeconfig.h> #undef m_manager #define m_manager KMFactory::self()->jobManager() -class KJobListView : public KListView +class KJobListView : public TDEListView { public: KJobListView( TQWidget *parent = 0, const char *name = 0 ); @@ -67,7 +67,7 @@ protected: }; KJobListView::KJobListView( TQWidget *parent, const char *name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { setAcceptDrops( true ); setDropVisualizer( false ); @@ -78,11 +78,11 @@ bool KJobListView::acceptDrag( TQDropEvent *e ) const if ( KURLDrag::canDecode( e ) ) return true; else - return KListView::acceptDrag( e ); + return TDEListView::acceptDrag( e ); } KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) -: KMainWindow(parent,name) +: TDEMainWindow(parent,name) { m_view = 0; m_pop = 0; @@ -99,7 +99,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) if (m_standalone) { setCaption(i18n("No Printer")); - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQSize defSize( 550, 250 ); conf->setGroup( "Jobs" ); resize( conf->readSizeEntry( "Size", &defSize ) ); @@ -111,7 +111,7 @@ KMJobViewer::~KMJobViewer() if (m_standalone) { kdDebug( 500 ) << "Destroying stand-alone job viewer window" << endl; - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup( "Jobs" ); conf->writeEntry( "Size", size() ); emit viewerDestroyed(this); @@ -259,20 +259,20 @@ void KMJobViewer::init() void KMJobViewer::initActions() { // job actions - KAction *hact = new KAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); - KAction *ract = new KAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); - KAction *dact = new KAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); - KAction *sact = new KAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); - KActionMenu *mact = new KActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move"); + TDEAction *hact = new TDEAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); + TDEAction *ract = new TDEAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); + TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); + TDEAction *sact = new TDEAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); + TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move"); mact->setDelayed(false); connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu())); - KToggleAction *tact = new KToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); + TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted); connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool))); - KToggleAction *uact = new KToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs"); + TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs"); uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"personal")); connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool))); m_userfield = new TQLineEdit(0); @@ -298,7 +298,7 @@ void KMJobViewer::initActions() } // Filter actions - KActionMenu *fact = new KActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify"); + TDEActionMenu *fact = new TDEActionMenu(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())); @@ -307,7 +307,7 @@ void KMJobViewer::initActions() if (!m_standalone) { - KToolBar *toolbar = toolBar(); + TDEToolBar *toolbar = toolBar(); hact->plug(toolbar); ract->plug(toolbar); toolbar->insertSeparator(); @@ -327,7 +327,7 @@ void KMJobViewer::initActions() KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); // refresh action - new KAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); + new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); // create status bar KStatusBar *statusbar = statusBar(); @@ -367,13 +367,13 @@ void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_spe void KMJobViewer::slotShowMoveMenu() { - TQPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("job_move"))->popupMenu(); + TQPopupMenu *menu = static_cast<TDEActionMenu*>(actionCollection()->action("job_move"))->popupMenu(); buildPrinterMenu(menu, false, false); } void KMJobViewer::slotShowPrinterMenu() { - TQPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu(); + TQPopupMenu *menu = static_cast<TDEActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu(); buildPrinterMenu(menu, true, true); } @@ -583,7 +583,7 @@ void KMJobViewer::loadPluginActions() if (m_standalone) { // standalone window, insert actions into main menubar - KAction *act = actionCollection()->action("job_restart"); + TDEAction *act = actionCollection()->action("job_restart"); for (int i=0;i<act->containerCount();i++) { if (menuBar()->findItem(act->itemId(i), &menu)) @@ -594,8 +594,8 @@ void KMJobViewer::loadPluginActions() } } - TQValueList<KAction*> acts = m_manager->createPluginActions(actionCollection()); - for (TQValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it) + TQValueList<TDEAction*> acts = m_manager->createPluginActions(actionCollection()); + for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it) { // connect the action to this connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int))); @@ -611,8 +611,8 @@ void KMJobViewer::loadPluginActions() void KMJobViewer::removePluginActions() { - TQValueList<KAction*> acts = actionCollection()->actions("plugin"); - for (TQValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it) + TQValueList<TDEAction*> acts = actionCollection()->actions("plugin"); + for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it) { (*it)->unplugAll(); delete (*it); @@ -650,7 +650,7 @@ void KMJobViewer::reload() // update the "History" action state actionCollection()->action("view_completed")->setEnabled(m_manager->actions() & KMJob::ShowCompleted); - static_cast<KToggleAction*>(actionCollection()->action("view_completed"))->setChecked(false); + static_cast<TDEToggleAction*>(actionCollection()->action("view_completed"))->setChecked(false); } void KMJobViewer::closeEvent(TQCloseEvent *e) @@ -700,7 +700,7 @@ void KMJobViewer::slotConfigure() KMConfigJobs *w = new KMConfigJobs(&dlg); dlg.setMainWidget(w); dlg.resize(300, 10); - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); w->loadConfig(conf); if (dlg.exec()) { @@ -727,7 +727,7 @@ void KMJobViewer::slotDropped( TQDropEvent *e, TQListViewItem* ) for ( KURL::List::ConstIterator it = uris.begin(); it != uris.end(); ++it) { - if ( KIO::NetAccess::download( *it, target, 0 ) ) + if ( TDEIO::NetAccess::download( *it, target, 0 ) ) files << target; } diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h index 1dca024a8..7a4530f3c 100644 --- a/tdeprint/management/kmjobviewer.h +++ b/tdeprint/management/kmjobviewer.h @@ -24,13 +24,13 @@ #warning internal header, do not use except if you are a TDEPrint developer #endif -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kmprinterpage.h" #include "kpreloadobject.h" class KMJobManager; class KMJob; -class KListView; +class TDEListView; class JobItem; class TQPopupMenu; class TQListViewItem; @@ -46,7 +46,7 @@ class TQCheckBox; * if you're a TDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class TDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject +class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject { Q_OBJECT public: @@ -108,7 +108,7 @@ protected: void updateStatusBar(); private: - KListView *m_view; + TDEListView *m_view; TQPtrList<KMJob> m_jobs; TQPtrList<JobItem> m_items; TQPopupMenu *m_pop; diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 4bddf9203..806cc0d9f 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -23,7 +23,7 @@ #include <tqheader.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kcursor.h> @@ -78,7 +78,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) if (p) { int oldstate = m_state; - int st(p->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay); + int st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay); m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0)); update = (oldstate != m_state); QString name = (p->isVirtual() ? p->instanceName() : p->name()); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index c2bc28b20..4aba92dad 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -36,25 +36,25 @@ #include "messagewindow.h" #include <tqdockarea.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tqtimer.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlayout.h> #include <tqpopupmenu.h> -#include <kmessagebox.h> -#include <kaction.h> -#include <klocale.h> -#include <kconfig.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdemessagebox.h> +#include <tdeaction.h> +#include <tdelocale.h> +#include <tdeconfig.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klibloader.h> #include <kdialogbase.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kprocess.h> #undef m_manager @@ -78,7 +78,7 @@ int tdeprint_management_add_printer_wizard( TQWidget* parent ) return flag; } -KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *coll) +KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection *coll) : TQWidget(parent, name) { m_current = 0; @@ -88,15 +88,15 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co m_printerview = new KMPrinterView(this, "PrinterView"); m_printerpages = new KMPages(this, "PrinterPages"); m_pop = new TQPopupMenu(this); - m_toolbar = new KToolBar(this, "ToolBar"); + m_toolbar = new TDEToolBar(this, "ToolBar"); m_toolbar->setMovingEnabled(false); m_plugin = new PluginComboBox(this, "Plugin"); /* m_menubar = new KMenuBar( this ); static_cast<KMenuBar*>( m_menubar )->setTopLevelMenu( false ); */ - m_menubar = new KToolBar( this, "MenuBar", false, false ); - m_menubar->setIconText( KToolBar::IconTextRight ); + m_menubar = new TDEToolBar( this, "MenuBar", false, false ); + m_menubar->setIconText( TDEToolBar::IconTextRight ); m_menubar->setMovingEnabled( false ); // layout @@ -122,7 +122,7 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co if (coll) m_actions = coll; else - m_actions = new KActionCollection(this); + m_actions = new TDEActionCollection(this); initActions(); // first update @@ -145,95 +145,95 @@ void KMMainView::loadParameters() void KMMainView::restoreSettings() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons)); setOrientation(conf->readNumEntry("Orientation", Qt::Vertical)); bool view = conf->readBoolEntry("ViewToolBar",false); slotToggleToolBar(view); - ((KToggleAction*)m_actions->action("view_toolbar"))->setChecked(view); + ((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view); view = conf->readBoolEntry( "ViewMenuBar", true ); slotToggleMenuBar( view ); - static_cast<KToggleAction*>( m_actions->action( "view_menubar" ) )->setChecked( view ); + static_cast<TDEToggleAction*>( m_actions->action( "view_menubar" ) )->setChecked( view ); view = conf->readBoolEntry("ViewPrinterInfos",true); slotShowPrinterInfos(view); - ((KToggleAction*)m_actions->action("view_printerinfos"))->setChecked(view); + ((TDEToggleAction*)m_actions->action("view_printerinfos"))->setChecked(view); } void KMMainView::saveSettings() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); conf->writeEntry("ViewType",(int)m_printerview->viewType()); conf->writeEntry("Orientation",(int)orientation()); - conf->writeEntry("ViewToolBar",((KToggleAction*)m_actions->action("view_toolbar"))->isChecked()); - conf->writeEntry("ViewMenuBar",static_cast<KToggleAction*>( m_actions->action("view_menubar") )->isChecked()); - conf->writeEntry("ViewPrinterInfos",((KToggleAction*)m_actions->action("view_printerinfos"))->isChecked()); + conf->writeEntry("ViewToolBar",((TDEToggleAction*)m_actions->action("view_toolbar"))->isChecked()); + conf->writeEntry("ViewMenuBar",static_cast<TDEToggleAction*>( m_actions->action("view_menubar") )->isChecked()); + conf->writeEntry("ViewPrinterInfos",((TDEToggleAction*)m_actions->action("view_printerinfos"))->isChecked()); conf->sync(); } void KMMainView::initActions() { - KIconSelectAction *vact = new KIconSelectAction(i18n("&View"),0,m_actions,"view_change"); + TDEIconSelectAction *vact = new TDEIconSelectAction(i18n("&View"),0,m_actions,"view_change"); TQStringList iconlst; iconlst << "view_icon" << "view_detailed" << "view_tree"; vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); vact->setCurrentItem(0); connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); - KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); + TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - 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->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new TDEAction(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"), "tdeprint_queuestate", m_actions, "printer_spool_change"); + stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - 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..."),"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"); + stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + + new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); + new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); + new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); + new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); + new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); + + TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); iconlst.clear(); iconlst << "view_top_bottom" << "view_left_right"; dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst); dact->setCurrentItem(0); connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); - 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(slotServerConfigureAccess()),m_actions,"server_access_configure"); + new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); + new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); - KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); + TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool))); - tact = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); + tact = new TDEToggleAction( 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"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos"); + tact = new TDEToggleAction(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))); - tact = new KToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter"); + tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter"); tact->setChecked(KMManager::self()->isFilterEnabled()); connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); - new KAction( i18n( "%1 &Handbook" ).arg( "TDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" ); - new KAction( i18n( "%1 &Web Site" ).arg( "TDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" ); + new TDEAction( i18n( "%1 &Handbook" ).arg( "TDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" ); + new TDEAction( i18n( "%1 &Web Site" ).arg( "TDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" ); - KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); + TDEActionMenu *mact = new TDEActionMenu(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", "tdeprint/tools/*.desktop"); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { KSimpleConfig conf(*it); @@ -412,7 +412,7 @@ void KMMainView::slotPrinterSelected(const TQString& prname) void KMMainView::setViewType(int ID) { - ((KSelectAction*)m_actions->action("view_change"))->setCurrentItem(ID); + ((TDESelectAction*)m_actions->action("view_change"))->setCurrentItem(ID); slotChangeView(ID); } @@ -468,8 +468,8 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p } if (!printer->isSpecial()) { - TQValueList<KAction*> pactions = m_actions->actions("plugin"); - for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it) + TQValueList<TDEAction*> pactions = m_actions->actions("plugin"); + for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it) (*it)->plug(m_pop); if (pactions.count() > 0) m_pop->insertSeparator(); @@ -617,7 +617,7 @@ void KMMainView::slotSoftDefault() void KMMainView::setOrientation(int o) { int ID = (o == Qt::Horizontal ? 1 : 0); - ((KSelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID); + ((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID); slotChangeDirection(ID); } @@ -698,9 +698,9 @@ void KMMainView::slotServerConfigure() void KMMainView::slotServerConfigureAccess() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/system-config-printer-kde"; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } void KMMainView::slotToggleToolBar(bool on) @@ -757,7 +757,7 @@ void KMMainView::slotShowPrinterInfos(bool on) void KMMainView::enableToolbar(bool on) { - KToggleAction *act = (KToggleAction*)m_actions->action("view_toolbar"); + TDEToggleAction *act = (TDEToggleAction*)m_actions->action("view_toolbar"); m_toolbar->setEnabled(on); act->setEnabled(on); if (on && act->isChecked()) @@ -766,7 +766,7 @@ void KMMainView::enableToolbar(bool on) m_toolbar->hide(); } -KAction* KMMainView::action(const char *name) +TDEAction* KMMainView::action(const char *name) { return m_actions->action(name); } @@ -793,23 +793,23 @@ void KMMainView::reload() void KMMainView::showPrinterInfos(bool on) { - static_cast<KToggleAction*>(m_actions->action("view_printerinfos"))->setChecked(on); + static_cast<TDEToggleAction*>(m_actions->action("view_printerinfos"))->setChecked(on); slotShowPrinterInfos(on); } bool KMMainView::printerInfosShown() const { - return (static_cast<KToggleAction*>(m_actions->action("view_printerinfos"))->isChecked()); + return (static_cast<TDEToggleAction*>(m_actions->action("view_printerinfos"))->isChecked()); } void KMMainView::loadPluginActions() { KMFactory::self()->manager()->createPluginActions(m_actions); - TQValueList<KAction*> pactions = m_actions->actions("plugin"); + TQValueList<TDEAction*> pactions = m_actions->actions("plugin"); int index = m_pactionsindex; //TQPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup(); TQPopupMenu *menu = m_menubar->getButton( 1 )->popup(); - for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it) + for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it) { (*it)->plug(m_toolbar, index++); ( *it )->plug( menu ); @@ -818,8 +818,8 @@ void KMMainView::loadPluginActions() void KMMainView::removePluginActions() { - TQValueList<KAction*> pactions = m_actions->actions("plugin"); - for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it) + TQValueList<TDEAction*> pactions = m_actions->actions("plugin"); + for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it) { (*it)->unplugAll(); delete (*it); diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h index 7ed53a5c8..132bba062 100644 --- a/tdeprint/management/kmmainview.h +++ b/tdeprint/management/kmmainview.h @@ -26,18 +26,18 @@ #include <tqwidget.h> #include <tdeprint/kpreloadobject.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class KMManager; class KMPrinterView; class KMPrinter; class KMPages; -class KActionCollection; +class TDEActionCollection; class TQPopupMenu; class TQTimer; class TQSplitter; -class KToolBar; -class KAction; +class TDEToolBar; +class TDEAction; class PluginComboBox; class TQBoxLayout; class MessageWindow; @@ -54,7 +54,7 @@ class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject { Q_OBJECT public: - KMMainView(TQWidget *parent = 0, const char *name = 0, KActionCollection *coll = 0); + KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0); ~KMMainView(); void setOrientation(int); @@ -62,7 +62,7 @@ public: void setViewType(int); int viewType() const; void enableToolbar(bool on = true); - KAction* action(const char *name); + TDEAction* action(const char *name); void showPrinterInfos(bool on); bool printerInfosShown() const; @@ -115,17 +115,17 @@ private: KMPrinterView *m_printerview; KMPages *m_printerpages; TQPopupMenu *m_pop; - KActionCollection *m_actions; + TDEActionCollection *m_actions; KMPrinter *m_current; - KToolBar *m_toolbar; + TDEToolBar *m_toolbar; PluginComboBox *m_plugin; int m_pactionsindex; TQStringList m_toollist; bool m_first; TQBoxLayout *m_boxlayout; - class KMainWindowPrivate; - KMainWindowPrivate *d; - KToolBar *m_menubar; + class TDEMainWindowPrivate; + TDEMainWindowPrivate *d; + TDEToolBar *m_menubar; }; TDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent ); diff --git a/tdeprint/management/kmpages.cpp b/tdeprint/management/kmpages.cpp index 4f0f1f4f7..d0c413966 100644 --- a/tdeprint/management/kmpages.cpp +++ b/tdeprint/management/kmpages.cpp @@ -23,7 +23,7 @@ #include "kmpropertypage.h" #include "kminstancepage.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index 59911ff34..d311f75c3 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/management/kmprinterview.cpp @@ -26,8 +26,8 @@ #include <tqlayout.h> #include <tqpopupmenu.h> -#include <kaction.h> -#include <klocale.h> +#include <tdeaction.h> +#include <tdelocale.h> KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) : TQWidgetStack(parent,name), m_type(KMPrinterView::Icons) diff --git a/tdeprint/management/kmpropbackend.cpp b/tdeprint/management/kmpropbackend.cpp index 98004d2ed..00aac2b40 100644 --- a/tdeprint/management/kmpropbackend.cpp +++ b/tdeprint/management/kmpropbackend.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMPropBackend::KMPropBackend(TQWidget *parent, const char *name) : KMPropWidget(parent,name) diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp index 9c7808199..c94838098 100644 --- a/tdeprint/management/kmpropcontainer.cpp +++ b/tdeprint/management/kmpropcontainer.cpp @@ -22,7 +22,7 @@ #include <kpushbutton.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <kguiitem.h> diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp index 55daf0ed5..6f20494fc 100644 --- a/tdeprint/management/kmpropdriver.cpp +++ b/tdeprint/management/kmpropdriver.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMPropDriver::KMPropDriver(TQWidget *parent, const char *name) : KMPropWidget(parent,name) diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index e0526ad5a..c38b399c6 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -57,10 +57,10 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) ctn->setWidget(w); connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), - KIcon::NoGroup, - KIcon::SizeMedium + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); addPage(ctn,w->title(),w->header(),icon); } diff --git a/tdeprint/management/kmpropgeneral.cpp b/tdeprint/management/kmpropgeneral.cpp index c55603da9..6b24b0466 100644 --- a/tdeprint/management/kmpropgeneral.cpp +++ b/tdeprint/management/kmpropgeneral.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name) : KMPropWidget(parent,name) diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp index 26671eed8..7fc4155a0 100644 --- a/tdeprint/management/kmpropmembers.cpp +++ b/tdeprint/management/kmpropmembers.cpp @@ -23,7 +23,7 @@ #include <tqtextview.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMPropMembers::KMPropMembers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp index ae8b03cbf..50c1a75e8 100644 --- a/tdeprint/management/kmpropwidget.cpp +++ b/tdeprint/management/kmpropwidget.cpp @@ -23,8 +23,8 @@ #include "kmmanager.h" #include "kmtimer.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> KMPropWidget::KMPropWidget(TQWidget *parent, const char *name) : TQWidget(parent,name) diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index 9e3775c14..7c4c0173d 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -34,10 +34,10 @@ #include <tqlayout.h> #include <tqwhatsthis.h> #include <tqgroupbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kicondialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kseparator.h> KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) @@ -88,7 +88,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) TQLabel *m_extensionlabel = new TQLabel(i18n("Filename e&xtension:"), m_outfile_gb); m_extensionlabel->setBuddy(m_extension); - m_icon = new KIconButton(dummy); + m_icon = new TDEIconButton(dummy); m_icon->setIcon("fileprint"); m_icon->setFixedSize(TQSize(48,48)); diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h index bc7497a05..3d334c7fd 100644 --- a/tdeprint/management/kmspecialprinterdlg.h +++ b/tdeprint/management/kmspecialprinterdlg.h @@ -26,7 +26,7 @@ class KMPrinter; class TQLineEdit; class TQCheckBox; class TQComboBox; -class KIconButton; +class TDEIconButton; class KXmlCommandSelector; class KMSpecialPrinterDlg : public KDialogBase @@ -50,7 +50,7 @@ private: TQComboBox *m_mimetype; TQCheckBox *m_usefile; TQStringList m_mimelist; - KIconButton *m_icon; + TDEIconButton *m_icon; KXmlCommandSelector *m_command; }; diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index 4a7f611d8..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; @@ -86,7 +86,7 @@ void KMTimer::startTimer(int t) { if (t == -1) { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); t = conf->readNumEntry("TimerDelay", 5) * 1000; } diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp index cd98a8b07..b2e8fdcd4 100644 --- a/tdeprint/management/kmwbackend.cpp +++ b/tdeprint/management/kmwbackend.cpp @@ -28,18 +28,18 @@ #include <tqwhatsthis.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <kdialog.h> #include <kdebug.h> -class KRadioButton : public TQRadioButton +class TDERadioButton : public TQRadioButton { public: - KRadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0); + TDERadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0); }; -KRadioButton::KRadioButton(const TQString& txt, TQWidget *parent, const char *name) +TDERadioButton::TDERadioButton(const TQString& txt, TQWidget *parent, const char *name) : TQRadioButton(txt,parent,name) { setCursor(KCursor::handCursor()); @@ -158,7 +158,7 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString } else { - KRadioButton *btn = new KRadioButton(txt, this); + TDERadioButton *btn = new TDERadioButton(txt, this); btn->setEnabled(on); if ( !whatsThis.isEmpty() ) TQWhatsThis::add( btn, whatsThis ); diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp index a87388a6f..e04467632 100644 --- a/tdeprint/management/kmwclass.cpp +++ b/tdeprint/management/kmwclass.cpp @@ -26,8 +26,8 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqtoolbutton.h> -#include <klistbox.h> -#include <klocale.h> +#include <tdelistbox.h> +#include <tdelocale.h> #include <kiconloader.h> KMWClass::KMWClass(TQWidget *parent, const char *name) @@ -37,9 +37,9 @@ KMWClass::KMWClass(TQWidget *parent, const char *name) m_title = i18n("Class Composition"); m_nextpage = KMWizard::Name; - m_list1 = new KListBox(this); + m_list1 = new TDEListBox(this); m_list1->setSelectionMode(TQListBox::Extended); - m_list2 = new KListBox(this); + m_list2 = new TDEListBox(this); m_list2->setSelectionMode(TQListBox::Extended); TQToolButton *add = new TQToolButton(this); diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h index c9b63befb..a74f20117 100644 --- a/tdeprint/management/kmwclass.h +++ b/tdeprint/management/kmwclass.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" -class KListBox; +class TDEListBox; class KMWClass : public KMWizardPage { @@ -40,7 +40,7 @@ protected slots: void slotRemove(); private: - KListBox *m_list1, *m_list2; + TDEListBox *m_list1, *m_list2; }; #endif diff --git a/tdeprint/management/kmwdriver.cpp b/tdeprint/management/kmwdriver.cpp index 58793c192..9876c0420 100644 --- a/tdeprint/management/kmwdriver.cpp +++ b/tdeprint/management/kmwdriver.cpp @@ -24,7 +24,7 @@ #include "kmdriverdb.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMWDriver::KMWDriver(TQWidget *parent, const char *name) : KMWizardPage(parent,name) diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index 88b9410d5..cc52f1015 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -26,9 +26,9 @@ #include <tqlabel.h> #include <tqlayout.h> #include <kpushbutton.h> -#include <klistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelistbox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name) : KMWizardPage(parent,name) @@ -38,7 +38,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name) m_nextpage = KMWizard::DriverTest; m_entries = NULL; - m_list = new KListBox(this); + m_list = new TDEListBox(this); TQLabel *l1 = new TQLabel(this); l1->setText(i18n("<p>Several drivers have been detected for this model. Select the driver " "you want to use. You will have the opportunity to test it as well as to " diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h index 464a78239..9c78008c1 100644 --- a/tdeprint/management/kmwdriverselect.h +++ b/tdeprint/management/kmwdriverselect.h @@ -23,7 +23,7 @@ #include "kmwizardpage.h" #include "kmdbentry.h" -class KListBox; +class TDEListBox; class TQPushButton; class KMWDriverSelect : public KMWizardPage @@ -40,7 +40,7 @@ protected slots: void slotDriverComment(); private: - KListBox *m_list; + TDEListBox *m_list; KMDBEntryList *m_entries; TQPushButton *m_drivercomment; }; diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 545d3b94d..73871988a 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -28,11 +28,11 @@ #include <tqlabel.h> #include <kpushbutton.h> #include <tqlayout.h> -#include <klocale.h> -#include <kapplication.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeapplication.h> +#include <tdemessagebox.h> #include <kguiitem.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) : KMWizardPage(parent,name) @@ -105,7 +105,7 @@ void KMWDriverTest::initPrinter(KMPrinter *p) { m_driver = KMFactory::self()->manager()->loadFileDriver(drfile); /* remove the temp file if it has been downloaded */ - KIO::NetAccess::removeTempFile( drfile ); + TDEIO::NetAccess::removeTempFile( drfile ); } else if (p->dbEntry() != NULL) m_driver = KMFactory::self()->manager()->loadDbDriver(p->dbEntry()); @@ -133,7 +133,7 @@ void KMWDriverTest::slotTest() { if (!m_printer) return; - TQString name = "tmpprinter_"+KApplication::randomString(8); + TQString name = "tmpprinter_"+TDEApplication::randomString(8); // save printer name (can be non empty when modifying a printer) TQString oldname = m_printer->name(); diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp index 2881b4ea0..4ad564cf6 100644 --- a/tdeprint/management/kmwend.cpp +++ b/tdeprint/management/kmwend.cpp @@ -23,7 +23,7 @@ #include "util.h" #include <tqtextview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> KMWEnd::KMWEnd(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp index 1fbaf45ff..58a61e8e4 100644 --- a/tdeprint/management/kmwfile.cpp +++ b/tdeprint/management/kmwfile.cpp @@ -25,8 +25,8 @@ #include <tqlayout.h> #include <kurlrequester.h> -#include <klocale.h> -#include <kfiledialog.h> +#include <tdelocale.h> +#include <tdefiledialog.h> KMWFile::KMWFile(TQWidget *parent, const char *name) : KMWizardPage(parent,name) diff --git a/tdeprint/management/kmwinfopage.cpp b/tdeprint/management/kmwinfopage.cpp index fd9e92697..175ff7e74 100644 --- a/tdeprint/management/kmwinfopage.cpp +++ b/tdeprint/management/kmwinfopage.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kactivelabel.h> KMWInfoPage::KMWInfoPage(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp index 5dc915572..bc894c478 100644 --- a/tdeprint/management/kmwizard.cpp +++ b/tdeprint/management/kmwizard.cpp @@ -26,12 +26,12 @@ #include <kpushbutton.h> #include <tqlabel.h> #include <tqwidgetstack.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kseparator.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstdguiitem.h> #include "kmwinfopage.h" diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp index 7b56b2deb..424e40100 100644 --- a/tdeprint/management/kmwlocal.cpp +++ b/tdeprint/management/kmwlocal.cpp @@ -23,13 +23,13 @@ #include "kmfactory.h" #include "kmmanager.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlineedit.h> #include <tqlabel.h> #include <tqheader.h> -#include <klistview.h> -#include <kmessagebox.h> +#include <tdelistview.h> +#include <tdemessagebox.h> #include <kiconloader.h> KMWLocal::KMWLocal(TQWidget *parent, const char *name) @@ -41,7 +41,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name) m_initialized = false; m_block = false; - m_ports = new KListView(this); + m_ports = new TDEListView(this); m_ports->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_ports->setLineWidth(1); m_ports->header()->hide(); diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h index 681d94e51..e65128747 100644 --- a/tdeprint/management/kmwlocal.h +++ b/tdeprint/management/kmwlocal.h @@ -25,7 +25,7 @@ #include <tqstringlist.h> class TQLineEdit; -class KListView; +class TDEListView; class TQListViewItem; class KMWLocal : public KMWizardPage @@ -47,7 +47,7 @@ protected: TQListViewItem* lookForItem( const TQString& ); protected: - KListView *m_ports; + TDEListView *m_ports; TQLineEdit *m_localuri; TQStringList m_uris; TQListViewItem *m_parents[4]; diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp index 352a075c5..3c4794ad1 100644 --- a/tdeprint/management/kmwlpd.cpp +++ b/tdeprint/management/kmwlpd.cpp @@ -23,11 +23,11 @@ #include "kmprinter.h" #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <kdebug.h> #include <tqlineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kextsock.h> static bool checkLpdQueue(const char *host, const char *queue); diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp index fe567f7bb..e8378371a 100644 --- a/tdeprint/management/kmwname.cpp +++ b/tdeprint/management/kmwname.cpp @@ -23,8 +23,8 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqregexp.h> KMWName::KMWName(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp index 8490a179c..3cd71aadd 100644 --- a/tdeprint/management/kmwpassword.cpp +++ b/tdeprint/management/kmwpassword.cpp @@ -26,7 +26,7 @@ #include <tqvbuttongroup.h> #include <tqradiobutton.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <stdlib.h> diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp index e76240cf8..836a7fb15 100644 --- a/tdeprint/management/kmwsmb.cpp +++ b/tdeprint/management/kmwsmb.cpp @@ -23,7 +23,7 @@ #include "kmprinter.h" #include "util.h" -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <tqlayout.h> #include <tqlineedit.h> diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp index ca5defde4..a3fb71b3d 100644 --- a/tdeprint/management/kmwsocket.cpp +++ b/tdeprint/management/kmwsocket.cpp @@ -22,13 +22,13 @@ #include "kmwizard.h" #include "kmprinter.h" -#include <klistview.h> +#include <tdelistview.h> #include <tqheader.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kseparator.h> @@ -39,7 +39,7 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name) m_ID = KMWizard::TCP; m_nextpage = KMWizard::Driver; - m_list = new KListView(this); + m_list = new TDEListView(this); m_list->addColumn(""); m_list->header()->hide(); m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); diff --git a/tdeprint/management/kmwsocket.h b/tdeprint/management/kmwsocket.h index 687b52fd4..7489d6ec7 100644 --- a/tdeprint/management/kmwsocket.h +++ b/tdeprint/management/kmwsocket.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" -class KListView; +class TDEListView; class TQListViewItem; class TQLineEdit; class NetworkScanner; @@ -43,7 +43,7 @@ protected slots: void slotScanFinished(); private: - KListView *m_list; + TDEListView *m_list; NetworkScanner *m_scanner; TQLineEdit *m_printer, *m_port; }; diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp index e667d1fa1..02b0a6b69 100644 --- a/tdeprint/management/kmwsocketutil.cpp +++ b/tdeprint/management/kmwsocketutil.cpp @@ -27,13 +27,13 @@ #include <tqlabel.h> #include <tqcombobox.h> #include <tqpushbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqregexp.h> #include <knumvalidator.h> -#include <kapplication.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdelocale.h> #include <kextsock.h> #include <kdebug.h> @@ -148,7 +148,7 @@ bool KMWSocketUtil::checkPrinter(const TQString& IPstr, int port, TQString* host if (hostname) { TQString portname; - KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname); + KExtendedSocket::resolve((TDESocketAddress*)(sock.peerAddress()), *hostname, portname); } result = true; } diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index e8e43ba09..9b165e432 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -37,15 +37,15 @@ #include <tqwhatsthis.h> #include <tqapplication.h> -#include <klistview.h> -#include <klocale.h> +#include <tdelistview.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialogbase.h> #include <kseparator.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kmimetype.h> -#include <kmessagebox.h> -#include <kapplication.h> +#include <tdemessagebox.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kguiitem.h> @@ -84,7 +84,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam m_xmlcmd = 0; m_command = new TQLineEdit(this); - m_view = new KListView(this); + m_view = new TDEListView(this); m_view->addColumn(""); m_view->header()->hide(); m_view->setSorting(-1); @@ -137,7 +137,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam TQLabel *m_editlab2 = new TQLabel(i18n("Ma&ximum value:"), w1); m_editlab1->setBuddy(m_edit1); m_editlab2->setBuddy(m_edit2); - m_values = new KListView(w2); + m_values = new TDEListView(w2); m_values->addColumn(i18n("Name")); m_values->addColumn(i18n("Description")); m_values->setAllColumnsShowFocus(true); @@ -841,7 +841,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) m_description = new TQLineEdit(topmain); m_idname = new TQLabel(topmain); - m_requirements = new KListView(m_gb2); + m_requirements = new TDEListView(m_gb2); m_requirements->addColumn(""); m_requirements->header()->hide(); m_addreq = new TQToolButton(m_gb2); @@ -850,8 +850,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) m_removereq->setIconSet(SmallIconSet("editdelete")); TQPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain); m_mimetype = new TQComboBox(dummy); - m_availablemime = new KListBox(m_gb1); - m_selectedmime = new KListBox(m_gb1); + m_availablemime = new TDEListBox(m_gb1); + m_selectedmime = new TDEListBox(m_gb1); m_addmime = new TQToolButton(m_gb1); m_addmime->setIconSet(TQApplication::reverseLayout()? SmallIconSet("forward") : SmallIconSet("back")); m_removemime = new TQToolButton(m_gb1); diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h index 88e590325..d69c19e62 100644 --- a/tdeprint/management/kxmlcommanddlg.h +++ b/tdeprint/management/kxmlcommanddlg.h @@ -25,13 +25,13 @@ #include <tqstringlist.h> #include <kdialogbase.h> -class KListView; +class TDEListView; class TQListViewItem; class TQLineEdit; class TQComboBox; class TQWidgetStack; class TQToolButton; -class KListBox; +class TDEListBox; class TQListBoxItem; class TQTextEdit; class TQCheckBox; @@ -74,11 +74,11 @@ protected slots: void slotChanged(); private: - KListView *m_view; + TDEListView *m_view; TQLineEdit *m_name, *m_desc, *m_format, *m_default, *m_command; TQComboBox *m_type; TQWidget *m_dummy; - KListView *m_values; + TDEListView *m_values; TQLineEdit *m_edit1, *m_edit2; TQWidgetStack *m_stack; TQToolButton *m_apply, *m_addgrp, *m_addopt, *m_delopt, *m_up, *m_down; @@ -115,9 +115,9 @@ private: TQLineEdit *m_description; TQLabel *m_idname; TQComboBox *m_mimetype; - KListBox *m_availablemime, *m_selectedmime; + TDEListBox *m_availablemime, *m_selectedmime; TQToolButton *m_addmime, *m_removemime; - KListView *m_requirements; + TDEListView *m_requirements; TQToolButton *m_removereq, *m_addreq; TQStringList m_mimelist; diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index 6f2b4485e..08722cf6e 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -30,10 +30,10 @@ #include <tqtooltip.h> #include <tqlineedit.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdemessagebox.h> +#include <tdefiledialog.h> #include <kseparator.h> #include <kguiitem.h> #include <kactivelabel.h> @@ -273,7 +273,7 @@ void KXmlCommandSelector::slotXmlCommandToggled( bool on ) void KXmlCommandSelector::slotHelpCommand() { - KPopupFrame *pop = new KPopupFrame( m_helpbtn ); + TDEPopupFrame *pop = new TDEPopupFrame( m_helpbtn ); KActiveLabel *lab = new KActiveLabel( m_help, pop ); lab->resize( lab->sizeHint() ); pop->setMainWidget( lab ); diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index a49a77877..ee4e7dbc7 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -30,9 +30,9 @@ #include <tqlineedit.h> #include <tqregexp.h> #include <tqsocket.h> -#include <klocale.h> +#include <tdelocale.h> #include <kextendedsocket.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knumvalidator.h> #include <kdebug.h> #include <unistd.h> @@ -241,9 +241,9 @@ void NetworkScanner::slotConnectionSuccess() { kdDebug() << "Success" << endl; #ifdef USE_QSOCKET - KSocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() ); + TDESocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() ); #else - KSocketAddress *addr = const_cast<KSocketAddress*>( d->socket->peerAddress() ); + TDESocketAddress *addr = const_cast<TDESocketAddress*>( d->socket->peerAddress() ); #endif kdDebug() << "Connection success: " << ( addr ? addr->pretty() : TQString( "ERROR" ) ) << endl; kdDebug() << "Socket: " << d->socket->socket() << endl; diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp index 0aa3c10a3..377a28217 100644 --- a/tdeprint/management/pluginaction.cpp +++ b/tdeprint/management/pluginaction.cpp @@ -21,7 +21,7 @@ // automatically connect to "pluginActionActived(int)" in the receiver. PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name) -: KAction(txt, icon, accel, parent, name), m_id(ID) +: TDEAction(txt, icon, accel, parent, name), m_id(ID) { connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated())); } diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h index 0bb368ed2..0f87460fd 100644 --- a/tdeprint/management/pluginaction.h +++ b/tdeprint/management/pluginaction.h @@ -20,9 +20,9 @@ #ifndef PLUGINACTION_H #define PLUGINACTION_H -#include <kaction.h> +#include <tdeaction.h> -class TDEPRINT_EXPORT PluginAction : public KAction +class TDEPRINT_EXPORT PluginAction : public TDEAction { Q_OBJECT diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index fde3a3451..f5977bfb0 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -20,14 +20,14 @@ #include "smbview.h" #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqheader.h> #include <tqapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcursor.h> #include <tqfile.h> @@ -38,7 +38,7 @@ //********************************************************************************************* SmbView::SmbView(TQWidget *parent, const char *name) -: KListView(parent,name) +: TDEListView(parent,name) { addColumn(i18n("Printer")); addColumn(i18n("Comment")); @@ -49,11 +49,11 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_state = Idle; m_current = 0; - m_proc = new KProcess(); + m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); + connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); } @@ -91,7 +91,7 @@ void SmbView::startProcess(int state) m_buffer = TQString::null; m_state = state; TQApplication::setOverrideCursor(KCursor::waitCursor()); - m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout); + m_proc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout); emit running(true); } @@ -118,12 +118,12 @@ void SmbView::endProcess() m_proc->clearArguments(); } -void SmbView::slotProcessExited(KProcess*) +void SmbView::slotProcessExited(TDEProcess*) { endProcess(); } -void SmbView::slotReceivedStdout(KProcess*, char *buf, int len) +void SmbView::slotReceivedStdout(TDEProcess*, char *buf, int len) { m_buffer.append(TQString::fromLocal8Bit(buf,len)); } @@ -178,7 +178,7 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { // opening group m_current = item; *m_proc << "nmblookup"+m_wins_server+"-M "; - *m_proc << KProcess::quote(item->text(0)); + *m_proc << TDEProcess::quote(item->text(0)); *m_proc << " -S"; startProcess(ServerListing); } @@ -194,14 +194,14 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { *m_proc << "smbclient -N -L "; } - *m_proc << KProcess::quote (item->text (0)); + *m_proc << TDEProcess::quote (item->text (0)); *m_proc << " -W "; - *m_proc << KProcess::quote (item->parent ()-> + *m_proc << TDEProcess::quote (item->parent ()-> text (0)); if (!krb5ccname) { *m_proc << " -A "; - *m_proc << KProcess:: + *m_proc << TDEProcess:: quote (m_passwdFile->name ()); } startProcess(ShareListing); diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index aea1d920d..51193254e 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -20,12 +20,12 @@ #ifndef SMBVIEW_H #define SMBVIEW_H -#include <klistview.h> +#include <tdelistview.h> -class KProcess; +class TDEProcess; class KTempFile; -class SmbView : public KListView +class SmbView : public TDEListView { Q_OBJECT public: @@ -49,15 +49,15 @@ protected: void processShares(); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotSelectionChanged(TQListViewItem*); private: enum State { GroupListing, ServerListing, ShareListing, Idle }; int m_state; TQListViewItem *m_current; - KProcess *m_proc; + TDEProcess *m_proc; TQString m_buffer; TQString m_login, m_password; KTempFile *m_passwdFile; diff --git a/tdeprint/management/tdeprint_management_module.cpp b/tdeprint/management/tdeprint_management_module.cpp index d15ef791f..89d315c0f 100644 --- a/tdeprint/management/tdeprint_management_module.cpp +++ b/tdeprint/management/tdeprint_management_module.cpp @@ -26,9 +26,9 @@ #include "kmprinter.h" #include "kmmainview.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> extern "C" { diff --git a/tdeprint/marginpreview.cpp b/tdeprint/marginpreview.cpp index 2a5e21e59..45f70b7f1 100644 --- a/tdeprint/marginpreview.cpp +++ b/tdeprint/marginpreview.cpp @@ -19,7 +19,7 @@ #include "marginpreview.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqpainter.h> #include <kcursor.h> diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index 141cadc56..c483be123 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -27,8 +27,8 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqwhatsthis.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricUnit) : TQWidget(parent, name), m_default(4, 0), m_pagesize( 2 ) @@ -206,7 +206,7 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU if ( allowMetricUnit ) { - int mode = (KGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1); + int mode = (TDEGlobal::locale()->measureSystem() == TDELocale::Metric ? 2 : 1); m_top->setMode(mode); m_bottom->setMode(mode); m_left->setMode(mode); diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp index a1b6ddf29..7f642896e 100644 --- a/tdeprint/messagewindow.cpp +++ b/tdeprint/messagewindow.cpp @@ -25,7 +25,7 @@ #include <tqpixmap.h> #include <tqhbox.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> TQPtrDict<MessageWindow> MessageWindow::m_windows; diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp index 9ccfc8074..b2a686f6e 100644 --- a/tdeprint/plugincombobox.cpp +++ b/tdeprint/plugincombobox.cpp @@ -24,7 +24,7 @@ #include <tqcombobox.h> #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqwhatsthis.h> PluginComboBox::PluginComboBox(TQWidget *parent, const char *name) diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 241c53dbf..0839af3d7 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -25,9 +25,9 @@ #include <tqtimer.h> #include <tqpixmap.h> #include <kprinter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> PosterPreview::PosterPreview( TQWidget *parent, const char *name ) : TQFrame( parent, name ) @@ -53,9 +53,9 @@ PosterPreview::~PosterPreview() void PosterPreview::init() { - m_process = new KProcess; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotProcessExited( KProcess* ) ) ); + m_process = new TDEProcess; + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0; m_dirty = false; @@ -93,7 +93,7 @@ void PosterPreview::updatePoster() m_process->clearArguments(); *m_process << "poster" << "-F" << "-m" + m_mediasize << "-p" + m_postersize << "-c" + TQString::number( m_cutmargin ) + "%"; - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { m_rows = m_cols = 0; m_dirty = false; @@ -140,11 +140,11 @@ void PosterPreview::drawContents( TQPainter *painter ) for ( int j=0; j<m_cols; j++, x+=m_pw ) { bool selected = ( m_selectedpages.find( i*m_cols+j+1 ) != m_selectedpages.end() ); - p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) ); + p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? TDEGlobalSettings::highlightColor() : white ) ); p->drawRect( x, y, m_pw, m_ph ); if ( pw > 0 && ph > 0 ) p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ), - ( selected ? TQColor(KGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); + ( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); p->setPen( Qt::DotLine ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); p->setPen( Qt::SolidLine ); @@ -206,12 +206,12 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e ) } } -void PosterPreview::slotProcessStderr( KProcess*, char *buf, int len ) +void PosterPreview::slotProcessStderr( TDEProcess*, char *buf, int len ) { m_buffer.append( TQCString( buf, len ) ); } -void PosterPreview::slotProcessExited( KProcess* ) +void PosterPreview::slotProcessExited( TDEProcess* ) { if ( m_process->normalExit() && m_process->exitStatus() == 0 ) parseBuffer(); diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h index d0c362a04..d9a23cb59 100644 --- a/tdeprint/posterpreview.h +++ b/tdeprint/posterpreview.h @@ -23,7 +23,7 @@ #include <tqframe.h> #include <tqvaluelist.h> -class KProcess; +class TDEProcess; class PosterPreview : public TQFrame { @@ -55,15 +55,15 @@ protected: void emitSelectedPages(); protected slots: - void slotProcessStderr( KProcess*, char*, int ); - void slotProcessExited( KProcess* ); + void slotProcessStderr( TDEProcess*, char*, int ); + void slotProcessExited( TDEProcess* ); private: int m_rows, m_cols; int m_pw, m_ph; // page size int m_mw, m_mh; // cur margins TQRect m_posterbb; // poster bounding box (without any margin) - KProcess *m_process; + TDEProcess *m_process; TQString m_buffer; TQString m_postersize, m_mediasize; int m_cutmargin; diff --git a/tdeprint/ppdloader.cpp b/tdeprint/ppdloader.cpp index dcf272b0a..b829e2e17 100644 --- a/tdeprint/ppdloader.cpp +++ b/tdeprint/ppdloader.cpp @@ -23,7 +23,7 @@ #include <kfilterdev.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <math.h> diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp index e0161a50a..4fc362350 100644 --- a/tdeprint/printerfilter.cpp +++ b/tdeprint/printerfilter.cpp @@ -21,8 +21,8 @@ #include "kmprinter.h" #include "kmfactory.h" -#include <kconfig.h> -#include <kglobal.h> +#include <tdeconfig.h> +#include <tdeglobal.h> #include <kdebug.h> PrinterFilter::PrinterFilter(TQObject *parent, const char *name) @@ -38,13 +38,13 @@ PrinterFilter::~PrinterFilter() void PrinterFilter::update() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Filter"); m_locationRe.setPattern(conf->readEntry("LocationRe")); m_printers = conf->readListEntry("Printers"); // filter enable state is saved on a per application basis, // so this option is retrieve from the application config file - conf = KGlobal::config(); + conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); m_enabled = conf->readBoolEntry("FilterEnabled", false); } @@ -52,7 +52,7 @@ void PrinterFilter::update() void PrinterFilter::setEnabled(bool on) { m_enabled = on; - KConfig *conf = KGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("FilterEnabled", m_enabled); } diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp index 0f8ca3743..d41adcdee 100644 --- a/tdeprint/rlpr/kmconfigproxy.cpp +++ b/tdeprint/rlpr/kmconfigproxy.cpp @@ -21,7 +21,7 @@ #include "kmproxywidget.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMConfigProxy::KMConfigProxy(TQWidget *parent) : KMConfigPage(parent,"Proxy") @@ -36,12 +36,12 @@ KMConfigProxy::KMConfigProxy(TQWidget *parent) lay0->addStretch(1); } -void KMConfigProxy::loadConfig(KConfig *conf) +void KMConfigProxy::loadConfig(TDEConfig *conf) { m_widget->loadConfig(conf); } -void KMConfigProxy::saveConfig(KConfig *conf) +void KMConfigProxy::saveConfig(TDEConfig *conf) { m_widget->saveConfig(conf); } diff --git a/tdeprint/rlpr/kmconfigproxy.h b/tdeprint/rlpr/kmconfigproxy.h index 6f3b7ef42..e3f92808c 100644 --- a/tdeprint/rlpr/kmconfigproxy.h +++ b/tdeprint/rlpr/kmconfigproxy.h @@ -23,15 +23,15 @@ #include "kmconfigpage.h" class KMProxyWidget; -class KConfig; +class TDEConfig; class KMConfigProxy : public KMConfigPage { public: KMConfigProxy(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KMProxyWidget *m_widget; diff --git a/tdeprint/rlpr/kmproprlpr.cpp b/tdeprint/rlpr/kmproprlpr.cpp index 62fe97827..08713a784 100644 --- a/tdeprint/rlpr/kmproprlpr.cpp +++ b/tdeprint/rlpr/kmproprlpr.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name) : KMPropWidget(parent,name) diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index e4a761519..870da43c4 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -24,8 +24,8 @@ #include <tqcheckbox.h> #include <tqlayout.h> #include <tqvalidator.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kcursor.h> KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) @@ -55,7 +55,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) lay0->addWidget(m_proxyport,2,1); } -void KMProxyWidget::loadConfig(KConfig *conf) +void KMProxyWidget::loadConfig(TDEConfig *conf) { conf->setGroup("RLPR"); m_proxyhost->setText(conf->readEntry("ProxyHost",TQString::null)); @@ -63,7 +63,7 @@ void KMProxyWidget::loadConfig(KConfig *conf) m_useproxy->setChecked(!m_proxyhost->text().isEmpty()); } -void KMProxyWidget::saveConfig(KConfig *conf) +void KMProxyWidget::saveConfig(TDEConfig *conf) { conf->setGroup("RLPR"); conf->writeEntry("ProxyHost",(m_useproxy->isChecked() ? m_proxyhost->text() : TQString::null)); diff --git a/tdeprint/rlpr/kmproxywidget.h b/tdeprint/rlpr/kmproxywidget.h index 0c1a5079b..a698889a9 100644 --- a/tdeprint/rlpr/kmproxywidget.h +++ b/tdeprint/rlpr/kmproxywidget.h @@ -22,7 +22,7 @@ #include <tqgroupbox.h> -class KConfig; +class TDEConfig; class TQLineEdit; class TQCheckBox; @@ -31,8 +31,8 @@ class KMProxyWidget : public TQGroupBox public: KMProxyWidget(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: TQLineEdit *m_proxyhost; diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp index c6704ed09..7b8ceac2d 100644 --- a/tdeprint/rlpr/kmrlprmanager.cpp +++ b/tdeprint/rlpr/kmrlprmanager.cpp @@ -26,7 +26,7 @@ #include <tqmap.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMManager(parent,name) diff --git a/tdeprint/rlpr/kmrlpruimanager.cpp b/tdeprint/rlpr/kmrlpruimanager.cpp index 9bae2cdc4..fa6383962 100644 --- a/tdeprint/rlpr/kmrlpruimanager.cpp +++ b/tdeprint/rlpr/kmrlpruimanager.cpp @@ -26,7 +26,7 @@ #include "kmproprlpr.h" #include "kmconfigproxy.h" -#include <klocale.h> +#include <tdelocale.h> KMRlprUiManager::KMRlprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMUiManager(parent,name) diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp index 15ad88ec2..056cba1f0 100644 --- a/tdeprint/rlpr/kmwrlpr.cpp +++ b/tdeprint/rlpr/kmwrlpr.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> #include <tqlineedit.h> #include <tqheader.h> -#include <klistview.h> -#include <klocale.h> +#include <tdelistview.h> +#include <tdelocale.h> #include <kiconloader.h> static TQListViewItem* rlpr_findChild(TQListViewItem *c, const TQString& txt) @@ -50,7 +50,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) m_title = i18n("Remote LPD Queue Settings"); m_nextpage = KMWizard::Name; - m_view = new KListView(this); + m_view = new TDEListView(this); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); m_view->addColumn(TQString::fromLatin1("")); diff --git a/tdeprint/rlpr/kmwrlpr.h b/tdeprint/rlpr/kmwrlpr.h index 7c1aa74f2..dc375303d 100644 --- a/tdeprint/rlpr/kmwrlpr.h +++ b/tdeprint/rlpr/kmwrlpr.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" -class KListView; +class TDEListView; class TQLineEdit; class TQListViewItem; @@ -43,7 +43,7 @@ protected: void initialize(); private: - KListView *m_view; + TDEListView *m_view; TQLineEdit *m_host, *m_queue; }; diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 2833c9598..4ef5ebe1e 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -25,8 +25,8 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdelocale.h> KRlprPrinterImpl::KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) : KPrinterImpl(parent,name) @@ -47,7 +47,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) QString host(rpr->option("host")), queue(rpr->option("queue")); if (!host.isEmpty() && !queue.isEmpty()) { - QString exestr = KStandardDirs::findExe("rlpr"); + QString exestr = TDEStandardDirs::findExe("rlpr"); if (exestr.isEmpty()) { printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr")); @@ -57,7 +57,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); // proxy settings - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("RLPR"); QString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null); if (!host.isEmpty()) diff --git a/tdeprint/rlpr/krlprprinterimpl.h b/tdeprint/rlpr/krlprprinterimpl.h index 7af98df0c..741a1a3c8 100644 --- a/tdeprint/rlpr/krlprprinterimpl.h +++ b/tdeprint/rlpr/krlprprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KRlprPrinterImpl : public KPrinterImpl { 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..bf2fb3d12 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,12 +26,12 @@ #include <tqheader.h> #include <tqwhatsthis.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurldrag.h> -#include <kfiledialog.h> -#include <klocale.h> +#include <tdefiledialog.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <krun.h> #include <kmimetype.h> @@ -97,7 +97,7 @@ KFileList::KFileList(TQWidget *parent, const char *name) m_block = false; - m_files = new KListView(this); + m_files = new TDEListView(this); m_files->addColumn(i18n("Name")); m_files->addColumn(i18n("Type")); m_files->addColumn(i18n("Path")); @@ -193,7 +193,7 @@ void KFileList::addFiles(const KURL::List& files) { KMimeType::Ptr mime = KMimeType::findByURL( *it, 0, true, false); item = new TQListViewItem(m_files, item, (*it).fileName(), mime->comment(), (*it).url()); - item->setPixmap(0, mime->pixmap(*it, KIcon::Small)); + item->setPixmap(0, mime->pixmap(*it, TDEIcon::Small)); } slotSelectionChanged(); @@ -218,7 +218,7 @@ void KFileList::setFileList(const TQStringList& files) KURL url = KURL::fromPathOrURL( *it ); KMimeType::Ptr mime = KMimeType::findByURL(url, 0, true, false); item = new TQListViewItem(m_files, item, url.fileName(), mime->comment(), url.url()); - item->setPixmap(0, mime->pixmap(url, KIcon::Small)); + item->setPixmap(0, mime->pixmap(url, TDEIcon::Small)); } slotSelectionChanged(); } @@ -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..912abd07a 100644 --- a/tdeprint/kfilelist.h +++ b/tdeprint/tdefilelist.h @@ -17,14 +17,14 @@ * Boston, MA 02110-1301, USA. **/ -#ifndef KFILELIST_H -#define KFILELIST_H +#ifndef TDEFILELIST_H +#define TDEFILELIST_H #include <tqwidget.h> #include <tqptrlist.h> #include <kurl.h> -class KListView; +class TDEListView; class TQToolButton; class TQListViewItem; @@ -54,7 +54,7 @@ protected: void selection(TQPtrList<TQListViewItem>&); private: - KListView *m_files; + TDEListView *m_files; TQToolButton *m_add, *m_remove, *m_open, *m_up, *m_down; bool m_block; }; diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp index 1b5cc691a..a1985e804 100644 --- a/tdeprint/tdeprintcheck.cpp +++ b/tdeprint/tdeprintcheck.cpp @@ -53,7 +53,7 @@ static const char* const config_stddirs[] = { 0 }; -bool KdeprintChecker::check(KConfig *conf, const TQString& group) +bool KdeprintChecker::check(TDEConfig *conf, const TQString& group) { if (!group.isEmpty()) conf->setGroup(group); @@ -80,7 +80,7 @@ bool KdeprintChecker::checkURL(const KURL& url) else if (prot == "exec") return checkExec(url); else if (prot == "file" || prot == "dir") - return KStandardDirs::exists(url.url()); + return TDEStandardDirs::exists(url.url()); else if (prot == "service") return checkService(url); return false; @@ -117,7 +117,7 @@ bool KdeprintChecker::checkConfig(const KURL& url) bool KdeprintChecker::checkExec(const KURL& url) { QString execname(url.path().mid(1)); - return !(KStandardDirs::findExe(execname).isEmpty()); + return !(TDEStandardDirs::findExe(execname).isEmpty()); } bool KdeprintChecker::checkService(const KURL& url) diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h index 0bb28cc28..7ffdf8d6c 100644 --- a/tdeprint/tdeprintcheck.h +++ b/tdeprint/tdeprintcheck.h @@ -22,13 +22,13 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> class TDEPRINT_EXPORT KdeprintChecker { public: - static bool check(KConfig *conf, const TQString& group = TQString::null); + static bool check(TDEConfig *conf, const TQString& group = TQString::null); static bool check(const TQStringList& uris); private: diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 86c8375cb..9b7b6c955 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -21,19 +21,19 @@ #include "kprintprocess.h" #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> -#include <kmessagebox.h> +#include <tdemessagebox.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> #include <kstandarddirs.h> #include <twin.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tqlayout.h> #include <tqtimer.h> #include <tqregexp.h> @@ -124,12 +124,12 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla if ( !url.isLocalFile() ) { TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) ); - command.replace( re, KProcess::quote( tmpFilename ) ); + command.replace( re, TDEProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); } else - command.replace( re, KProcess::quote( re.cap( 1 ) ) ); + command.replace( re, TDEProcess::quote( re.cap( 1 ) ) ); } if ( checkFiles( command, files ) ) @@ -162,7 +162,7 @@ void KDEPrintd::slotPrintError( KPrintProcess *proc, const TQString& msg ) TQString KDEPrintd::openPassDlg(const TQString& user) { TQString user_(user), pass_, result; - if (KIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted) + if (TDEIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted) result.append(user_).append(":").append(pass_); return result; } @@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) i18n("Provide root's Password"), "provideRootsPassword") == KMessageBox::Continue) { - cmd = ("tdesu -c " + KProcess::quote(cmd)); + cmd = ("tdesu -c " + TDEProcess::quote(cmd)); break; } else @@ -252,7 +252,7 @@ void KDEPrintd::processRequest() return; Request *req = m_requestsPending.first(); - KIO::AuthInfo info; + TDEIO::AuthInfo info; TQByteArray params, reply; TQCString replyType; TQString authString( "::" ); @@ -264,13 +264,13 @@ void KDEPrintd::processRequest() TQDataStream input( params, IO_WriteOnly ); input << info << TQString(i18n( "Authentication failed (user name=%1)" ).arg( info.username )) << 0L << (long int) req->seqNbr; - if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo,TQString,long int,long int)", + if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo,TQString,long int,long int)", params, replyType, reply ) ) { - if ( replyType == "KIO::AuthInfo" ) + if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream output( reply, IO_ReadOnly ); - KIO::AuthInfo result; + TDEIO::AuthInfo result; int seqNbr; output >> result >> seqNbr; @@ -278,7 +278,7 @@ void KDEPrintd::processRequest() authString = result.username + ":" + result.password + ":" + TQString::number( seqNbr ); } else - kdWarning( 500 ) << "DCOP returned type error, expected KIO::AuthInfo, received " << replyType << endl; + kdWarning( 500 ) << "DCOP returned type error, expected TDEIO::AuthInfo, received " << replyType << endl; } else kdWarning( 500 ) << "Cannot communicate with kded_kpasswdserver" << endl; @@ -298,7 +298,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons { TQByteArray params, reply; TQCString replyType; - KIO::AuthInfo info; + TDEIO::AuthInfo info; info.username = user; info.password = passwd; @@ -307,7 +307,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons TQDataStream input( params, IO_WriteOnly ); input << info << ( long int )0; - if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo,long int)", + if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo,long int)", params, replyType, reply ) ) kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl; } diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h index 51cd09877..4ef54b894 100644 --- a/tdeprint/tdeprintd.h +++ b/tdeprint/tdeprintd.h @@ -28,7 +28,7 @@ #include <tqintdict.h> class KPrintProcess; -class KProcess; +class TDEProcess; class StatusWindow; class KDEPrintd : public KDEDModule diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 443cc89e8..71d4a0680 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -14,7 +14,7 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tqapplication.h> #include <math.h> @@ -245,7 +245,7 @@ void DrawView::resizeEvent( TQResizeEvent * ) int main( int argc, char **argv ) { - KApplication app( argc, argv, "drawdemo" ); + TDEApplication app( argc, argv, "drawdemo" ); DrawView draw; app.setMainWidget( &draw ); draw.show(); diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp index 9f92734f4..54d160c73 100644 --- a/tdeprint/tests/helpwindow.cpp +++ b/tdeprint/tests/helpwindow.cpp @@ -13,8 +13,8 @@ #include <tqstatusbar.h> #include <tqpixmap.h> #include <tqpopupmenu.h> -#include <kmenubar.h> -#include <ktoolbar.h> +#include <tdemenubar.h> +#include <tdetoolbar.h> #include <kstatusbar.h> #include <tqtoolbutton.h> #include <tqiconset.h> @@ -39,7 +39,7 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQWidget* parent, const char *name ) - : KMainWindow( parent, name, WDestructiveClose ), + : TDEMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() { readHistory(); diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h index c444b8144..2ff3d3649 100644 --- a/tdeprint/tests/helpwindow.h +++ b/tdeprint/tests/helpwindow.h @@ -11,7 +11,7 @@ #ifndef HELPWINDOW_H #define HELPWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqtextbrowser.h> #include <tqstringlist.h> #include <tqmap.h> @@ -20,7 +20,7 @@ class TQComboBox; class TQPopupMenu; -class HelpWindow : public KMainWindow +class HelpWindow : public TDEMainWindow { Q_OBJECT public: diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index a1dc6b5e0..d714bcdf6 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -9,7 +9,7 @@ *****************************************************************************/ #include "helpwindow.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <tqwindowsstyle.h> #include <tqstylesheet.h> #include <stdlib.h> @@ -17,7 +17,7 @@ int main( int argc, char ** argv ) { - KApplication a(argc, argv, "helpviewer"); + TDEApplication a(argc, argv, "helpviewer"); TQString home; if (argc > 1) diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index e4bc1e6f2..9afff64ac 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -25,8 +25,8 @@ #include <tqcheckbox.h> #include <tqaccel.h> #include <kdemacros.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kdialogbase.h> @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("exec")); @@ -173,7 +173,7 @@ void EscpWidget::startCommand(const TQString& arg) return; } - TQString exestr = KStandardDirs::findExe("escputil"); + TQString exestr = TDEStandardDirs::findExe("escputil"); if (exestr.isEmpty()) { KMessageBox::error(this, i18n("The executable escputil cannot be found in your " @@ -196,7 +196,7 @@ void EscpWidget::startCommand(const TQString& arg) m_hasoutput = ( arg == "-i" || arg == "-d" ); for ( TQValueList<TQCString>::ConstIterator it=m_proc.args().begin(); it!=m_proc.args().end(); ++it ) kdDebug() << "ARG: " << *it << endl; - if (m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + if (m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) setEnabled(false); else { @@ -206,7 +206,7 @@ void EscpWidget::startCommand(const TQString& arg) } } -void EscpWidget::slotProcessExited(KProcess*) +void EscpWidget::slotProcessExited(TDEProcess*) { setEnabled(true); if (!m_proc.normalExit() || m_proc.exitStatus() != 0) @@ -229,13 +229,13 @@ void EscpWidget::slotProcessExited(KProcess*) m_hasoutput = false; } -void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStdout(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_outbuffer.append(bufstr); } -void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_errorbuffer.append(bufstr); diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h index 7e3ba55e8..4ad284d00 100644 --- a/tdeprint/tools/escputil/escpwidget.h +++ b/tdeprint/tools/escputil/escpwidget.h @@ -37,16 +37,16 @@ public: void setPrinterName(const TQString&); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotReceivedStderr(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotButtonClicked(); protected: void startCommand(const TQString& arg); private: - KProcess m_proc; + TDEProcess m_proc; KURL m_deviceURL; TQString m_errorbuffer, m_outbuffer; TQLabel *m_printer, *m_device; diff --git a/tdeprint/util.h b/tdeprint/util.h index dafcdaa90..75811aee6 100644 --- a/tdeprint/util.h +++ b/tdeprint/util.h @@ -23,7 +23,7 @@ #include "kprinter.h" #include <tqstring.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> KURL smbToUrl(const TQString& work, const TQString& server, const TQString& printer); void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& printer); |