summaryrefslogtreecommitdiffstats
path: root/kommander
diff options
context:
space:
mode:
Diffstat (limited to 'kommander')
-rw-r--r--kommander/editor/assoctexteditorimpl.cpp4
-rw-r--r--kommander/editor/functionsimpl.cpp4
-rw-r--r--kommander/editor/mainwindow.cpp30
-rw-r--r--kommander/editor/mainwindow.h8
-rw-r--r--kommander/editor/mainwindowactions.cpp18
-rw-r--r--kommander/editor/messagelog.cpp4
-rw-r--r--kommander/editor/messagelog.h6
-rw-r--r--kommander/editor/newformimpl.cpp2
-rw-r--r--kommander/executor/instance.cpp4
-rw-r--r--kommander/factory/kommanderfactory.cpp4
-rw-r--r--kommander/pluginmanager/mainwindow.cpp2
-rw-r--r--kommander/widget/functionlib.cpp2
-rw-r--r--kommander/widget/kommanderfunctions.cpp2
-rw-r--r--kommander/widget/myprocess.cpp14
-rw-r--r--kommander/widget/myprocess.h6
-rw-r--r--kommander/widgets/aboutdialog.cpp4
-rw-r--r--kommander/widgets/closebutton.cpp12
-rw-r--r--kommander/widgets/closebutton.h4
-rw-r--r--kommander/widgets/execbutton.h2
-rw-r--r--kommander/widgets/fontdialog.cpp2
-rw-r--r--kommander/widgets/listbox.cpp2
-rw-r--r--kommander/widgets/pixmaplabel.cpp2
-rw-r--r--kommander/widgets/plugin.cpp8
-rw-r--r--kommander/widgets/popupmenu.cpp8
-rw-r--r--kommander/widgets/scriptobject.cpp2
-rw-r--r--kommander/widgets/tabwidget.cpp2
-rw-r--r--kommander/widgets/timer.cpp2
-rw-r--r--kommander/widgets/treewidget.cpp2
-rw-r--r--kommander/widgets/wizard.cpp4
-rw-r--r--kommander/working/plugintemplate/plugin.cpp2
-rw-r--r--kommander/working/plugintemplate/widget.cpp2
31 files changed, 85 insertions, 85 deletions
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 8498b96f..334fa177 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -68,12 +68,12 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
: AssocTextEditorBase(a_parent, a_name, a_modal)
{
// text editor
-/* associatedTextEdit->setFont(KGlobalSettings::fixedFont());
+/* associatedTextEdit->setFont(TDEGlobalSettings::fixedFont());
associatedTextEdit->setTabStopWidth(associatedTextEdit->fontMetrics().maxWidth() * 3);
associatedTextEdit->setTextFormat(TQt::PlainText);*/
// icon for non-empty scripts
- scriptPixmap = KGlobal::iconLoader()->loadIcon("source", KIcon::Small);
+ scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", KIcon::Small);
// signals and slots connections
m_formWindow = a_form;
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index a7393dca..f4dc7f38 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -45,8 +45,8 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict<TQWidget>& a_w
bool a_modal)
: FunctionsDialogBase(a_parent, a_name, a_modal), m_widgetList(a_widgetList), m_useInternalParser(useInternalParser)
{
- clearButton->setPixmap(KGlobal::iconLoader()->loadIcon("locationbar_erase", KIcon::Toolbar));
- copyButton->setPixmap(KGlobal::iconLoader()->loadIcon("1downarrow", KIcon::Toolbar));
+ clearButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("locationbar_erase", KIcon::Toolbar));
+ copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", KIcon::Toolbar));
groupComboBox->insertStringList(SpecialInformation::groups());
connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int)));
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 8769f54d..43aea773 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -449,16 +449,16 @@ void MainWindow::runForm()
KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
}
::chmod(m_fileName.local8Bit(), S_IRWXU);
- KProcess* process = new KProcess;
+ TDEProcess* process = new TDEProcess;
process->setUseShell(true);
(*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName());
- connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog,
- TQT_SLOT(receivedStdout(KProcess*, char*, int)));
- connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog,
- TQT_SLOT(receivedStderr(KProcess*, char*, int)));
- connect(process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(closeRunningForm(KProcess*)));
+ connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog,
+ TQT_SLOT(receivedStdout(TDEProcess*, char*, int)));
+ connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog,
+ TQT_SLOT(receivedStderr(TDEProcess*, char*, int)));
+ connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*)));
messageLog->clear(MessageLog::All);
- previewing = process->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+ previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
}
@@ -513,21 +513,21 @@ void MainWindow::runForm4()
KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
}
::chmod(m_fileName.local8Bit(), S_IRWXU);
- KProcess* process = new KProcess;
+ TDEProcess* process = new TDEProcess;
process->setUseShell(true);
(*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName());
- connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog,
- TQT_SLOT(receivedStdout(KProcess*, char*, int)));
- connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog,
- TQT_SLOT(receivedStderr(KProcess*, char*, int)));
- connect(process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(closeRunningForm(KProcess*)));
+ connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog,
+ TQT_SLOT(receivedStdout(TDEProcess*, char*, int)));
+ connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog,
+ TQT_SLOT(receivedStderr(TDEProcess*, char*, int)));
+ connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*)));
messageLog->clear(MessageLog::All);
- previewing = process->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+ previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
}
-void MainWindow::closeRunningForm(KProcess* process)
+void MainWindow::closeRunningForm(TDEProcess* process)
{
previewing = false;
delete process;
diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index aa4ea018..17d04063 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -38,7 +38,7 @@ class GotoLineDialog;
class HierarchyView;
class KAction;
class KActionCollection;
-class KProcess;
+class TDEProcess;
class KRecentFilesAction;
class KToggleAction;
class KToolBar;
@@ -187,8 +187,8 @@ public slots:
void editShortcuts();
void editPlugins();
void editExternalTool(int id);
- void editToolExited(KProcess*);
- void editToolOutput(KProcess*, char*, int);
+ void editToolExited(TDEProcess*);
+ void editToolOutput(TDEProcess*, char*, int);
void configureEditor();
void runForm();
@@ -208,7 +208,7 @@ private slots:
void setupWindowActions();
void createNewTemplate();
- void closeRunningForm(KProcess* process);
+ void closeRunningForm(TDEProcess* process);
void slotCreateBackups();
private:
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index c44b4910..8be705a8 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -379,7 +379,7 @@ void MainWindow::setupToolActions()
// add external Kommander dialogs for Editor
m_editorTools.clear();
TQPopupMenu* editMenu = new TQPopupMenu(this);
- TQStringList searchPaths = KGlobal::dirs()->findDirs("data", "kmdr-editor/editor");
+ TQStringList searchPaths = TDEGlobal::dirs()->findDirs("data", "kmdr-editor/editor");
for (TQStringList::ConstIterator it = searchPaths.begin(); it != searchPaths.end(); ++it)
{
if (!TQFile::exists(*it))
@@ -1159,9 +1159,9 @@ void MainWindow::editShortcuts()
void MainWindow::editPlugins()
{
- KProcess process;
+ TDEProcess process;
process << "kmdr-plugins";
- process.start(KProcess::Block);
+ process.start(TDEProcess::Block);
}
void MainWindow::configureEditor()
@@ -1175,20 +1175,20 @@ void MainWindow::configureEditor()
void MainWindow::editExternalTool(int id)
{
- KProcess* process = new KProcess;
+ TDEProcess* process = new TDEProcess;
(*process) << "kmdr-executor" << m_editorTools[id];
- connect(process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(editToolExited(KProcess*)));
- connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), TQT_SLOT(editToolOutput(KProcess*, char*, int)));
+ connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editToolExited(TDEProcess*)));
+ connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(editToolOutput(TDEProcess*, char*, int)));
m_toolOutput = '\0';
- process->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
}
-void MainWindow::editToolExited(KProcess* process)
+void MainWindow::editToolExited(TDEProcess* process)
{
delete process;
}
-void MainWindow::editToolOutput(KProcess*, char* buffer, int buflen)
+void MainWindow::editToolOutput(TDEProcess*, char* buffer, int buflen)
{
m_toolOutput += TQString::fromLocal8Bit(buffer, buflen);
}
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index be309d2e..16947a77 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -90,12 +90,12 @@ void MessageLog::clear(InfoType i)
clear((InfoType)i);
}
-void MessageLog::receivedStdout(KProcess*, char* buffer, int buflen)
+void MessageLog::receivedStdout(TDEProcess*, char* buffer, int buflen)
{
insertItem(Stdout, TQString::fromLocal8Bit(buffer, buflen));
}
-void MessageLog::receivedStderr(KProcess*, char* buffer, int buflen)
+void MessageLog::receivedStderr(TDEProcess*, char* buffer, int buflen)
{
insertItem(Stderr, TQString::fromLocal8Bit(buffer, buflen));
}
diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h
index b1108de1..e9848bd1 100644
--- a/kommander/editor/messagelog.h
+++ b/kommander/editor/messagelog.h
@@ -22,7 +22,7 @@
#include <klocale.h>
class KListBox;
-class KProcess;
+class TDEProcess;
class KPopupMenu;
class TQListBoxItem;
@@ -38,8 +38,8 @@ public:
virtual void clear(InfoType i = All);
TQString content();
public slots:
- void receivedStdout(KProcess *proc, char *buffer, int buflen);
- void receivedStderr(KProcess *proc, char *buffer, int buflen);
+ void receivedStdout(TDEProcess *proc, char *buffer, int buflen);
+ void receivedStderr(TDEProcess *proc, char *buffer, int buflen);
void clearContent();
void copyLine();
void copyContent();
diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index abf2c2f7..810bdf62 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -154,7 +154,7 @@ NewForm::NewForm(TQWidget *parent, const TQString &templatePath)
fi->setDragEnabled(false);
- TQStringList searchPaths = KGlobal::dirs()->findDirs("data", "kmdr-editor/templates");
+ TQStringList searchPaths = TDEGlobal::dirs()->findDirs("data", "kmdr-editor/templates");
if (!templatePath.isEmpty())
searchPaths.append(templatePath);
diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index a036aeaf..47032e99 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -199,8 +199,8 @@ bool Instance::isFileValid(const KURL& fname) const
}
// Check whether file is not in some temporary directory.
- TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp");
- tmpDirs += KGlobal::dirs()->resourceDirs("cache");
+ TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs("tmp");
+ tmpDirs += TDEGlobal::dirs()->resourceDirs("cache");
tmpDirs.append("/tmp/");
tmpDirs.append("/var/tmp/");
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index c291fe9c..1aa27412 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -1481,9 +1481,9 @@ void KommanderFactory::loadImages( const TQString &dir )
TQString KommanderFactory::translate( const TQString& sourceText, const TQString& comment )
{
if (!sourceText.isEmpty() && !comment.isEmpty())
- return KGlobal::locale()->translate(comment.utf8(), sourceText.utf8());
+ return TDEGlobal::locale()->translate(comment.utf8(), sourceText.utf8());
else if (!sourceText.isEmpty())
- return KGlobal::locale()->translate(sourceText.utf8());
+ return TDEGlobal::locale()->translate(sourceText.utf8());
else
return sourceText;
}
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 94d365f5..8c1eb55b 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -67,7 +67,7 @@ void MainWindow::toolButton( int id )
void MainWindow::add()
{
- TQString libDir = KGlobal::dirs()->findResourceDir("lib", "libkommanderplugin");
+ TQString libDir = TDEGlobal::dirs()->findResourceDir("lib", "libkommanderplugin");
TQString plugin = KFileDialog::getOpenFileName(libDir, "lib*", this,
i18n("Add Kommander Plugin"));
add(plugin);
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 0b64b8ba..d4151015 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -510,7 +510,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params)
static ParseNode f_i18n(Parser*, const ParameterList& params)
{
- return KGlobal::locale()->translate(params[0].toString());
+ return TDEGlobal::locale()->translate(params[0].toString());
}
static ParseNode f_env(Parser*, const ParameterList& params)
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 613eec68..9470108a 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -57,7 +57,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
case Kommander::env:
return TQString(getenv(args[0].latin1()));
case Kommander::i18n:
- return KGlobal::locale()->translate(args[0]);
+ return TDEGlobal::locale()->translate(args[0]);
case Kommander::global:
return global(args[0]);
case Kommander::setGlobal:
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index ac4f348d..bc5fbdc8 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -82,14 +82,14 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
}
m_input = at.local8Bit();
- mProcess = new KProcess;
+ mProcess = new TDEProcess;
(*mProcess) << shellName.latin1();
- connect(mProcess, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
- connect(mProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
+ connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+ connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
- if(!mProcess->start(KProcess::NotifyOnExit, KProcess::All))
+ if(!mProcess->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
m_atw->printError(i18n("<qt>Failed to start shell process<br><b>%1</b></qt>").arg(shellName));
return TQString();
@@ -115,13 +115,13 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
}
}
-void MyProcess::slotReceivedStdout(KProcess*, char* a_buffer, int a_len)
+void MyProcess::slotReceivedStdout(TDEProcess*, char* a_buffer, int a_len)
{
m_output += TQString::fromLocal8Bit(a_buffer, a_len);
emit processReceivedStdout(this, a_buffer, a_len);
}
-void MyProcess::slotProcessExited(KProcess* process)
+void MyProcess::slotProcessExited(TDEProcess* process)
{
if (m_loopStarted)
{
diff --git a/kommander/widget/myprocess.h b/kommander/widget/myprocess.h
index cb9c80b5..039db894 100644
--- a/kommander/widget/myprocess.h
+++ b/kommander/widget/myprocess.h
@@ -44,8 +44,8 @@ signals:
void processExited(MyProcess*);
void processReceivedStdout(MyProcess*, char*, int);
private slots:
- void slotReceivedStdout(KProcess*, char*, int);
- void slotProcessExited(KProcess*);
+ void slotReceivedStdout(TDEProcess*, char*, int);
+ void slotProcessExited(TDEProcess*);
protected:
const KommanderWidget *m_atw;
TQString m_output;
@@ -53,7 +53,7 @@ protected:
bool m_loopStarted;
bool m_blocking;
bool m_handleOutput;
- KProcess* mProcess;
+ TDEProcess* mProcess;
};
#endif
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 4560f871..1180f652 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -45,7 +45,7 @@ AboutDialog::AboutDialog(TQWidget *parent, const char *name)
setDisplayStates(states);
if (KommanderWidget::inEditor)
{
- setPixmap(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
setFixedSize(pixmap()->size());
@@ -122,7 +122,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
m_aboutData->setCopyrightStatement(m_copyright);
if (!m_icon.isEmpty())
- m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());
+ m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());
}
void AboutDialog::addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress)
diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp
index 9ecbbaf6..4ad1c3c3 100644
--- a/kommander/widgets/closebutton.cpp
+++ b/kommander/widgets/closebutton.cpp
@@ -105,13 +105,13 @@ void CloseButton::startProcess()
KShellProcess *process = new KShellProcess("/bin/sh");
*process << at;
- connect(process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(endProcess(KProcess *)));
- connect(process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(appendOutput(KProcess *,
+ connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(endProcess(TDEProcess *)));
+ connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *,
char *, int)));
- connect(process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(appendOutput(KProcess *,
+ connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *,
char *, int)));
- if (!process->start(KProcess::Block, KProcess::Stdout))
+ if (!process->start(TDEProcess::Block, TDEProcess::Stdout))
{
KMessageBox::error(this, i18n("Failed to start shell process."));
endProcess(process);
@@ -121,7 +121,7 @@ void CloseButton::startProcess()
endProcess(0);
}
-void CloseButton::appendOutput(KProcess *, char *a_buffer, int a_len)
+void CloseButton::appendOutput(TDEProcess *, char *a_buffer, int a_len)
{
char *buffer = new char[a_len + 1];
buffer[a_len] = 0;
@@ -138,7 +138,7 @@ void CloseButton::appendOutput(KProcess *, char *a_buffer, int a_len)
delete[] buffer;
}
-void CloseButton::endProcess(KProcess *a_process)
+void CloseButton::endProcess(TDEProcess *a_process)
{
emit widgetTextChanged(m_output);
m_output = "";
diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h
index d1b2535d..6bd608cc 100644
--- a/kommander/widgets/closebutton.h
+++ b/kommander/widgets/closebutton.h
@@ -57,8 +57,8 @@ public slots:
virtual void setWriteStdout(bool);
virtual void setWidgetText(const TQString &);
virtual void startProcess();
- virtual void appendOutput(KProcess*, char*, int);
- virtual void endProcess(KProcess*);
+ virtual void appendOutput(TDEProcess*, char*, int);
+ virtual void endProcess(TDEProcess*);
virtual void populate();
signals:
void widgetOpened();
diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h
index d2774330..ad06fd59 100644
--- a/kommander/widgets/execbutton.h
+++ b/kommander/widgets/execbutton.h
@@ -29,7 +29,7 @@
#include <kommander_export.h>
class TQWidget;
-class KProcess;
+class TDEProcess;
class MyProcess;
class TQShowEvent;
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 26f885d0..fefd8d85 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name)
setDisplayStates(states);
if (KommanderWidget::inEditor)
{
- setPixmap(KGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 5f9fdf02..bf6f8b4a 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -177,7 +177,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
}
case DCOP::setPixmap:
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
if (pixmap.isNull())
pixmap.load(args[0]);
int index = args[1].toInt();
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index 4ccf921b..f49a35ae 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -38,7 +38,7 @@ PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name)
setStates(states);
setDisplayStates(states);
if (KommanderWidget::inEditor)
- setPixmap(KGlobal::iconLoader()->loadIcon("tux", KIcon::NoGroup, 128));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", KIcon::NoGroup, 128));
setAutoResize(false);
}
diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp
index 97882f9c..aef6821e 100644
--- a/kommander/widgets/plugin.cpp
+++ b/kommander/widgets/plugin.cpp
@@ -80,7 +80,7 @@ KomStdPlugin::KomStdPlugin()
addWidget("SpinBoxInt", group, "", 0);
// addWidget("Wizard", group, "");
addWidget("TabWidget", group, "", 0);
- addWidget("ToolBox", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true);
+ addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true);
// addWidget("SubDialog", group, "");
addWidget("ListBox", group, "", 0);
addWidget("Timer", group, "", 0);
@@ -92,9 +92,9 @@ KomStdPlugin::KomStdPlugin()
addWidget("Slider", group, "", 0);
addWidget("Table", group, "", 0);
addWidget("DatePicker", group, "", 0);
- addWidget("PopupMenu", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)));
- addWidget("FontDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
- addWidget("AboutDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
+ addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)));
+ addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
+ addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
}
TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name )
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 65bbdc7a..dfa7b325 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -41,7 +41,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name)
setDisplayStates(states);
if (KommanderWidget::inEditor)
{
- setPixmap(KGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
setFixedSize(pixmap()->size());
@@ -130,7 +130,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid
if (icon.isEmpty())
return TQString::number(m_menu->insertItem(title, dynamic_cast<PopupMenu*>(w)->menu(), index));
else
- return TQString::number( m_menu->insertItem(KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index));
+ return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index));
}
return TQString();
}
@@ -159,7 +159,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
if (args[3].isEmpty())
id = m_menu->insertItem(args[0], index);
else
- id = m_menu->insertItem(KGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index);
+ id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index);
m_associations[id] = args[1];
return TQString::number(id);
break;
@@ -175,7 +175,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
if (args[3].isEmpty())
m_menu->changeItem(id, args[1]);
else
- m_menu->changeItem(id, KGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[1]);
+ m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[1]);
m_associations[id] = args[2];
break;
}
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index ddc7d32a..28f7ad5c 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -38,7 +38,7 @@ ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name)
setDisplayStates(states);
if (KommanderWidget::inEditor)
{
- setPixmap(KGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp
index 1574ba9e..04f3cb41 100644
--- a/kommander/widgets/tabwidget.cpp
+++ b/kommander/widgets/tabwidget.cpp
@@ -137,7 +137,7 @@ TQString TabWidget::handleDCOP(int function, const TQStringList& args)
case TAB_setTabIcon:
{
TQWidget *w = page(args[0].toInt());
- setTabIconSet(w, KGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium));
+ setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium));
break;
}
case TAB_isTabEnabled:
diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp
index 01a7991c..c11e6c4a 100644
--- a/kommander/widgets/timer.cpp
+++ b/kommander/widgets/timer.cpp
@@ -46,7 +46,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name)
setDisplayStates(states);
if (KommanderWidget::inEditor)
{
- setPixmap(KGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 914d6b7c..8a1aabf6 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -431,7 +431,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
}
case DCOP::setPixmap:
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
if (args[1].toInt() == -1)
for (TQListViewItemIterator it(this); it.current(); ++it)
it.current()->setPixmap(0, pixmap);
diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp
index b5fabc20..797ed009 100644
--- a/kommander/widgets/wizard.cpp
+++ b/kommander/widgets/wizard.cpp
@@ -130,9 +130,9 @@ void Wizard::runHelp()
{
if (helpAction() == Command)
{
- KProcess proc;
+ TDEProcess proc;
proc << helpActionText();
- proc.start(KProcess::DontCare, KProcess::NoCommunication);
+ proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
}
else if (helpAction() == Dialog)
{
diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp
index b6e1a0a0..ffaa8080 100644
--- a/kommander/working/plugintemplate/plugin.cpp
+++ b/kommander/working/plugintemplate/plugin.cpp
@@ -16,7 +16,7 @@ public:
%{APPNAME}Plugin::%{APPNAME}Plugin()
{
- addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) );
+ addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) );
}
TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name)
diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp
index fd2c313f..e950205e 100644
--- a/kommander/working/plugintemplate/widget.cpp
+++ b/kommander/working/plugintemplate/widget.cpp
@@ -28,7 +28,7 @@ enum Functions {
/*
if (KommanderWidget::inEditor)
{
- setPixmap(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
setAlignment(TQt::AlignCenter);