diff options
Diffstat (limited to 'tdeprint/management')
76 files changed, 389 insertions, 389 deletions
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" { |