summaryrefslogtreecommitdiffstats
path: root/tdeprint/management
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdeprint/management
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint/management')
-rw-r--r--tdeprint/management/kmconfigdialog.cpp4
-rw-r--r--tdeprint/management/kmconfigfilter.cpp4
-rw-r--r--tdeprint/management/kmconfigfilter.h4
-rw-r--r--tdeprint/management/kmconfigfonts.cpp4
-rw-r--r--tdeprint/management/kmconfigfonts.h4
-rw-r--r--tdeprint/management/kmconfiggeneral.cpp4
-rw-r--r--tdeprint/management/kmconfiggeneral.h4
-rw-r--r--tdeprint/management/kmconfigjobs.cpp4
-rw-r--r--tdeprint/management/kmconfigjobs.h4
-rw-r--r--tdeprint/management/kmconfigpage.cpp4
-rw-r--r--tdeprint/management/kmconfigpage.h6
-rw-r--r--tdeprint/management/kmconfigpreview.cpp4
-rw-r--r--tdeprint/management/kmconfigpreview.h4
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp4
-rw-r--r--tdeprint/management/kmjobviewer.cpp8
-rw-r--r--tdeprint/management/kmmainview.cpp4
-rw-r--r--tdeprint/management/kmtimer.cpp2
-rw-r--r--tdeprint/management/kmwdrivertest.cpp2
-rw-r--r--tdeprint/management/kmwsocketutil.cpp2
-rw-r--r--tdeprint/management/networkscanner.cpp4
20 files changed, 40 insertions, 40 deletions
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index cd823d540..ee63e9eeb 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -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);
@@ -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..2eea53b0e 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -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");
@@ -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;
diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h
index 9571f0d54..298c83de2 100644
--- a/tdeprint/management/kmconfigfilter.h
+++ b/tdeprint/management/kmconfigfilter.h
@@ -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();
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 183d0b621..b933cab00 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -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..dd65d3901 100644
--- a/tdeprint/management/kmconfigfonts.h
+++ b/tdeprint/management/kmconfigfonts.h
@@ -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();
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index 2298d7485..f02cfa854 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -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..0fb40fb7b 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -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..548968701 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -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/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 579cae5df..704a20db5 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -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/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 19c46224f..da8a98016 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -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);
@@ -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/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 22b9ac8e9..daafbff97 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -145,7 +145,7 @@ 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));
@@ -162,7 +162,7 @@ void KMMainView::restoreSettings()
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());
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index 4a7f611d8..5acc27351 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -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/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index d4652878f..0e0cd306b 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -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());
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index e667d1fa1..04556c07b 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -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/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index a49a77877..1943f9354 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -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;