diff options
99 files changed, 334 insertions, 334 deletions
diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook index 2aa9a1e3..d909338e 100644 --- a/doc/kommander/extending.docbook +++ b/doc/kommander/extending.docbook @@ -213,7 +213,7 @@ derive from QLabel, and use this in the constructor: <screen> if (KommanderWidget::inEditor) { - setPixmap(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); setFrameStyle(QFrame::Box | QFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); @@ -297,7 +297,7 @@ This class simply has a constructor and an overridden create method. <screen> MyKomPlugin::MyKomPlugin() { - addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); //add my other widgets here } </screen> @@ -427,7 +427,7 @@ To register to the executor (actually to the plugin system), add this to KomStdPlugin::KomStdPlugin() { ... - addWidget("MyWidgetName", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); ... } </screen> diff --git a/kfilereplace/commandengine.cpp b/kfilereplace/commandengine.cpp index af3cd2f2..5184773c 100644 --- a/kfilereplace/commandengine.cpp +++ b/kfilereplace/commandengine.cpp @@ -98,18 +98,18 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg) TQString program = "var=("+tempOpt+");print var"; TQString script = "echo '"+program+"' | bc -l;"; - KProcess* proc = new KProcess(); + TDEProcess* proc = new TDEProcess(); proc->setUseShell(true); *(proc) << script; - 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*))); - //Through slotGetScriptOutput, m_processOutput contains the result of the KProcess call - if(!proc->start(KProcess::Block, KProcess::All)) + //Through slotGetScriptOutput, m_processOutput contains the result of the TDEProcess call + if(!proc->start(TDEProcess::Block, TDEProcess::All)) { return TQString(); } @@ -187,7 +187,7 @@ TQString CommandEngine::variableValue(const TQString &variable) } //SLOTS -void CommandEngine::slotGetScriptError(KProcess* proc, char* s, int i) +void CommandEngine::slotGetScriptError(TDEProcess* proc, char* s, int i) { Q_UNUSED(proc); Q_UNUSED(proc); @@ -195,7 +195,7 @@ void CommandEngine::slotGetScriptError(KProcess* proc, char* s, int i) if(temp.isEmpty() || temp == "\n") return; } -void CommandEngine::slotGetScriptOutput(KProcess* proc, char* s, int i) +void CommandEngine::slotGetScriptOutput(TDEProcess* proc, char* s, int i) { Q_UNUSED(proc); TQCString temp(s,i+1); @@ -205,7 +205,7 @@ void CommandEngine::slotGetScriptOutput(KProcess* proc, char* s, int i) m_processOutput += TQString::fromLocal8Bit(temp); } -void CommandEngine::slotProcessExited(KProcess* proc) +void CommandEngine::slotProcessExited(TDEProcess* proc) { Q_UNUSED(proc); } diff --git a/kfilereplace/commandengine.h b/kfilereplace/commandengine.h index 702edeee..36bcfcb8 100644 --- a/kfilereplace/commandengine.h +++ b/kfilereplace/commandengine.h @@ -24,7 +24,7 @@ class TQString; #include <tqobject.h> //KDE -class KProcess; +class TDEProcess; class CommandEngine : public TQObject { @@ -50,9 +50,9 @@ class CommandEngine : public TQObject TQString variableValue(const TQString &variable); private slots: - void slotGetScriptOutput(KProcess*,char*,int); - void slotGetScriptError(KProcess*,char*,int); - void slotProcessExited(KProcess*); + void slotGetScriptOutput(TDEProcess*,char*,int); + void slotGetScriptError(TDEProcess*,char*,int); + void slotProcessExited(TDEProcess*); }; #endif // COMMANDENGINE_H diff --git a/kfilereplace/kfilereplace.cpp b/kfilereplace/kfilereplace.cpp index 35428a7b..a0976658 100644 --- a/kfilereplace/kfilereplace.cpp +++ b/kfilereplace/kfilereplace.cpp @@ -76,7 +76,7 @@ void KFileReplace::slotConfigureKeys() void KFileReplace::slotConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(applyNewToolbarConfig())); @@ -85,7 +85,7 @@ void KFileReplace::slotConfigureToolbars() void KFileReplace::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index d52f0061..8d24a84c 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY( libkfilereplacepart, FileReplaceFactory ) KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* parent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(parent,name) { setInstance(FileReplaceFactory::instance()); - KGlobal::locale()->insertCatalogue("kfilereplace"); + TDEGlobal::locale()->insertCatalogue("kfilereplace"); m_parentWidget = parentWidget; m_config = new KConfig("kfilereplacerc"); m_aboutDlg = 0; diff --git a/kfilereplace/knewprojectdlg.cpp b/kfilereplace/knewprojectdlg.cpp index 21e986ad..b610990e 100644 --- a/kfilereplace/knewprojectdlg.cpp +++ b/kfilereplace/knewprojectdlg.cpp @@ -224,7 +224,7 @@ void KNewProjectDlg::initGUI() void KNewProjectDlg::loadOptions() { - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); m_cbEncoding->insertStringList(availableEncodingNames); int idx = -1; int utf8Idx = -1; diff --git a/kfilereplace/koptionsdlg.cpp b/kfilereplace/koptionsdlg.cpp index 35f0a3da..20d80e47 100644 --- a/kfilereplace/koptionsdlg.cpp +++ b/kfilereplace/koptionsdlg.cpp @@ -153,7 +153,7 @@ void KOptionsDlg::initGUI() m_chbShowConfirmDialog->setChecked(true); } - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); m_cbEncoding->insertStringList( availableEncodingNames ); int idx = -1; int utf8Idx = -1; diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index d6fdc2d1..f1648f97 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -141,16 +141,16 @@ DrawZone::DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor) CircleCursor = TQCursor(b,b2,8,8); - TQString path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/polygoncursor.png" ) + "kimagemapeditor/polygoncursor.png"; + TQString path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/polygoncursor.png" ) + "kimagemapeditor/polygoncursor.png"; PolygonCursor = TQCursor(TQPixmap(path),8,8); - path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/freehandcursor.png" ) + "kimagemapeditor/freehandcursor.png"; + path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/freehandcursor.png" ) + "kimagemapeditor/freehandcursor.png"; FreehandCursor = TQCursor(TQPixmap(path),8,8); - path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/addpointcursor.png" ) + "kimagemapeditor/addpointcursor.png"; + path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/addpointcursor.png" ) + "kimagemapeditor/addpointcursor.png"; AddPointCursor = TQCursor(TQPixmap(path),8,8); - path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/removepointcursor.png" ) + "kimagemapeditor/removepointcursor.png"; + path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/removepointcursor.png" ) + "kimagemapeditor/removepointcursor.png"; RemovePointCursor = TQCursor(TQPixmap(path),8,8); } diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 7aa45ddb..1e31596d 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -159,7 +159,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, // Shows the text: // "Drop an image or html file" -/* TQString path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/dropimage.png" ) + "kimagemapeditor/dropimage.png"; +/* TQString path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/dropimage.png" ) + "kimagemapeditor/dropimage.png"; if ( ! TQFileInfo(path).exists() ) { kdError() << "Couldn't find needed dropimage.png file in " "the data directory of KImageMapEditor.\n" @@ -843,8 +843,8 @@ TQImage KImageMapEditor::getBackgroundImage() { if ( _backgroundImage.isNull() ) { -// TQString filename = TQString("dropimage_")+KGlobal::locale()->language()+".png"; -// TQString path = TQString(); //KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/"+filename ) + "kimagemapeditor/"+filename; +// TQString filename = TQString("dropimage_")+TDEGlobal::locale()->language()+".png"; +// TQString path = TQString(); //TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/"+filename ) + "kimagemapeditor/"+filename; // kdDebug() << "getBackgroundPic : loaded image : " << path << endl; // if ( ! TQFileInfo(path).exists() ) { @@ -928,7 +928,7 @@ TQImage KImageMapEditor::getBackgroundImage() { } - path = KGlobal::dirs()->saveLocation( "data", "kimagemapeditor/" ) +filename; + path = TDEGlobal::dirs()->saveLocation( "data", "kimagemapeditor/" ) +filename; kdDebug() << "getBackgroundPic : save new image to : " << path << endl; pix.save(path,"PNG",100); } diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 7005fe00..1cc8a867 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -248,12 +248,12 @@ void KimeShell::optionsConfigureToolbars() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); # endif #else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); #endif // use the standard toolbar editor @@ -267,12 +267,12 @@ void KimeShell::applyNewToolbarConfig() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 3d25bc61..5ef6d8d0 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -306,8 +306,8 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis KURL url = static_cast<KIO::ListJob *>(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = udsList.begin(); KIO::UDSEntryListConstIterator end = udsList.end(); diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index f572aacb..66dbf30f 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -144,20 +144,20 @@ void Global::openQuanta(TQStringList const& args) void Global::execCommand(TQString const& command) { - //We create a KProcess that executes the "ps" *nix command to get the PIDs of the + //We create a TDEProcess that executes the "ps" *nix command to get the PIDs of the //other instances of quanta actually running - self()->process_PS_ = new KProcess(); + self()->process_PS_ = new TDEProcess(); *(self()->process_PS_) << TQStringList::split(" ",command); - connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptError(KProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(processExited(KProcess*)), - self(), TQT_SLOT(slotProcessExited(KProcess*))); + connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + self(), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + self(), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQT_SIGNAL(processExited(TDEProcess*)), + self(), TQT_SLOT(slotProcessExited(TDEProcess*))); - //if KProcess fails I think a message box is needed... I will fix it - if (!self()->process_PS_->start(KProcess::NotifyOnExit,KProcess::All)) + //if TDEProcess fails I think a message box is needed... I will fix it + if (!self()->process_PS_->start(TDEProcess::NotifyOnExit,TDEProcess::All)) kdError() << "Failed to query for running KLinkStatus instances!" << endl; //TODO: Replace the above error with a real messagebox after the message freeze is over else @@ -173,21 +173,21 @@ void Global::execCommand(TQString const& command) } } -void Global::slotGetScriptOutput(KProcess* /*process*/, char* buf, int buflen) +void Global::slotGetScriptOutput(TDEProcess* /*process*/, char* buf, int buflen) { TQCString tmp( buf, buflen + 1 ); script_output_ = TQString(); script_output_ = TQString::fromLocal8Bit(tmp).remove(" "); } -void Global::slotGetScriptError(KProcess*, char* buf, int buflen) +void Global::slotGetScriptError(TDEProcess*, char* buf, int buflen) { //TODO: Implement some error handling? Q_UNUSED(buf); Q_UNUSED(buflen); } -void Global::slotProcessExited(KProcess*) +void Global::slotProcessExited(TDEProcess*) { slotProcessTimeout(); } diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h index a77bcf30..77ed23eb 100644 --- a/klinkstatus/src/global.h +++ b/klinkstatus/src/global.h @@ -17,7 +17,7 @@ class TQCString; class DCOPClient; class KURL; -class KProcess; +class TDEProcess; /** @author Paulo Moura Guedes @@ -44,9 +44,9 @@ private: static void execCommand(TQString const& command); private slots: - void slotGetScriptOutput(KProcess* process, char* buffer, int buflen); - void slotGetScriptError(KProcess* process, char* buffer, int buflen); - void slotProcessExited(KProcess* process); + void slotGetScriptOutput(TDEProcess* process, char* buffer, int buflen); + void slotGetScriptError(TDEProcess* process, char* buffer, int buflen); + void slotProcessExited(TDEProcess* process); void slotProcessTimeout(); private: @@ -55,7 +55,7 @@ private: DCOPClient* dcop_client_; bool loop_started_; TQString script_output_; - KProcess* process_PS_; + TDEProcess* process_PS_; }; #endif diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index ec6c9c37..42d65a66 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -195,7 +195,7 @@ void KLinkStatus::optionsConfigureKeys() void KLinkStatus::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -206,7 +206,7 @@ void KLinkStatus::optionsConfigureToolbars() void KLinkStatus::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index bc890f8c..b152fc0a 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -199,7 +199,7 @@ TDEAboutData* KLinkStatusPart::createAboutData() about->addCredit("Mathieu Kooiman", 0, " quanta@map-is.nl"); about->addCredit("Jens Herden", 0, "jens@tdewebdev.org"); - KGlobal::dirs()->addResourceType("appicon", KStandardDirs::kde_default("data") + "klinkstatuspart/pics/"); + TDEGlobal::dirs()->addResourceType("appicon", KStandardDirs::kde_default("data") + "klinkstatuspart/pics/"); return about; } diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index 1267671d..c29ae53d 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -71,7 +71,7 @@ void KLSHistoryCombo::loadItems() completionObject()->setItems(items); - setCompletionMode(KGlobalSettings::completionMode()); + setCompletionMode(TDEGlobalSettings::completionMode()); } bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev ) diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 1841a5c6..eed8df79 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -84,11 +84,11 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) d->layout->addWidget(statusLabel); d->searchCombo = new KComboBox(this, "searchcombo"); - TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); - TQPixmap iconGood = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - TQPixmap iconBroken = KGlobal::iconLoader()->loadIcon("no", KIcon::Small); - TQPixmap iconMalformed = KGlobal::iconLoader()->loadIcon("bug", KIcon::Small); - TQPixmap iconUndetermined = KGlobal::iconLoader()->loadIcon("help", KIcon::Small); + TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small); + TQPixmap iconGood = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + TQPixmap iconBroken = TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small); + TQPixmap iconMalformed = TDEGlobal::iconLoader()->loadIcon("bug", KIcon::Small); + TQPixmap iconUndetermined = TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small); d->searchCombo->insertItem(iconAll, i18n("All Links")); d->searchCombo->insertItem(iconGood, i18n("Good Links")); diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 43a80aa6..7c611bc0 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -104,8 +104,8 @@ void SessionWidget::init() toolButton_clear_combo->setIconSet(SmallIconSet("locationbar_erase")); - pushbutton_url->setIconSet(KGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small)); - TQPixmap pixMap = KGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small); + pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small)); + TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small); pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8); connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog())); 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); diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index deeea465..a9aa23f0 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -143,7 +143,7 @@ void KXsldbg::optionsConfigureKeys() void KXsldbg::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), "MainWindow"); + saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -154,7 +154,7 @@ void KXsldbg::optionsConfigureToolbars() void KXsldbg::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), "MainWindow"); + applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index 492aba6a..525c3728 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -95,7 +95,7 @@ static TQString langLookupDir( const TQString &fname ) TQStringList search; // assemble the local search paths - TQStringList localDoc = KGlobal::dirs()->resourceDirs("html"); + TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html"); // also look in each of the TDEDIR paths TQString kdeDirs = getenv("TDEDIRS"); TQStringList kdeDirsList = TQStringList::split(":", kdeDirs); @@ -107,7 +107,7 @@ static TQString langLookupDir( const TQString &fname ) // look up the different languages for (uint id=0; id < localDoc.count(); id++) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( "C" ); TQStringList::ConstIterator lang; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 312fdb4e..d333c737 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -540,8 +540,8 @@ xsldbgMain(int argc, char **argv) if (args){ TQString langChoice = args->getOption("lang"); - if (KGlobal::locale() && !langChoice.isEmpty() && result) - KGlobal::locale()->setLanguage(langChoice); + if (TDEGlobal::locale() && !langChoice.isEmpty() && result) + TDEGlobal::locale()->setLanguage(langChoice); } #ifdef __riscos diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 00ba06c7..92fc9ba3 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -1616,7 +1616,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) d->mainDockWidget=0; #ifndef NO_KDE2 - d->splitterOpaqueResize = KGlobalSettings::opaqueResize(); + d->splitterOpaqueResize = TDEGlobalSettings::opaqueResize(); #else d->splitterOpaqueResize = false; #endif @@ -2477,7 +2477,7 @@ void KDockManager::setReadDockConfigMode(int mode) void KDockManager::writeConfig( KConfig* c, TQString group ) { //debug("BEGIN Write Config"); - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); @@ -2618,7 +2618,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) #include <tqmessagebox.h> void KDockManager::readConfig( KConfig* c, TQString group ) { - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index c4b4b97b..d0cb5681 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -1030,7 +1030,7 @@ public: KDockWidget* getDockWidgetFromName( const TQString& dockName ); /** - * Enables opaque resizing. Opaque resizing defaults to KGlobalSettings::opaqueResize(). + * Enables opaque resizing. Opaque resizing defaults to TDEGlobalSettings::opaqueResize(). * Call this method before you create any dock widgets! */ void setSplitterOpaqueResize(bool b=true); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp index 3d87eace..1ba89270 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp @@ -52,10 +52,10 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent ) m_captionFont = TQFont(); TQFontMetrics fm( m_captionFont ); m_captionFontLineSpacing = fm.lineSpacing(); - m_captionActiveBackColor = KGlobalSettings::activeTitleColor(); - m_captionActiveForeColor = KGlobalSettings::activeTextColor(); - m_captionInactiveBackColor = KGlobalSettings::inactiveTitleColor(); - m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor(); + m_captionActiveBackColor = TDEGlobalSettings::activeTitleColor(); + m_captionActiveForeColor = TDEGlobalSettings::activeTextColor(); + m_captionInactiveBackColor = TDEGlobalSettings::inactiveTitleColor(); + m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor(); m_pZ = new TQPtrList<KMdiChildFrm>; m_pZ->setAutoDelete( true ); setFocusPolicy( TQ_ClickFocus ); @@ -784,10 +784,10 @@ void KMdiChildArea::setMdiCaptionInactiveBackColor( const TQColor& clr ) void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeBG, TQColor& activeFG, TQColor& inactiveBG, TQColor& inactiveFG ) { - activeBG = KGlobalSettings::activeTitleColor(); - activeFG = KGlobalSettings::activeTextColor(); - inactiveBG = KGlobalSettings::inactiveTitleColor(); - inactiveFG = KGlobalSettings::inactiveTextColor(); + activeBG = TDEGlobalSettings::activeTitleColor(); + activeFG = TDEGlobalSettings::activeTextColor(); + inactiveBG = TDEGlobalSettings::inactiveTitleColor(); + inactiveFG = TDEGlobalSettings::inactiveTextColor(); } // kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h index 035cdccc..09624887 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h @@ -191,8 +191,8 @@ public: * This method is useful not only for KMDI child windows. * Colors are returned via activeBG, activeFG, inactiveBG, inactiveFG references. * - * @deprecated Use KGlobalSettings::activeTitleColor(), KGlobalSettings::activeTextColor(), - * KGlobalSettings::inactiveTitleColor() and KGlobalSettings::inactiveTextColor() instead. + * @deprecated Use TDEGlobalSettings::activeTitleColor(), TDEGlobalSettings::activeTextColor(), + * TDEGlobalSettings::inactiveTitleColor() and TDEGlobalSettings::inactiveTextColor() instead. */ static void getCaptionColors( const TQPalette &pal, TQColor &activeBG, TQColor &activeFG, TQColor &inactiveBG, TQColor &inactiveFG ) KDE_DEPRECATED; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index 23190dec..4fde9799 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp @@ -298,7 +298,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) if ( m_movingState == WaitingForMoveStart ) { TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() ); - if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) + if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) ); m_dockManager->eventFilter( m_dragPanel, event ); diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp index 471ca4f0..a3fa51c8 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp @@ -123,7 +123,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mDragSwitchTab = 0; } - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -136,7 +136,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } else if ( e->state() == Qt::MidButton ) { if (mReorderStartTab==-1) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -190,7 +190,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp index 216ca3f6..39b7678e 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp @@ -41,9 +41,9 @@ public: KTabWidgetPrivate() { m_automaticResizeTabs = false; - KConfigGroupSaver groupsaver(KGlobal::config(), "General"); - m_maxLength = KGlobal::config()->readNumEntry("MaximumTabLength", 30); - m_minLength = KGlobal::config()->readNumEntry("MinimumTabLength", 3); + KConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); + m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30); + m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3); m_CurrentMaxLength = m_minLength; } }; diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index f1942f7f..d2516134 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -197,7 +197,7 @@ void DownloadDialog::addProvider(Provider *p) if(!p->icon().isValid()) ret = false; else ret = KIO::NetAccess::download(p->icon(), tmp, this); if(ret) pix = TQPixmap(tmp); - else pix = KGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); + else pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); frame = addPage(p->name(), p->name(), pix); m_frame = frame; @@ -359,8 +359,8 @@ void DownloadDialog::addEntry(Entry *entry) }*/ installed = installStatus(entry); - if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small); + if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small); else pix = TQPixmap(); KListViewItem *tmp_r = new KListViewItem(lv_r, @@ -368,7 +368,7 @@ void DownloadDialog::addEntry(Entry *entry) KListViewItem *tmp_d = new NumSortListViewItem(lv_d, entry->name(), entry->version(), TQString("%1").arg(entry->downloads())); KListViewItem *tmp_l = new KListViewItem(lv_l, - entry->name(), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); + entry->name(), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate())); tmp_r->setPixmap(0, pix); tmp_d->setPixmap(0, pix); @@ -390,7 +390,7 @@ void DownloadDialog::slotDetails() Entry *e = getEntry(); if(!e) return; - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); TQString info = i18n ( @@ -410,7 +410,7 @@ void DownloadDialog::slotDetails() ).arg(e->release() ).arg(e->rating() ).arg(e->downloads() - ).arg(KGlobal::locale()->formatDate(e->releaseDate()) + ).arg(TDEGlobal::locale()->formatDate(e->releaseDate()) ).arg(e->summary(lang) ); @@ -457,7 +457,7 @@ void DownloadDialog::install(Entry *e) kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate)); kapp->config()->sync(); - TQPixmap pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); m_entryitem = lv_r->findItem(m_entryname, 0); if(m_entryitem) m_entryitem->setPixmap(0, pix); m_entryitem = lv_d->findItem(m_entryname, 0); @@ -508,20 +508,20 @@ void DownloadDialog::slotSelected() TQString tmp; bool enabled; Entry *e = getEntry(); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); if(e) { if(!e->preview(lang).isValid()) { m_rt->setText(TQString("<b>%1</b><br>%2<br>%3<br><br><i>%4</i><br>(%5)").arg( - e->name()).arg(e->author()).arg(KGlobal::locale()->formatDate(e->releaseDate())).arg(e->summary(lang)).arg(e->license())); + e->name()).arg(e->author()).arg(TDEGlobal::locale()->formatDate(e->releaseDate())).arg(e->summary(lang)).arg(e->license())); } else { KIO::NetAccess::download(e->preview(lang), tmp, this); m_rt->setText(TQString("<b>%1</b><br>%2<br>%3<br><br><img src='%4'><br><i>%5</i><br>(%6)").arg( - e->name()).arg(e->author()).arg(KGlobal::locale()->formatDate(e->releaseDate())).arg(tmp).arg(e->summary(lang)).arg(e->license())); + e->name()).arg(e->author()).arg(TDEGlobal::locale()->formatDate(e->releaseDate())).arg(tmp).arg(e->summary(lang)).arg(e->license())); } if(installStatus(e) == 1) enabled = false; diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h index e54371aa..2a0b729d 100644 --- a/lib/compatibility/knewstuff/downloaddialog.h +++ b/lib/compatibility/knewstuff/downloaddialog.h @@ -112,7 +112,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase a previously set type. @param providerList the URl to the list of providers; if empty - we first try the ProvidersUrl from KGlobal::config, then we + we first try the ProvidersUrl from TDEGlobal::config, then we fall back to a hardcoded value. */ void load(TQString providerList); // KDE4: merge with load() above diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp index b7149428..e2390266 100644 --- a/lib/compatibility/knewstuff/entry.cpp +++ b/lib/compatibility/knewstuff/entry.cpp @@ -98,7 +98,7 @@ TQString Entry::summary( const TQString &lang ) const if ( !mSummaryMap[ lang ].isEmpty() ) return mSummaryMap[ lang ]; else { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mSummaryMap[ *it ].isEmpty() ) return mSummaryMap[ *it ]; } @@ -151,7 +151,7 @@ KURL Entry::payload( const TQString &lang ) const { KURL payload = mPayloadMap[ lang ]; if ( payload.isEmpty() ) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mPayloadMap[ *it ].isEmpty() ) return mPayloadMap[ *it ]; } @@ -174,7 +174,7 @@ KURL Entry::preview( const TQString &lang ) const { KURL preview = mPreviewMap[ lang ]; if ( preview.isEmpty() ) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mPreviewMap[ *it ].isEmpty() ) return mPreviewMap[ *it ]; } diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp index c572f347..6bfbb333 100644 --- a/lib/compatibility/knewstuff/knewstuff.cpp +++ b/lib/compatibility/knewstuff/knewstuff.cpp @@ -71,7 +71,7 @@ void KNewStuff::download() TQString KNewStuff::downloadDestination( Entry * ) { - return KGlobal::dirs()->saveLocation( "tmp" ) + + return TDEGlobal::dirs()->saveLocation( "tmp" ) + TDEApplication::randomString( 10 ); } diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp index fb3e788a..163d9ade 100644 --- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp +++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp @@ -40,7 +40,7 @@ using namespace std; KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent ) : KNewStuff( type, parent ) { - mConfig = KGlobal::config(); + mConfig = TDEGlobal::config(); } KNewStuffGeneric::~KNewStuffGeneric() @@ -72,9 +72,9 @@ bool KNewStuffGeneric::install( const TQString &fileName ) for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it) { list2 << (*it).replace("%f", fileName); } - KProcess proc; + TDEProcess proc; proc << list2; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); } return true; diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp index 7b98dbba..8e408e2d 100644 --- a/lib/compatibility/knewstuff/knewstuffsecure.cpp +++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp @@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result) emit installFinished(); } else { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->deleteGroup("KNewStuffStatus"); cfg->setGroup("KNewStuffStatus"); for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) @@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp index ca7767e0..67a44ebd 100644 --- a/lib/compatibility/knewstuff/provider.cpp +++ b/lib/compatibility/knewstuff/provider.cpp @@ -154,7 +154,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) mProviders.clear(); mJobData = ""; - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup("KNewStuff"); TQString providersUrl = providersList; diff --git a/lib/compatibility/knewstuff/provider.h b/lib/compatibility/knewstuff/provider.h index eb6669d2..268bd92b 100644 --- a/lib/compatibility/knewstuff/provider.h +++ b/lib/compatibility/knewstuff/provider.h @@ -179,7 +179,7 @@ class ProviderLoader : public TQObject * * @param type data type such as 'kdesktop/wallpaper'. * @param providerList the URl to the list of providers; if empty - * we first try the ProvidersUrl from KGlobal::config, then we + * we first try the ProvidersUrl from TDEGlobal::config, then we * fall back to a hardcoded value. */ void load( const TQString &type, const TQString &providerList = TQString() ); diff --git a/lib/compatibility/knewstuff/security.cpp b/lib/compatibility/knewstuff/security.cpp index 8ef377b7..941081b7 100644 --- a/lib/compatibility/knewstuff/security.cpp +++ b/lib/compatibility/knewstuff/security.cpp @@ -57,9 +57,9 @@ void Security::readKeys() m_keys.clear(); KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; - connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (!readProcess->start(KProcess::NotifyOnExit, true)) + if (!readProcess->start(TDEProcess::NotifyOnExit, true)) KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>")); else m_gpgRunning = true; @@ -75,13 +75,13 @@ void Security::readSecretKeys() m_runMode = ListSecret; KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys"; - connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (readProcess->start(KProcess::NotifyOnExit, true)) + if (readProcess->start(TDEProcess::NotifyOnExit, true)) m_gpgRunning = true; } -void Security::slotProcessExited(KProcess *process) +void Security::slotProcessExited(TDEProcess *process) { switch (m_runMode) { @@ -248,9 +248,9 @@ void Security::slotCheckValidity() //verify the signature KProcIO *verifyProcess=new KProcIO(); *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName; - connect(verifyProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (verifyProcess->start(KProcess::NotifyOnExit,true)) + if (verifyProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else { @@ -328,10 +328,10 @@ void Security::slotSignFile() //verify the signature KProcIO *signProcess=new KProcIO(); *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName; - connect(signProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); m_runMode = Sign; - if (signProcess->start(KProcess::NotifyOnExit,true)) + if (signProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else { diff --git a/lib/compatibility/knewstuff/security.h b/lib/compatibility/knewstuff/security.h index 34ad6444..dd6e0a6c 100644 --- a/lib/compatibility/knewstuff/security.h +++ b/lib/compatibility/knewstuff/security.h @@ -22,7 +22,7 @@ #include <tqobject.h> class KProcIO; -class KProcess; +class TDEProcess; struct KeyStruct { TQString id; @@ -121,7 +121,7 @@ private: TQString m_secretKey; /// the key used for signing private slots: - void slotProcessExited(KProcess *process); + void slotProcessExited(TDEProcess *process); void slotDataArrived(KProcIO *process); signals: diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp index 4eaed4aa..12261d71 100644 --- a/lib/compatibility/knewstuff/uploaddialog.cpp +++ b/lib/compatibility/knewstuff/uploaddialog.cpp @@ -88,7 +88,7 @@ UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) : topLayout->addWidget( languageLabel, 5, 0 ); mLanguageCombo = new TQComboBox( topPage ); topLayout->addWidget( mLanguageCombo, 5, 1 ); - mLanguageCombo->insertStringList( KGlobal::locale()->languageList() ); + mLanguageCombo->insertStringList( TDEGlobal::locale()->languageList() ); TQLabel *previewLabel = new TQLabel( i18n("Preview URL:"), topPage ); topLayout->addWidget( previewLabel, 6, 0 ); diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index 5fc380f9..f701fb5a 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -474,8 +474,8 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis KURL url = static_cast<KIO::ListJob *>(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = udsList.begin(); KIO::UDSEntryListConstIterator end = udsList.end(); @@ -548,8 +548,8 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList KURL url = static_cast<KIO::ListJob *>(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = udsList.begin(); KIO::UDSEntryListConstIterator end = udsList.end(); diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp index f8ba4ac6..ad5b958b 100644 --- a/quanta/components/csseditor/encodingselector.cpp +++ b/quanta/components/csseditor/encodingselector.cpp @@ -27,11 +27,11 @@ */ encodingSelector::encodingSelector(TQWidget *parent, const char* name) : encodingSelectorS(parent,name){ - TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found); if (found){ cbEncoding->insertItem (encodings[i]); diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index bd9e59ef..6a390340 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -34,7 +34,7 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontFamilyChooserS(parent,name){ - TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); + TQFont tmpFont( TDEGlobalSettings::generalFont().family(), 64, TQFont::Black ); lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() ); lePreview->setAlignment(TQt::AlignCenter); TQFont font; diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 29cabe4e..7ae6b4a4 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -152,7 +152,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); - globalShortcuts = KGlobal::config()->entryMap( "Global Shortcuts" ); + globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" ); } ActionConfigDialog::~ActionConfigDialog() diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 70d06c86..3664f21f 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -53,10 +53,10 @@ void DirtyDlg::slotOk() if (m_mainWidget->buttonCompare->isChecked()) { m_busy = true; - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); *proc << "kompare" << m_src.path() << m_dest.path(); proc->start(); - connect(proc, TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotCompareDone(KProcess*))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotCompareDone(TDEProcess*))); enableButton(KDialogBase::Ok, false); enableButton(KDialogBase::Cancel, false); } else @@ -70,7 +70,7 @@ void DirtyDlg::slotOk() } /** No descriptions */ -void DirtyDlg::slotCompareDone(KProcess* proc) +void DirtyDlg::slotCompareDone(TDEProcess* proc) { delete proc; diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index 194275af..04cf3824 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -23,7 +23,7 @@ class DirtyDialog; class KDialogBase; -class KProcess; +class TDEProcess; class TQCloseEvent; class DirtyDlg : public KDialogBase { @@ -38,7 +38,7 @@ protected slots: // Protected slots /** No descriptions */ void slotOk(); /** No descriptions */ - void slotCompareDone(KProcess*); + void slotCompareDone(TDEProcess*); /** No descriptions */ void slotResult(KIO::Job *); /** No descriptions */ diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 538aaa0b..eb143120 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -221,7 +221,7 @@ void AbbreviationDlg::saveTemplates() TQListViewItem *item = templatesList->currentItem(); if (item && m_currentAbbrev) m_currentAbbrev->abbreviations.insert(item->text(0) + " " + item->text(1), codeEdit->text()); - TQString abbrevFile = KGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml"; + TQString abbrevFile = TDEGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml"; TQString s = "<!DOCTYPE Templates>\n<Templates>\n</Templates>\n"; TQString s2; TQDomDocument doc; diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index c8ea0f1e..f2a8d894 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -20,7 +20,7 @@ #include <tqlistbox.h> -class KProcess; +class TDEProcess; class KPopupMenu; class MessageItem; diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 58f04b75..8880dd27 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -879,7 +879,7 @@ TQString KafkaDocument::getDecodedChar(const TQString &encodedChar) if(it == encodedChars.end()) { //try this - return KGlobal::charsets()->resolveEntities(encodedChar);; + return TDEGlobal::charsets()->resolveEntities(encodedChar);; } return it.data(); } @@ -940,7 +940,7 @@ TQString KafkaDocument::getDecodedText(const TQString &a_encodedText, bool trans encodedText << "\"" << endl; #endif return encodedText; - //return KGlobal::charsets()->resolveEntities(encodedText); =>nice but not sufficient + //return TDEGlobal::charsets()->resolveEntities(encodedText); =>nice but not sufficient } TQString KafkaDocument::getEncodedChar(const TQString &decodedChar, const TQString &previousDecodedChar) @@ -1099,7 +1099,7 @@ TQString KafkaDocument::generateCodeFromNode(Node *node, int bLine, int bCol, in if(encodeText) text = getEncodedText(node->tag->tagStr(), bLine, bCol, eLine, eCol, !hasPreParent); - /** Can't use KGlobal::charsets()->toEntity() : + /** Can't use TDEGlobal::charsets()->toEntity() : * It translate all chars into entities! */ else if(!hasPreParent) text = node->tag->tagStr().replace(TQRegExp("\\s+"), " "); diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index e530ee0c..347ae9c6 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -168,9 +168,9 @@ void QuantaPluginEditor::refreshPlugins() TQPixmap statusIcon; bool isValid = QuantaPlugin::validatePlugin(curPlugin); if(isValid) - statusIcon = SmallIcon("ok", KGlobal::instance()); + statusIcon = SmallIcon("ok", TDEGlobal::instance()); else - statusIcon = SmallIcon("no", KGlobal::instance()); + statusIcon = SmallIcon("no", TDEGlobal::instance()); newItem->setPixmap(1, statusIcon); newItem->setText(2, curPlugin->location()); diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index ef737396..aed1942e 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -526,7 +526,7 @@ void Project::slotOptions() optionsPage.dtdCombo->setCurrentItem(pos); - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); optionsPage.encodingCombo->insertStringList( availableEncodingNames ); TQStringList::ConstIterator iter; int iIndex = -1; diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index a087497c..31d3f620 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -105,7 +105,7 @@ void ProjectNewWeb::slotStart() { chdir( baseURL.path(1).ascii() ); - proc = new KProcess(); + proc = new TDEProcess(); proc ->clearArguments(); TQStringList list = TQStringList::split (" ", commandLine->text()); @@ -115,14 +115,14 @@ void ProjectNewWeb::slotStart() *proc << *it; } - connect( proc, TQT_SIGNAL(receivedStdout( KProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(KProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( KProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(KProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( KProcess *)), this, - TQT_SLOT( slotGetWgetExited(KProcess *))); + connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQT_SIGNAL(processExited( TDEProcess *)), this, + TQT_SLOT( slotGetWgetExited(TDEProcess *))); - if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput)) + if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { start = true; button->setText( i18n("Stop") ); @@ -159,7 +159,7 @@ void ProjectNewWeb::slotStart() } } -void ProjectNewWeb::slotGetWgetExited(KProcess*) +void ProjectNewWeb::slotGetWgetExited(TDEProcess*) { KLed2->setState(KLed::Off); KLed1->setState(KLed::Off); @@ -169,7 +169,7 @@ void ProjectNewWeb::slotGetWgetExited(KProcess*) emit enableNextButton((TQWidget *)this->parent(),true); } -void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) +void ProjectNewWeb::slotGetWgetOutput(TDEProcess *, char *buffer, int buflen) { TQString output = buffer; output = output.left( buflen ); diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index fa7ff2e0..5c6e2b5e 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -29,7 +29,7 @@ *@author Dmitry Poplavsky & Alexander Yakovlev & Eric Laffoon */ -class KProcess; +class TDEProcess; class KURL; class ProjectNewWeb : public ProjectNewWebS { @@ -48,8 +48,8 @@ public slots: KURL::List files(); - void slotGetWgetExited(KProcess *); - void slotGetWgetOutput(KProcess *proc, char *buffer, int buflen); + void slotGetWgetExited(TDEProcess *); + void slotGetWgetOutput(TDEProcess *proc, char *buffer, int buflen); virtual void resizeEvent( TQResizeEvent * ); @@ -66,7 +66,7 @@ private: bool start; - KProcess *proc; + TDEProcess *proc; private slots: // Private slots /** No descriptions */ diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index ce3686bf..fd49f0ce 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -1174,7 +1174,7 @@ void ProjectPrivate::slotNewProject() if (pos >= 0) pnf->dtdCombo->setCurrentItem(pos); - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); pnf->encodingCombo->insertStringList( availableEncodingNames ); TQStringList::ConstIterator iter; int iIndex = -1; diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index bf11498d..daa628a5 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -88,8 +88,8 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) KURL url = static_cast<KIO::ListJob *>(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = list.begin(); KIO::UDSEntryListConstIterator end = list.end(); diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 96ca78ec..b2c7001b 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -823,7 +823,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="736" type="virtual bool" abstract="0" documentation="" name="unload" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="737" type="" abstract="0" documentation="" name="~QuantaCmdPlugin" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="726" value="" type="bool" abstract="0" documentation="" name="m_firstOutput" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="727" value="" type="KProcess *" abstract="0" documentation="" name="m_process" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="727" value="" type="TDEProcess *" abstract="0" documentation="" name="m_process" static="0" scope="202" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="738" abstract="0" documentation="" name="PluginEditorItem" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="739" type="" abstract="0" documentation="" name="PluginEditorItem" static="0" scope="200" > @@ -1606,7 +1606,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1377" type="" abstract="0" documentation="" name="~ProjectNewWeb" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1368" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1369" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="filesList" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1370" value="" type="KProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1370" value="" type="TDEProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1371" value="" type="bool" abstract="0" documentation="" name="start" static="0" scope="201" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1378" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > @@ -1741,12 +1741,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1493" type="virtual void" abstract="0" documentation="" name="insertTag" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="1494" type="virtual void" abstract="0" documentation="" name="scriptDone" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="1495" type="virtual void" abstract="0" documentation="" name="slotGetScriptError" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1496" value="" type="KProcess *" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1496" value="" type="TDEProcess *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1497" value="" type="char *" abstract="0" documentation="" name="buffer" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1498" value="" type="int" abstract="0" documentation="" name="buflen" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1499" type="virtual void" abstract="0" documentation="" name="slotGetScriptOutput" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1500" value="" type="KProcess *" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1500" value="" type="TDEProcess *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1501" value="" type="char *" abstract="0" documentation="" name="buffer" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1502" value="" type="int" abstract="0" documentation="" name="buflen" static="0" scope="200" /> </UML:Operation> @@ -1754,7 +1754,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1480" value="" type="bool" abstract="0" documentation="" name="firstError" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1481" value="" type="bool" abstract="0" documentation="" name="firstOutput" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1482" value="" type="QuantaView *" abstract="0" documentation="" name="m_view" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1483" value="" type="KProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1483" value="" type="TDEProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1484" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1485" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1486" value="" type="QDomElement" abstract="0" documentation="" name="tag" static="0" scope="201" /> diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index c378bd05..97ec6ec0 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -67,8 +67,8 @@ DTDs::DTDs(TQObject *parent) m_dict->setAutoDelete(true); m_doc = new TQDomDocument(); - TQString localKDEdir = KGlobal::instance()->dirs()->localtdedir(); - TQStringList tagsResourceDirs = KGlobal::instance()->dirs()->findDirs("appdata", "dtep"); + TQString localKDEdir = TDEGlobal::instance()->dirs()->localtdedir(); + TQStringList tagsResourceDirs = TDEGlobal::instance()->dirs()->findDirs("appdata", "dtep"); TQStringList tagsDirs; TQStringList::ConstIterator end = tagsResourceDirs.constEnd(); for ( TQStringList::ConstIterator it = tagsResourceDirs.constBegin(); it != end; ++it ) @@ -904,7 +904,7 @@ void DTDs::slotLoadDTD() KURL url = KFileDialog::getOpenURL("", i18n("*.dtd|DTD Definitions"), 0L); if (!url.isEmpty()) { - DTDParser dtdParser(url, KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep"); + DTDParser dtdParser(url, TDEGlobal::dirs()->saveLocation("data") + resourceDir + "dtep"); if (dtdParser.parse()) { TQString dirName = dtdParser.dirName(); @@ -962,7 +962,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) KURL src; src.setPath(dirName); KURL target; - TQString destDir = KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep/"; + TQString destDir = TDEGlobal::dirs()->saveLocation("data") + resourceDir + "dtep/"; target.setPath(destDir + src.fileName()); KIO::copy( src, target, false); //don't care about the result } @@ -993,7 +993,7 @@ void DTDs::slotLoadEntities() if (dlg.exec()) { DTDStruct * dtd = m_dict->find(getDTDNameFromNickName(entitiesWidget.targetDTEPCombo->currentText())); - DTDParser dtdParser(KURL::fromPathOrURL(entitiesWidget.sourceDTDRequester->url()), KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep"); + DTDParser dtdParser(KURL::fromPathOrURL(entitiesWidget.sourceDTDRequester->url()), TDEGlobal::dirs()->saveLocation("data") + resourceDir + "dtep"); TQString dtdDir = TQFileInfo(dtd->fileName).dirPath(); if (dtdParser.parse(dtdDir, true)) { diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 39053e86..3b306f0f 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -47,7 +47,7 @@ KSplash::KSplash() TQPixmap pm( UserIcon(SPLASH_PICTURE) ); setBackgroundPixmap(pm); - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); setGeometry( desk.center().x()-225, desk.center().y()-150, 450, 300 ); setLineWidth(0); show(); @@ -65,7 +65,7 @@ KQApplication::KQApplication() args = TDECmdLineArgs::parsedArgs(); splash = 0L; - KGlobal::dirs()->addPrefix(PREFIX); + TDEGlobal::dirs()->addPrefix(PREFIX); dcopClient()->registerAs("quanta", true); //FIXME: Do not hide the problem, but really fix the session restoration. @@ -121,7 +121,7 @@ void KQApplication::slotSplashTimeout() KQUniqueApplication::KQUniqueApplication() : KUniqueApplication() { - KGlobal::dirs()->addPrefix(PREFIX); + TDEGlobal::dirs()->addPrefix(PREFIX); dcopClient()->registerAs("quanta", false); } diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 82c81283..434bff2f 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -218,7 +218,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( connect(idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimerExpired())); m_idleTimerEnabled = true; - qConfig.globalDataDir = KGlobal::dirs()->findResourceDir("data",resourceDir + "toolbar/quantalogo.png"); + qConfig.globalDataDir = TDEGlobal::dirs()->findResourceDir("data",resourceDir + "toolbar/quantalogo.png"); if (qConfig.globalDataDir.isEmpty()) { quantaStarted = false; @@ -316,7 +316,7 @@ QuantaApp::~QuantaApp() } m_toolbarList.clear(); - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs("tmp"); tmpDir = tmpDirs[0]; for (uint i = 0; i < tmpDirs.count(); i++) { @@ -511,7 +511,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave) "all/allfiles text/html text/xml application/x-php text/plain", this, i18n("Save File")); KURL saveUrl = data.URLs[0]; bool found; - TQString encoding = KGlobal::charsets()->codecForName(data.encoding, found)->name(); + TQString encoding = TDEGlobal::charsets()->codecForName(data.encoding, found)->name(); KTextEditor::EncodingInterface* encodingIf = dynamic_cast<KTextEditor::EncodingInterface*>(w->doc()); if (encodingIf && encodingIf->encoding() != encoding) encodingIf->setEncoding(encoding); @@ -1042,7 +1042,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar) TQDomNodeList nodeList; ToolbarEntry *p_toolbar = 0L; - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar *dlg; if (!defaultToolbar.isEmpty()) dlg = new KEditToolbar(defaultToolbar, factory(), this); @@ -1129,7 +1129,7 @@ void QuantaApp::slotOptionsConfigureToolbars() void QuantaApp::slotNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); ToolbarTabWidget::ref()->setCurrentPage(currentPageIndex); } @@ -1191,7 +1191,7 @@ void QuantaApp::slotOptions() fileMasks->sbAutoSave->setValue(m_config->readNumEntry("Autosave interval")); //else default value 15 - TQStringList availableEncodingNames(KGlobal::charsets()->availableEncodingNames()); + TQStringList availableEncodingNames(TDEGlobal::charsets()->availableEncodingNames()); fileMasks->encodingCombo->insertStringList( availableEncodingNames ); TQStringList::ConstIterator iter; int iIndex = -1; @@ -1800,7 +1800,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl //kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl; if (toolbarTab->iconText() == KToolBar::IconTextBottom) { - tb->setGeometry(0,0, toolbarTab->width(), tb->iconSize() + TQFontMetrics(KGlobalSettings::toolBarFont()).height() + 10); + tb->setGeometry(0,0, toolbarTab->width(), tb->iconSize() + TQFontMetrics(TDEGlobalSettings::toolBarFont()).height() + 10); toolbarTab->setFixedHeight(toolbarTab->tabHeight() + tb->height() + 3); } else { @@ -2884,7 +2884,7 @@ bool QuantaApp::removeToolbars() } } - TQFile f(KGlobal::instance()->dirs()->saveLocation("data")+resourceDir + "actions.rc" ); + TQFile f(TDEGlobal::instance()->dirs()->saveLocation("data")+resourceDir + "actions.rc" ); if (f.open( IO_ReadWrite | IO_Truncate )) { if (!m_actions->firstChild().firstChild().isNull()) @@ -3935,7 +3935,7 @@ void QuantaApp::slotAutosaveTimer() } /** Get script output */ -void QuantaApp::slotGetScriptOutput(KProcess* ,char* buf,int buflen) +void QuantaApp::slotGetScriptOutput(TDEProcess* ,char* buf,int buflen) { TQCString tmp( buf, buflen + 1 ); m_scriptOutput = TQString(); @@ -3943,14 +3943,14 @@ void QuantaApp::slotGetScriptOutput(KProcess* ,char* buf,int buflen) } /** Get script error*/ -void QuantaApp::slotGetScriptError(KProcess* ,char* buf,int buflen) +void QuantaApp::slotGetScriptError(TDEProcess* ,char* buf,int buflen) { //TODO: Implement some error handling? Q_UNUSED(buf); Q_UNUSED(buflen); } /** Notify when process exits*/ -void QuantaApp::slotProcessExited(KProcess* process) +void QuantaApp::slotProcessExited(TDEProcess* process) { slotProcessTimeout(); delete process; @@ -4767,10 +4767,10 @@ void QuantaApp::slotViewInKFM() } if ( !w->isUntitled() ) { - KProcess *show = new KProcess(TQT_TQOBJECT(this)); + TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this)); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "kfmclient" << "newTab" << url.url(); - show->start( KProcess::DontCare ); + show->start( TDEProcess::DontCare ); } } @@ -4801,7 +4801,7 @@ void QuantaApp::slotViewInLynx() } if ( !w->isUntitled() ) { - KProcess *show = new KProcess(TQT_TQOBJECT(this)); + TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this)); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "konsole" << "--nohist" @@ -4811,7 +4811,7 @@ void QuantaApp::slotViewInLynx() << "-e" << "lynx" << url.url(); - show->start( KProcess::DontCare ); + show->start( TDEProcess::DontCare ); } } diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index e7714aea..c701d25b 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -73,7 +73,7 @@ class KHTMLView; class KAction; class KToggleAction; -class KProcess; +class TDEProcess; class KSelectAction; class KRecentFilesAction; class KToolBarPoupAction; @@ -468,11 +468,11 @@ protected slots: void slotIdleTimerExpired(); void slotShowNoFramesPreview(); /** Get script output */ - void slotGetScriptOutput(KProcess*, char*, int); + void slotGetScriptOutput(TDEProcess*, char*, int); /** Get script error */ - void slotGetScriptError(KProcess*, char*, int); + void slotGetScriptError(TDEProcess*, char*, int); /** Notify when process exits */ - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); /** External app execution timeout handling */ void slotProcessTimeout(); diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 42765a21..73d6c858 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -133,7 +133,7 @@ void QuantaInit::initQuanta() m_config = quantaApp->m_config; parser = new Parser(); - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs("tmp"); TQDir dir; tmpDir = tmpDirs[0]; for (uint i = 0; i < tmpDirs.count(); i++) @@ -276,7 +276,7 @@ void QuantaInit::initQuanta() //get the PID of this running instance qConfig.quantaPID = TQString::number(int(getpid()), 10); - qConfig.backupDirPath = KGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); + qConfig.backupDirPath = TDEGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); m_quanta->autosaveTimer = new TQTimer(m_quanta); connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAutosaveTimer())); @@ -1267,19 +1267,19 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) void QuantaInit::execCommandPS(const TQString& cmd) { - //We create a KProcess that executes the "ps" *nix command to get the PIDs of the + //We create a TDEProcess that executes the "ps" *nix command to get the PIDs of the //other instances of quanta actually running - KProcess *execCommand = new KProcess(); + TDEProcess *execCommand = new TDEProcess(); *(execCommand) << TQStringList::split(" ",cmd); - connect(execCommand, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(KProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(processExited(KProcess*)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(KProcess*))); + connect(execCommand, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(execCommand, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(execCommand, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(TDEProcess*))); - if (!execCommand->start(KProcess::NotifyOnExit,KProcess::All)) + if (!execCommand->start(TDEProcess::NotifyOnExit,TDEProcess::All)) { KMessageBox::error(m_quanta, i18n("Failed to query for running Quanta instances.")); } @@ -1516,7 +1516,7 @@ void QuantaInit::readAbbreviations() bool mainAbbrevFileFound = false; TQStringList mainFileList; mainFileList << qConfig.globalDataDir + resourceDir + "abbreviations.xml"; - mainFileList << KGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml"; + mainFileList << TDEGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml"; for (uint i = 0; i < mainFileList.count(); i++) { if (!TQFile::exists(mainFileList[i])) @@ -1565,7 +1565,7 @@ void QuantaInit::readAbbreviations() dirName = dirURL.path(1); TQString abbrevFile = dirName; TQString tmpStr = dirName; - TQStringList resourceDirs = KGlobal::dirs()->resourceDirs("data"); + TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs("data"); bool dirFound = false; for (uint i = 0; i < resourceDirs.count(); i++) { @@ -1578,7 +1578,7 @@ void QuantaInit::readAbbreviations() } if (dirFound) { - abbrevFile = KGlobal::dirs()->saveLocation("data", tmpStr) +"/"; + abbrevFile = TDEGlobal::dirs()->saveLocation("data", tmpStr) +"/"; } abbrevFile.append("abbreviations"); if (!TQFile::exists(abbrevFile)) diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 9ff82da5..278505a2 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -618,7 +618,7 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position) TQDictIterator<QuantaPlugin> it2(plugins); for(;it2.current();++it2) { - int id = m_openWithMenu->insertItem(KGlobal::iconLoader()->loadIconSet(it2.current()->icon(),KIcon::Small), it2.current()->name()); + int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),KIcon::Small), it2.current()->name()); m_pluginIds[id] = it2.current(); } connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int))); diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index dbd7c11a..39d8ba5b 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -80,7 +80,7 @@ void DocTreeView::slotRefreshTree() delete *it; } m_folderList.clear(); - TQStringList docDirs = KGlobal::instance()->dirs()->findDirs("appdata", "doc"); + TQStringList docDirs = TDEGlobal::instance()->dirs()->findDirs("appdata", "doc"); for ( TQStringList::Iterator it = docDirs.begin(); it != docDirs.end(); ++it ) { diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index eb64dd0b..6819e1ca 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -172,9 +172,9 @@ void ScriptTreeView::slotEditScript() emit openFile(urlToOpen); else { - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); *proc << editApp << urlToOpen.path(); - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } } } @@ -195,11 +195,11 @@ void ScriptTreeView::slotRun() } else { - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); TQStringList argsList = TQStringList::split(' ', execApp); *proc << argsList; *proc << urlToOpen.path(); - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } } } 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++) { |