summaryrefslogtreecommitdiffstats
path: root/quanta/utility
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:51:30 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:51:30 -0600
commit29df04c24350cc76a41e2410d1c92445f9338b98 (patch)
treec2b9cde128e24275393a83d9eaec58b2ef12d109 /quanta/utility
parentc70534eef6085384ef7ddff369a154dbc8901917 (diff)
downloadtdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.tar.gz
tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'quanta/utility')
-rw-r--r--quanta/utility/myprocess.h2
-rw-r--r--quanta/utility/newstuff.cpp10
-rw-r--r--quanta/utility/tagaction.cpp38
-rw-r--r--quanta/utility/tagaction.h10
-rw-r--r--quanta/utility/toolbartabwidget.cpp4
5 files changed, 32 insertions, 32 deletions
diff --git a/quanta/utility/myprocess.h b/quanta/utility/myprocess.h
index 0b530af2..a80a199c 100644
--- a/quanta/utility/myprocess.h
+++ b/quanta/utility/myprocess.h
@@ -18,7 +18,7 @@
#include <kprocess.h>
-class MyProcess:public KProcess
+class MyProcess:public TDEProcess
{
Q_OBJECT
diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp
index bc3a052f..96c18bbe 100644
--- a/quanta/utility/newstuff.cpp
+++ b/quanta/utility/newstuff.cpp
@@ -36,7 +36,7 @@ void QNewDTEPStuff::installResource()
if (tar.open(IO_ReadOnly))
{
const KArchiveDirectory *directory = tar.directory();
- TQString dtepDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep/";
+ TQString dtepDir =TDEGlobal::dirs()->saveLocation("data") + resourceDir + "dtep/";
TQString dtdName = (*directory->entries().at(0));
if (dtdName.isEmpty())
{
@@ -62,7 +62,7 @@ QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget
void QNewToolbarStuff::installResource()
{
- KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName());
+ KURL destURL = KURL::fromPathOrURL(TDEGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName());
bool ok = true;
if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
{
@@ -89,7 +89,7 @@ QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidg
void QNewTemplateStuff::installResource()
{
- KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName());
+ KURL destURL = KURL::fromPathOrURL(TDEGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName());
bool ok = true;
if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
{
@@ -114,7 +114,7 @@ void QNewScriptStuff::installResource()
if (tar.open(IO_ReadOnly))
{
const KArchiveDirectory *directory = tar.directory();
- TQString scriptsDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "scripts/";
+ TQString scriptsDir =TDEGlobal::dirs()->saveLocation("data") + resourceDir + "scripts/";
directory->copyTo(scriptsDir, true);
tar.close();
} else
@@ -131,7 +131,7 @@ void QNewDocStuff::installResource()
if (tar.open(IO_ReadOnly))
{
const KArchiveDirectory *directory = tar.directory();
- TQString docDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "doc/";
+ TQString docDir =TDEGlobal::dirs()->saveLocation("data") + resourceDir + "doc/";
directory->copyTo(docDir, true);
tar.close();
} else
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 57830da9..ae27c526 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -62,14 +62,14 @@
#include "viewmanager.h"
-MyProcess::MyProcess():KProcess()
+MyProcess::MyProcess():TDEProcess()
{
}
int MyProcess::commSetupDoneC()
{
::setpgid(pid_, 0);
- return KProcess::commSetupDoneC();
+ return TDEProcess::commSetupDoneC();
}
TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle)
@@ -434,12 +434,12 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
firstOutput = true;
firstError = true;
- connect( proc, TQT_SIGNAL(receivedStdout( KProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptOutput(KProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(receivedStderr( KProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptError(KProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(processExited( KProcess*)), this,
- TQT_SLOT( slotProcessExited(KProcess*)));
+ connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this,
+ TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int)));
+ connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this,
+ TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int)));
+ connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this,
+ TQT_SLOT( slotProcessExited(TDEProcess*)));
@@ -458,7 +458,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
*proc << m_inputFileName;
}
- if (proc->start(KProcess::NotifyOnExit, KProcess::All))
+ if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
emit clearMessages();
emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false);
@@ -688,12 +688,12 @@ bool TagAction::slotActionActivated()
firstOutput = true;
firstError = true;
- connect( proc, TQT_SIGNAL(receivedStdout( KProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptOutput(KProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(receivedStderr( KProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptError(KProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(processExited( KProcess*)), this,
- TQT_SLOT( slotProcessExited(KProcess*)));
+ connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this,
+ TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int)));
+ connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this,
+ TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int)));
+ connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this,
+ TQT_SLOT( slotProcessExited(TDEProcess*)));
@@ -712,7 +712,7 @@ bool TagAction::slotActionActivated()
*proc << m_inputFileName;
}
- if (proc->start(KProcess::NotifyOnExit, KProcess::All))
+ if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
emit clearMessages();
emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false);
@@ -740,7 +740,7 @@ bool TagAction::slotActionActivated()
return true;
}
-void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen )
+void TagAction::slotGetScriptOutput( TDEProcess *, char *buffer, int buflen )
{
TQCString tmp( buffer, buflen + 1 );
TQString text( TQString::fromLocal8Bit(tmp) );
@@ -801,7 +801,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen )
firstOutput = false;
}
-void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen )
+void TagAction::slotGetScriptError( TDEProcess *, char *buffer, int buflen )
{
Document *w = ViewManager::ref()->activeDocument();
TQCString tmp( buffer, buflen + 1 );
@@ -963,7 +963,7 @@ void TagAction::slotActivated()
*/
}
-void TagAction::slotProcessExited(KProcess *process)
+void TagAction::slotProcessExited(TDEProcess *process)
{
if (loopStarted)
{
diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h
index 62a751d2..3a58f603 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -27,7 +27,7 @@
class KMainWindow;
class QuantaView;
-class KProcess;
+class TDEProcess;
class TQDomElement;
class TQFile;
class TQTimer;
@@ -97,11 +97,11 @@ public slots:
virtual bool slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState state);
protected slots:
- virtual void slotGetScriptOutput( KProcess *, char *buffer, int buflen );
- virtual void slotGetScriptError( KProcess *, char *buffer, int buflen );
+ virtual void slotGetScriptOutput( TDEProcess *, char *buffer, int buflen );
+ virtual void slotGetScriptError( TDEProcess *, char *buffer, int buflen );
virtual void scriptDone();
void slotTimeout();
- void slotProcessExited(KProcess *);
+ void slotProcessExited(TDEProcess *);
virtual bool slotActionActivated();
private:
@@ -115,7 +115,7 @@ private:
NodeSelection& selection, NodeModifsSet* modifs) const;
private:
- KProcess *proc;
+ TDEProcess *proc;
bool firstError;
bool firstOutput;
bool m_modified;
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index 0104c745..c594c46b 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -217,7 +217,7 @@ int ToolbarTabWidget::tabHeight() const
int height = tabBar()->height();
if (height < 2)
{
- height = TQFontMetrics(KGlobalSettings::generalFont()).height() + 12;
+ height = TQFontMetrics(TDEGlobalSettings::generalFont()).height() + 12;
}
return height;
}
@@ -263,7 +263,7 @@ void QuantaToolBar::slotIconTextChanged(int id)
{
ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref();
int width = toolbarTab->width();
- int bigHeight = iconSize() + TQFontMetrics(KGlobalSettings::toolBarFont()).height() + 10;
+ int bigHeight = iconSize() + TQFontMetrics(TDEGlobalSettings::toolBarFont()).height() + 10;
int normalHeight = iconSize() + 10;
for (int i = 0; i < toolbarTab->count(); i++)
{