diff options
Diffstat (limited to 'kommander/editor')
-rw-r--r-- | kommander/editor/assoctexteditorimpl.cpp | 4 | ||||
-rw-r--r-- | kommander/editor/functionsimpl.cpp | 4 | ||||
-rw-r--r-- | kommander/editor/mainwindow.cpp | 30 | ||||
-rw-r--r-- | kommander/editor/mainwindow.h | 8 | ||||
-rw-r--r-- | kommander/editor/mainwindowactions.cpp | 18 | ||||
-rw-r--r-- | kommander/editor/messagelog.cpp | 4 | ||||
-rw-r--r-- | kommander/editor/messagelog.h | 6 | ||||
-rw-r--r-- | kommander/editor/newformimpl.cpp | 2 |
8 files changed, 38 insertions, 38 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); |