summaryrefslogtreecommitdiffstats
path: root/tdeprint
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /tdeprint
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint')
-rw-r--r--tdeprint/slave/kio_print.cpp2
-rw-r--r--tdeprint/tdeprintfax/conffax.cpp6
-rw-r--r--tdeprint/tdeprintfax/confgeneral.cpp4
-rw-r--r--tdeprint/tdeprintfax/confsystem.cpp4
-rw-r--r--tdeprint/tdeprintfax/faxab.cpp4
-rw-r--r--tdeprint/tdeprintfax/faxctrl.cpp34
-rw-r--r--tdeprint/tdeprintfax/faxctrl.h8
7 files changed, 31 insertions, 31 deletions
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 946092d15..79ad48058 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -796,7 +796,7 @@ TQString KIO_Print::locateData(const TQString& item)
{
TQString path = locate("data", "tdeprint/template/"+item);
if (path.isEmpty())
- path = KGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true);
+ path = TDEGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true);
return path;
}
diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp
index 1f3b8c3c5..e36916b83 100644
--- a/tdeprint/tdeprintfax/conffax.cpp
+++ b/tdeprint/tdeprintfax/conffax.cpp
@@ -61,9 +61,9 @@ ConfFax::ConfFax(TQWidget *parent, const char *name)
void ConfFax::load()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("Fax");
- TQString v = conf->readEntry("Page", KGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
+ TQString v = conf->readEntry("Page", TDEGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
if (v == "letter") m_pagesize->setCurrentItem(1);
else if (v == "legal") m_pagesize->setCurrentItem(2);
else m_pagesize->setCurrentItem(0);
@@ -73,7 +73,7 @@ void ConfFax::load()
void ConfFax::save()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("Fax");
conf->writeEntry("Resolution", (m_resolution->currentItem() == 0 ? "High" : "Low"));
conf->writeEntry("Page", (m_pagesize->currentItem() == 0 ? "a4" : (m_pagesize->currentItem() == 1 ? "letter" : "legal")));
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index db3ef916a..be3025e65 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -69,7 +69,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
void ConfGeneral::load()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("Personal");
m_name->setText(conf->readEntry("Name", getenv("USER")));
m_number->setText(conf->readEntry("Number"));
@@ -80,7 +80,7 @@ void ConfGeneral::load()
void ConfGeneral::save()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("Personal");
conf->writeEntry("Name", m_name->text());
conf->writeEntry("Number", m_number->text());
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index 91c23adb6..a116af180 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -97,7 +97,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
void ConfSystem::load()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
m_commands << conf->readPathEntry("EFax", defaultCommand(efax_default_cmd));
m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd));
@@ -130,7 +130,7 @@ void ConfSystem::load()
void ConfSystem::save()
{
m_commands[ m_current ] = m_command->text();
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
if (m_commands[EFAX_ID] != defaultCommand(efax_default_cmd))
conf->writePathEntry("EFax", m_commands[EFAX_ID]);
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index ad50ac9fb..c9b183b27 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -60,7 +60,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
l2->addWidget(m_ok, 0);
l2->addWidget(m_cancel, 0);
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup( "General" );
TQSize defsize( 400, 200 );
resize( conf->readSizeEntry( "ABSize", &defsize ) );
@@ -71,7 +71,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
FaxAB::~FaxAB()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup( "General" );
conf->writeEntry( "ABSize", size() );
}
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index d676fcaa7..7e70a5e71 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -53,7 +53,7 @@
#include <stdlib.h>
#include <stdarg.h>
-#define quote(x) KProcess::quote(x)
+#define quote(x) TDEProcess::quote(x)
/** \brief Return a string for the page size.
*
@@ -75,14 +75,14 @@ char const* pageSizeText(int size)
*/
static TQString pageSize()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("Fax");
- return conf->readEntry("Page", pageSizeText(KGlobal::locale()->pageSize()));
+ return conf->readEntry("Page", pageSizeText(TDEGlobal::locale()->pageSize()));
}
static TQString stripNumber( const TQString& s )
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup( "Personal" );
// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
@@ -193,7 +193,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
// unquote variables (they will be replaced with quoted values later)
TQValueStack<bool> stack;
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
TQString cmd = s;
@@ -354,11 +354,11 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
FaxCtrl::FaxCtrl(TQWidget *parent, const char *name)
: TQObject(parent, name)
{
- m_process = new KProcess();
+ m_process = new TDEProcess();
m_process->setUseShell(true);
- connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
- connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
- connect(m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
+ connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+ connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+ connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(this, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(cleanTempFiles()));
m_logview = 0;
}
@@ -390,14 +390,14 @@ bool FaxCtrl::send(KdeprintFax *f)
return true;
}
-void FaxCtrl::slotReceivedStdout(KProcess*, char *buffer, int len)
+void FaxCtrl::slotReceivedStdout(TDEProcess*, char *buffer, int len)
{
TQCString str(buffer, len);
kdDebug() << "Received stdout: " << str << endl;
addLog(TQString(str));
}
-void FaxCtrl::slotProcessExited(KProcess*)
+void FaxCtrl::slotProcessExited(TDEProcess*)
{
// we exited a process: if there's still entries in m_files, this was a filter
// process, else this was the fax process
@@ -426,7 +426,7 @@ void FaxCtrl::slotProcessExited(KProcess*)
TQString FaxCtrl::faxCommand()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
TQString sys = conf->readPathEntry("System", "efax");
TQString cmd;
@@ -465,7 +465,7 @@ void FaxCtrl::sendFax()
m_process->clearArguments();
*m_process << cmd;
addLog(i18n("Sending to fax using: %1").arg(cmd));
- if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
+ if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
emit faxSent(false);
else
emit message(i18n("Sending fax to %1...").arg( item.number ));
@@ -490,11 +490,11 @@ void FaxCtrl::filter()
m_filteredfiles.prepend(tmp);
m_tempfiles.append(tmp);
m_process->clearArguments();
- *m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters"))
+ *m_process << locate("data","tdeprintfax/anytops") << "-m" << TDEProcess::quote(locate("data","tdeprintfax/faxfilters"))
<< TQString::fromLatin1("--mime=%1").arg(mimeType)
<< "-p" << pageSize()
- << KProcess::quote(m_files[0]) << KProcess::quote(tmp);
- if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
+ << TDEProcess::quote(m_files[0]) << TDEProcess::quote(tmp);
+ if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
emit faxSent(false);
else
emit message(i18n("Filtering %1...").arg(m_files[0]));
@@ -576,7 +576,7 @@ void FaxCtrl::addLog(const TQString& s, bool isTitle)
TQString FaxCtrl::faxSystem()
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
TQString s = conf->readEntry("System", "efax");
s[0] = s[0].upper();
diff --git a/tdeprint/tdeprintfax/faxctrl.h b/tdeprint/tdeprintfax/faxctrl.h
index a7e16a850..9135b7cc6 100644
--- a/tdeprint/tdeprintfax/faxctrl.h
+++ b/tdeprint/tdeprintfax/faxctrl.h
@@ -27,7 +27,7 @@
#include "tdeprintfax.h"
-class KProcess;
+class TDEProcess;
class TQTextEdit;
class FaxCtrl : public TQObject
@@ -48,8 +48,8 @@ signals:
void faxSent(bool);
protected slots:
- void slotReceivedStdout(KProcess*, char*, int);
- void slotProcessExited(KProcess*);
+ void slotReceivedStdout(TDEProcess*, char*, int);
+ void slotProcessExited(TDEProcess*);
void cleanTempFiles();
void slotClearLog();
void slotCloseLog();
@@ -63,7 +63,7 @@ protected:
void addLogTitle( const TQString& );
private:
- KProcess *m_process;
+ TDEProcess *m_process;
TQString m_log, m_command;
TQStringList m_files, m_filteredfiles, m_tempfiles;
TQTextEdit *m_logview;