diff options
80 files changed, 250 insertions, 250 deletions
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index f3bfa35..7ce379a 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -67,7 +67,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) recentAct = KStdAction::openRecent(0, 0, actionCollection()); connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &))); - recentAct->loadEntries(KGlobal::config(), "Designer recent files"); + recentAct->loadEntries(TDEGlobal::config(), "Designer recent files"); estateAct = new KListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int))); @@ -94,7 +94,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) openNew(); resize(350, 400); - applyMainWindowSettings(KGlobal::config(), "DesignerTopLevelWindow"); + applyMainWindowSettings(TDEGlobal::config(), "DesignerTopLevelWindow"); } AtlanticDesigner::~AtlanticDesigner() @@ -833,8 +833,8 @@ void AtlanticDesigner::closeEvent(TQCloseEvent *e) if (warnClose()) return; - saveMainWindowSettings(KGlobal::config(), "DesignerTopLevelWindow"); - recentAct->saveEntries(KGlobal::config(), "Designer recent files"); + saveMainWindowSettings(TDEGlobal::config(), "DesignerTopLevelWindow"); + recentAct->saveEntries(TDEGlobal::config(), "Designer recent files"); e->accept(); kapp->quit(); diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index e0f37b8..6bf06d7 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -54,7 +54,7 @@ K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePlugi KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) { - KGlobal::locale()->insertCatalogue("katecppsymbolviewer"); + TDEGlobal::locale()->insertCatalogue("katecppsymbolviewer"); KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); act->setCheckedState(i18n("Show Symbols")); diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index b065113..ec68f6e 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -83,7 +83,7 @@ extern "C" { void* init_katefiletemplates() { - KGlobal::locale()->insertCatalogue("katefiletemplates"); + TDEGlobal::locale()->insertCatalogue("katefiletemplates"); return new KatePluginFactory; } } @@ -144,7 +144,7 @@ KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) // template menu m_dw = new KDirWatch( this, "template_dirwatch" ); - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kate/plugins/katefiletemplates/templates"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kate/plugins/katefiletemplates/templates"); for ( TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it ) { m_dw->addDir( *it, true ); @@ -171,7 +171,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d) { kdDebug()<<"updateTemplateDirs called with arg "<<d<<endl; - TQStringList templates = KGlobal::dirs()->findAllResources( + TQStringList templates = TDEGlobal::dirs()->findAllResources( "data","kate/plugins/katefiletemplates/templates/*.katetemplate", false,true); @@ -913,7 +913,7 @@ void KateTemplateWizard::accept() if ( ! suggestion.endsWith(".katetemplate") ) suggestion.append(".katetemplate"); - TQString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); + TQString dir = TDEGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); templateUrl = dir + suggestion; @@ -1089,7 +1089,7 @@ class KFTNewStuff : public KNewStuff { bool createUploadFile( const TQString &/*filename*/ ) { return false; } TQString downloadDestination( KNS::Entry *entry ) { - TQString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); + TQString dir = TDEGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); return dir.append( entry->payload().filename() ); } @@ -1190,7 +1190,7 @@ void KateTemplateManager::slotRemoveTemplate() // list of removed templates KConfig *config = kapp->config(); TQString fname = item->templateinfo->filename.section( '/', -1 ); - TQStringList templates = KGlobal::dirs()->findAllResources( + TQStringList templates = TDEGlobal::dirs()->findAllResources( "data", fname.prepend( "kate/plugins/katefiletemplates/templates/" ), false,true); int failed = 0; diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index bc0a6a4..ec5dafc 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -148,12 +148,12 @@ void PluginKateInsertCommand::slotInsertCommand() if ( ! sh ) { sh = new KShellProcess; - connect ( sh, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)) ); - connect ( sh, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) ); - connect ( sh, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ) ; + connect ( sh, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)) ); + connect ( sh, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); + connect ( sh, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ) ; } sh->clearArguments(); @@ -170,7 +170,7 @@ void PluginKateInsertCommand::slotInsertCommand() config->writePathEntry("Last WD", d->wd()); } *sh << TQFile::encodeName(d->command()).data(); - sh->start( KProcess::NotifyOnExit, KProcess::All ); + sh->start( TDEProcess::NotifyOnExit, TDEProcess::All ); // add command to history if ( cmdhist.contains( d->command() ) ) { @@ -219,7 +219,7 @@ void PluginKateInsertCommand::slotShowWaitDlg() } } -void PluginKateInsertCommand::slotReceivedStdout( KProcess* /*p*/, char* text, +void PluginKateInsertCommand::slotReceivedStdout( TDEProcess* /*p*/, char* text, int len ) { TQString t = TQString::fromLocal8Bit ( text ); @@ -227,14 +227,14 @@ void PluginKateInsertCommand::slotReceivedStdout( KProcess* /*p*/, char* text, kv->insertText( t ); } -void PluginKateInsertCommand::slotReceivedStderr( KProcess* p, char* text, +void PluginKateInsertCommand::slotReceivedStderr( TDEProcess* p, char* text, int len ) { if ( bInsStdErr ) slotReceivedStdout( p, text, len ); } -void PluginKateInsertCommand::slotProcessExited( KProcess* p ) +void PluginKateInsertCommand::slotProcessExited( TDEProcess* p ) { if (wdlg) { wdlg->hide(); diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 5e158f1..19c6eb3 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -42,7 +42,7 @@ namespace Kate { class PluginView; } class KConfig; -class KProcess; +class TDEProcess; class KShellProcess; class TQButtonGroup; class TQCheckBox; @@ -95,9 +95,9 @@ class PluginKateInsertCommand : public Kate::Plugin, void applyConfig( InsertCommandConfigPage* ); private slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotReceivedStderr(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotShowWaitDlg(); }; diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 7a3f014..1ea92a5 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -364,11 +364,11 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, setResizeMode(TQListView::LastColumn); connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); - m_proc = new KProcess(); + m_proc = new TDEProcess(); - connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcExited(KProcess*))); - connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int))); + connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*))); + connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); KConfig c("katemakepluginrc"); @@ -443,7 +443,7 @@ void PluginKateMakeView::processLine(const TQString &l) } -void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int len) +void PluginKateMakeView::slotReceivedProcStderr(TDEProcess *, char *result, int len) { FUNCTIONSETUP; @@ -460,7 +460,7 @@ void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int le } -void PluginKateMakeView::slotProcExited(KProcess *p) +void PluginKateMakeView::slotProcExited(TDEProcess *p) { FUNCTIONSETUP; @@ -661,7 +661,7 @@ bool PluginKateMakeView::slotValidate() if (make.isEmpty()) make = KStandardDirs::findExe("make"); *m_proc << make; - if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) { + if( make.isEmpty() || ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ? "make" : make)); return false; diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h index 35b4c2f..cdc9399 100644 --- a/kate/make/plugin_katemake.h +++ b/kate/make/plugin_katemake.h @@ -67,8 +67,8 @@ class PluginKateMakeView : public TQListView, public KXMLGUIClient void slotPrev(); bool slotValidate(); - void slotProcExited(KProcess*); - void slotReceivedProcStderr(KProcess*, char*, int); + void slotProcExited(TDEProcess*); + void slotReceivedProcStderr(TDEProcess*, char*, int); void slotConfigure(); @@ -76,7 +76,7 @@ protected: void processLine(const TQString &); private: - KProcess *m_proc; + TDEProcess *m_proc; TQString output_line; TQString doc_name; diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index 66c43c1..6687c53 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -57,7 +57,7 @@ extern "C" { void* init_libkatetabbarextensionplugin() { - KGlobal::locale()->insertCatalogue("katetabbarextension"); + TDEGlobal::locale()->insertCatalogue("katetabbarextension"); return new KatePluginFactory; } } @@ -238,7 +238,7 @@ void KateTabBarButton::triggerModified() setPaletteForegroundColor( c ); setIconSet(SmallIconSet("modified")); } else { - TQColor c(KGlobalSettings::textColor()); + TQColor c(TDEGlobalSettings::textColor()); setPaletteForegroundColor( c ); setIconSet(TQIconSet()); } diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 996353b..327f903 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -178,7 +178,7 @@ KatePrompt void -PluginKateTextFilter::slotFilterReceivedStdout (KProcess * pProcess, char * got, int len) +PluginKateTextFilter::slotFilterReceivedStdout (TDEProcess * pProcess, char * got, int len) { assert (pProcess == m_pFilterShellProcess); @@ -197,14 +197,14 @@ PluginKateTextFilter::slotFilterReceivedStdout (KProcess * pProcess, char * got, void -PluginKateTextFilter::slotFilterReceivedStderr (KProcess * pProcess, char * got, int len) +PluginKateTextFilter::slotFilterReceivedStderr (TDEProcess * pProcess, char * got, int len) { slotFilterReceivedStdout (pProcess, got, len); } void -PluginKateTextFilter::slotFilterProcessExited (KProcess * pProcess) +PluginKateTextFilter::slotFilterProcessExited (TDEProcess * pProcess) { assert (pProcess == m_pFilterShellProcess); @@ -233,7 +233,7 @@ slipInFilter (KShellProcess & shell, Kate::View & view, TQString command) shell.clearArguments (); shell << command; - shell.start (KProcess::NotifyOnExit, KProcess::All); + shell.start (TDEProcess::NotifyOnExit, TDEProcess::All); shell.writeStdin (marked.local8Bit (), marked.length ()); // TODO: Put up a modal dialog to defend the text from further // keystrokes while the command is out. With a cancel button... @@ -242,7 +242,7 @@ slipInFilter (KShellProcess & shell, Kate::View & view, TQString command) void -PluginKateTextFilter::slotFilterCloseStdin (KProcess * pProcess) +PluginKateTextFilter::slotFilterCloseStdin (TDEProcess * pProcess) { assert (pProcess == m_pFilterShellProcess); pProcess -> closeStdin (); @@ -283,17 +283,17 @@ void PluginKateTextFilter::runFilter( Kate::View *kv, const TQString &filter ) { m_pFilterShellProcess = new KShellProcess; - connect ( m_pFilterShellProcess, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(slotFilterCloseStdin (KProcess *))); + connect ( m_pFilterShellProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(slotFilterCloseStdin (TDEProcess *))); - connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(slotFilterReceivedStdout(KProcess*,char*,int)) ); + connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(slotFilterReceivedStdout(TDEProcess*,char*,int)) ); - connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotFilterReceivedStderr(KProcess*,char*,int)) ); + connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotFilterReceivedStderr(TDEProcess*,char*,int)) ); - connect ( m_pFilterShellProcess, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotFilterProcessExited(KProcess*) ) ) ; + connect ( m_pFilterShellProcess, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotFilterProcessExited(TDEProcess*) ) ) ; } slipInFilter (*m_pFilterShellProcess, *kv, filter); diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index f9e7f31..9e330be 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -56,10 +56,10 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa TQStringList completionList; public slots: void slotEditFilter (); - void slotFilterReceivedStdout (KProcess * pProcess, char * got, int len); - void slotFilterReceivedStderr (KProcess * pProcess, char * got, int len); - void slotFilterProcessExited (KProcess * pProcess); - void slotFilterCloseStdin (KProcess *); + void slotFilterReceivedStdout (TDEProcess * pProcess, char * got, int len); + void slotFilterReceivedStderr (TDEProcess * pProcess, char * got, int len); + void slotFilterProcessExited (TDEProcess * pProcess); + void slotFilterCloseStdin (TDEProcess *); }; #endif // _PLUGIN_KANT_TEXTFILTER_H diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 6e4f0ad..e7ce1e2 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -130,13 +130,13 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow */ m_proc_stderr = ""; - m_proc = new KProcess(); - connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcExited(KProcess*))); + m_proc = new TDEProcess(); + connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*))); // we currently only want errors: - //connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - // this, TQT_SLOT(receivedProcStdout(KProcess*, char*, int))); - connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int))); + //connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + // this, TQT_SLOT(receivedProcStdout(TDEProcess*, char*, int))); + connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); } @@ -150,13 +150,13 @@ PluginKateXMLCheckView::~PluginKateXMLCheckView() -void PluginKateXMLCheckView::slotReceivedProcStderr(KProcess *, char *result, int len) +void PluginKateXMLCheckView::slotReceivedProcStderr(TDEProcess *, char *result, int len) { m_proc_stderr += TQString::fromLocal8Bit( TQCString(result, len+1) ); } -void PluginKateXMLCheckView::slotProcExited(KProcess*) +void PluginKateXMLCheckView::slotProcExited(TDEProcess*) { // FIXME: doesn't work correct the first time: //if( m_dockwidget->isDockBackPossible() ) { @@ -343,7 +343,7 @@ bool PluginKateXMLCheckView::slotValidate() } *m_proc << m_tmp_file->name(); - if( ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) { + if( ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute xmllint. Please make " "sure that xmllint is installed. It is part of libxml2.")); return false; diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h index dda8683..e12a950 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.h +++ b/kate/xmlcheck/plugin_katexmlcheck.h @@ -56,15 +56,15 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient public slots: bool slotValidate(); void slotClicked(TQListViewItem *item); - void slotProcExited(KProcess*); - void slotReceivedProcStderr(KProcess*, char*, int); + void slotProcExited(TDEProcess*); + void slotReceivedProcStderr(TDEProcess*, char*, int); void slotUpdate(); private: KTempFile *m_tmp_file; KParts::ReadOnlyPart *part; bool m_validating; - KProcess *m_proc; + TDEProcess *m_proc; TQString m_proc_stderr; TQString m_dtdname; }; diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index 20be13e..06c1cf9 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -399,7 +399,7 @@ void PluginKateXMLTools::getDTD() // Start where the supplied XML-DTDs are fed by default unless // user changed directory last time: - TQString defaultDir = KGlobal::dirs()->findResourceDir("data", "katexmltools/" ) + "katexmltools/"; + TQString defaultDir = TDEGlobal::dirs()->findResourceDir("data", "katexmltools/" ) + "katexmltools/"; if( m_urlString.isNull() ) { m_urlString = defaultDir; } diff --git a/kfile-plugins/lnk/lnkforward.cpp b/kfile-plugins/lnk/lnkforward.cpp index 46fb781..6161a15 100644 --- a/kfile-plugins/lnk/lnkforward.cpp +++ b/kfile-plugins/lnk/lnkforward.cpp @@ -121,7 +121,7 @@ int LNKForwarder::run(TDECmdLineArgs *args) void LNKForwarder::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up - // "app not found" in KProcessRunner, if that was the case. + // "app not found" in TDEProcessRunner, if that was the case. TQTimer::singleShot(2000, this, TQT_SLOT(deref())); } diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 73319c5..2e84474 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -42,7 +42,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue( "kbinaryclock"); + TDEGlobal::locale()->insertCatalogue( "kbinaryclock"); return new KBinaryClock( configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "kbinaryclock"); } @@ -145,7 +145,7 @@ KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, T KBinaryClock::~KBinaryClock() { delete prefs; - KGlobal::locale()->removeCatalogue( "kbinaryclock"); + TDEGlobal::locale()->removeCatalogue( "kbinaryclock"); } /** @@ -227,7 +227,7 @@ void KBinaryClock::preferences(){ */ void KBinaryClock::updateClock(){ TQString time = "hhmmss"; - if(KGlobal::locale()->use12Clock()) + if(TDEGlobal::locale()->use12Clock()) time += "ap"; TQString currentTime = (TQTime::currentTime()).toString(time); @@ -289,7 +289,7 @@ void KBinaryClock::openContextMenu() { KPopupMenu *menu = new KPopupMenu(); menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); - KLocale *loc = KGlobal::locale(); + KLocale *loc = TDEGlobal::locale(); TQDateTime dt = TQDateTime::currentDateTime(); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -320,7 +320,7 @@ void KBinaryClock::openContextMenu() { } int result = menu->exec( TQCursor::pos() ); - KProcess proc; + TDEProcess proc; switch (result) { case 102: preferences(); @@ -330,13 +330,13 @@ void KBinaryClock::openContextMenu() { proc << "--nonewdcop"; proc << TQString("%1 clock --lang %2") .arg(locate("exe", "kcmshell")) - .arg(KGlobal::locale()->language()); - proc.start(KProcess::DontCare); + .arg(TDEGlobal::locale()->language()); + proc.start(TDEProcess::DontCare); break; case 104: proc << locate("exe", "kcmshell"); proc << "language"; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); break; case 110: preferences(); @@ -379,7 +379,7 @@ void KBinaryClock::toggleCalendar() } // make calendar fully visible - TQRect deskR = KGlobalSettings::desktopGeometry(TQPoint(0,0)); + TQRect deskR = TDEGlobalSettings::desktopGeometry(TQPoint(0,0)); if (c.y()+h > deskR.bottom()) c.setY(deskR.bottom()-h-1); if (c.x()+w > deskR.right()) c.setX(deskR.right()-w-1); @@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) { - tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); + tip(m_clock->geometry(), TDEGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); } #include "kbinaryclock.moc" diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index a51229e..58dc30c 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -50,7 +50,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kolourpicker"); + TDEGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "kolourpicker"); @@ -100,7 +100,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type, KolourPicker::~KolourPicker() { - KGlobal::locale()->removeCatalogue("kolourpicker"); + TDEGlobal::locale()->removeCatalogue("kolourpicker"); } diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 2706af2..1a2631e 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -147,7 +147,7 @@ void SimpleButton::slotSettingsChanged(int category) return; } - bool changeCursor = KGlobalSettings::changeCursorOverIcon(); + bool changeCursor = TDEGlobalSettings::changeCursorOverIcon(); if (changeCursor) { diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 991a2e9..ef32118 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -37,7 +37,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("ktimemon"); + TDEGlobal::locale()->insertCatalogue("ktimemon"); KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "ktimemon"); return mon; @@ -172,9 +172,9 @@ void KTimeMon::maybeTip(const TQPoint& p) idle = 0; TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") .arg(idle) - .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) + .arg(TDEGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) .arg(100-s.used) - .arg(KGlobal::locale()->formatNumber(s.stotal, 0)) + .arg(TDEGlobal::locale()->formatNumber(s.stotal, 0)) .arg(100-s.sused); tip(rect(), str); @@ -265,7 +265,7 @@ KTimeMon::~KTimeMon() { delete sample; delete bgProcess; - KGlobal::locale()->removeCatalogue("ktimemon"); + TDEGlobal::locale()->removeCatalogue("ktimemon"); } @@ -413,15 +413,15 @@ void KTimeMon::runCommand(int index) bgProcess = new KShellProcess; *bgProcess << mouseActionCommand[index]; - connect(bgProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(commandStderr(KProcess *, char *, int))); - bgProcess->start(KProcess::DontCare, KProcess::Stderr); + connect(bgProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(commandStderr(TDEProcess *, char *, int))); + bgProcess->start(TDEProcess::DontCare, TDEProcess::Stderr); } // ----------------------------------------------------------------------------- // Check if there is any diagnostic output (command not found or such) -void KTimeMon::commandStderr(KProcess * /*proc*/, char *buffer, int /*length*/) +void KTimeMon::commandStderr(TDEProcess * /*proc*/, char *buffer, int /*length*/) { TQString msgbuf; diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 4268c06..6e454d8 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -29,7 +29,7 @@ class KConfDialog; class TQPaintEvent; class TQMouseEvent; class TQPainter; -class KProcess; +class TDEProcess; class KShellProcess; class KHelpMenu; class KPopupMenu; @@ -79,7 +79,7 @@ protected: private slots: // called from the menu void configure(); // show the configuration dialog void orientation(); // switch vertical/horizontal orientation - void commandStderr(KProcess *proc, char *buffer, int length); + void commandStderr(TDEProcess *proc, char *buffer, int length); private: void runCommand(int index); diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 37e0bd6..7051e68 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -51,7 +51,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kmathapplet"); + TDEGlobal::locale()->insertCatalogue("kmathapplet"); return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet"); } } @@ -99,8 +99,8 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions, _input->completionObject()->setItems(list); list = c->readListEntry("History list"); _input->setHistoryItems(list); - int mode = c->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() ); - _input->setCompletionMode( (KGlobalSettings::Completion) mode ); + int mode = c->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() ); + _input->setCompletionMode( (TDEGlobalSettings::Completion) mode ); _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); _hbox->setFixedSize(120, 22); @@ -131,7 +131,7 @@ MathApplet::~MathApplet() c->writeEntry( "CompletionMode", (int) _input->completionMode() ); c->sync(); - KGlobal::locale()->removeCatalogue("kmathapplet"); + TDEGlobal::locale()->removeCatalogue("kmathapplet"); } void MathApplet::useDegrees() { diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 99c79c6..c320ff9 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -59,7 +59,7 @@ extern "C" { KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue("mediacontrol"); + TDEGlobal::locale()->insertCatalogue("mediacontrol"); return new MediaControl(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences | KPanelApplet::ReportBug, parent, "mediacontrol"); @@ -163,7 +163,7 @@ MediaControl::~MediaControl() delete _player; delete _configFrontend; delete _dcopClient; - KGlobal::locale()->removeCatalogue("mediacontrol"); + TDEGlobal::locale()->removeCatalogue("mediacontrol"); } // Drag-n-Drop stuff =========================================================== diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 6df8886..14e92fa 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -63,8 +63,8 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, c _child->themeListBox->clear(); // fill with available skins - KGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); - TQStringList list = KGlobal::dirs()->resourceDirs("themes"); + TDEGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); + TQStringList list = TDEGlobal::dirs()->resourceDirs("themes"); for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) readSkinDir(*it); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 2706af2..1a2631e 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -147,7 +147,7 @@ void SimpleButton::slotSettingsChanged(int category) return; } - bool changeCursor = KGlobalSettings::changeCursorOverIcon(); + bool changeCursor = TDEGlobalSettings::changeCursorOverIcon(); if (changeCursor) { diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index ec7af3e..d5b3e6a 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -71,7 +71,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const if (view) m_part = view->part(); - KGlobal::locale()->insertCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->insertCatalogue("akregator_konqplugin"); m_feedMimeTypes << "text/rss" << "text/rdf" << "text/xml"; // Get the list of URLs clicked on from Konqi. //KFileItemList m_list = popupmenu->fileItemList(); @@ -97,7 +97,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const AkregatorMenu::~AkregatorMenu() { - KGlobal::locale()->removeCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->removeCatalogue("akregator_konqplugin"); delete m_conf; } diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 9350bb4..a81d1a1 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -58,7 +58,7 @@ K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) { - KGlobal::locale()->insertCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->insertCatalogue("akregator_konqplugin"); m_part = dynamic_cast<KHTMLPart*>(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } @@ -77,7 +77,7 @@ void KonqFeedIcon::waitPartToLoad() KonqFeedIcon::~KonqFeedIcon() { - KGlobal::locale()->removeCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->removeCatalogue("akregator_konqplugin"); m_statusBarEx = KParts::StatusBarExtension::childObject(m_part); if (m_statusBarEx) { @@ -205,14 +205,14 @@ void KonqFeedIcon::addFeeds() } else { kdDebug() << "KonqFeedIcon::addFeeds(): use command line" << endl; - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "akregator" << "-g" << i18n("Imported Feeds"); for ( FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it ) { *proc << "-a" << fixRelativeURL((*it).url(), m_part->baseURL()); } - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); delete proc; } diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp index c0ade83..eb590eb 100644 --- a/konq-plugins/akregator/pluginbase.cpp +++ b/konq-plugins/akregator/pluginbase.cpp @@ -62,10 +62,10 @@ void PluginBase::addFeedsViaDCOP(const TQStringList& urls) void PluginBase::addFeedViaCmdLine(TQString url) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "akregator" << "-g" << i18n("Imported Feeds"); *proc << "-a" << url; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); delete proc; } diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 4f712df..fef5779 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -55,7 +55,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis if ( !m_conf->readBoolEntry( "KonquerorIntegration", true ) ) return; - KGlobal::locale()->insertCatalogue("ark_plugin"); + TDEGlobal::locale()->insertCatalogue("ark_plugin"); extMimeTypes(); KFileItemList itemList = popupmenu->fileItemList(); diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index 7ab20b4..d956ceb 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -55,7 +55,7 @@ DOMListViewItem::~DOMListViewItem() void DOMListViewItem::init() { m_color = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Text ); - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); clos = false; } diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index d196f40..15c7d6a 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -71,7 +71,7 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving* { part = 0; - const TQFont font(KGlobalSettings::generalFont()); + const TQFont font(TDEGlobalSettings::generalFont()); m_listView->setFont( font ); m_listView->setSorting(-1); m_rootListView = m_listView; @@ -310,7 +310,7 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item TQTextStream ts( text, IO_ReadOnly ); while (!ts.eof()) { const TQString txt(ts.readLine()); - const TQFont font(KGlobalSettings::fixedFont()); + const TQFont font(TDEGlobalSettings::fixedFont()); cur_item->setFont( font ); cur_item->setText(0, txt); diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 3a913ec..5bef896 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -185,7 +185,7 @@ void FSViewPart::slotSettingsChanged(int category) TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), _ext,TQT_SLOT(selected(TreeMapItem*))); - if (KGlobalSettings::singleClick()) + if (TDEGlobalSettings::singleClick()) TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), _ext,TQT_SLOT(selected(TreeMapItem*))); else diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 6f5073c..d12f495 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -327,19 +327,19 @@ TQString Inode::text(int i) const if (s < 1000) text = TQString("%1 B").arg((int)(s+.5)); else if (s < 10 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").arg(TDEGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").arg(TDEGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) text = TQString("%1 kB").arg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); else - text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); if (_sizeEstimation>0) text += "+"; return text; diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index f2f2daf..ec24f6d 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char* argv[]) TDECmdLineArgs::addCmdLineOptions(options); TDEApplication a; - KConfigGroup gconfig(KGlobal::config(), TQCString("General")); + KConfigGroup gconfig(TDEGlobal::config(), TQCString("General")); TQString path = gconfig.readPathEntry("Path", "."); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index d5fe29a..77758b1 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -65,7 +65,7 @@ void KIGPDialog::slotDefault() m_imageName->setChecked(true); m_imageSize->setChecked(false); m_imageProperty->setChecked(false); - m_fontName->setCurrentText( KGlobalSettings::generalFont().family() ); + m_fontName->setCurrentText( TDEGlobalSettings::generalFont().family() ); m_fontSize->setValue(14); m_foregroundColor->setColor( TQColor( "#d0ffd0") ); m_backgroundColor->setColor( TQColor("#333333") ); @@ -127,7 +127,7 @@ void KIGPDialog::setupLookPage(const TQString& path) { TQStringList standardFonts; KFontChooser::getFontList(standardFonts, 0); m_fontName->insertStringList( standardFonts ); - m_fontName->setCurrentText( m_config->readEntry("FontName", KGlobalSettings::generalFont().family() ) ); + m_fontName->setCurrentText( m_config->readEntry("FontName", TDEGlobalSettings::generalFont().family() ) ); label = new TQLabel( i18n("Fon&t name:"), page ); label->setBuddy( m_fontName ); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 74d0150..68cccfe 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -163,7 +163,7 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi { int numOfImages = imageDir.count(); const TQString imgGalleryDir = url.directory(); - const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); + const TQString today(TDEGlobal::locale()->formatDate(TQDate::currentDate())); stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl; stream << i18n("<i>Number of images</i>: %1").arg(numOfImages) << "<br/>" << endl; diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index 95abf73..d8015ce 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -108,7 +108,7 @@ void KCMKuick::save() config.sync(); //is it necessary ? if ( dialog->m_chkShow->isChecked() ) { - TQString servicespath = KGlobal::dirs()->saveLocation( "services"); + TQString servicespath = TDEGlobal::dirs()->saveLocation( "services"); TQFile::remove(servicespath+"/kuick_plugin.desktop"); } else { diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 030ac98..76dbd95 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -71,7 +71,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { if ( iconPath.startsWith("./") ) iconPath = _path + '/' + iconPath.mid(2); TQPixmap icon; - icon = KGlobal::iconLoader()->loadIcon(iconPath, + icon = TDEGlobal::iconLoader()->loadIcon(iconPath, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); if(icon.isNull()) @@ -120,8 +120,8 @@ void KDirMenu::slotAboutToShow( ) { return; } - static const TQString& dot = KGlobal::staticQString( "." ); - static const TQString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = TDEGlobal::staticQString( "." ); + static const TQString& dotdot = TDEGlobal::staticQString( ".." ); for ( TQFileInfoListIterator it( *dirList ); *it; ++it ) { TQString fileName = (*it)->fileName(); diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 772f169..1b45791 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -75,7 +75,7 @@ void KTestMenu::slotFileTransfer( const TQString &uid ) { void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... // search for the dummy entry 'kuick_plugin' stores it index reomev it plug copy at the position - KGlobal::locale()->insertCatalogue("kuick_plugin"); + TDEGlobal::locale()->insertCatalogue("kuick_plugin"); bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 6375363..38e5c5d 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { - KGlobal::locale()->insertCatalogue("mf_konqplugin"); + TDEGlobal::locale()->insertCatalogue("mf_konqplugin"); m_part = dynamic_cast<KHTMLPart*>(parent); if (!m_part) { @@ -62,7 +62,7 @@ void KonqMFIcon::waitPartToLoad() { KonqMFIcon::~KonqMFIcon() { - KGlobal::locale()->removeCatalogue("mf_konqplugin"); + TDEGlobal::locale()->removeCatalogue("mf_konqplugin"); delete m_menu; m_menu = 0L; } diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 9460927..82d35eb 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -446,11 +446,11 @@ void SearchBarPlugin::useSearchProvider(int id) void SearchBarPlugin::selectSearchEngines() { - KProcess *process = new KProcess; + TDEProcess *process = new TDEProcess; *process << "kcmshell" << "ebrowsing"; - connect(process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(searchEnginesSelected(KProcess *))); + connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(searchEnginesSelected(TDEProcess *))); if(!process->start()) { @@ -459,7 +459,7 @@ void SearchBarPlugin::selectSearchEngines() } } -void SearchBarPlugin::searchEnginesSelected(KProcess *process) +void SearchBarPlugin::searchEnginesSelected(TDEProcess *process) { if(!process || process->exitStatus() == 0) { diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index 3bd7ba7..fd1f846 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -32,7 +32,7 @@ #include <tqstring.h> class KHTMLPart; -class KProcess; +class TDEProcess; class TQPopupMenu; class TQTimer; @@ -140,7 +140,7 @@ class SearchBarPlugin : public KParts::Plugin void useFindInThisPage(); void useSearchProvider(int); void selectSearchEngines(); - void searchEnginesSelected(KProcess *process); + void searchEnginesSelected(TDEProcess *process); void configurationChanged(); /** diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 6f5d663..d4066c8 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -51,7 +51,7 @@ TQString BookmarkListItem::text( int column ) const if ( column == 0 ) return m_desc; else if ( column == 1 ) - return KGlobal::locale()->formatDateTime( m_dateTime ); + return TDEGlobal::locale()->formatDateTime( m_dateTime ); return TQString(); } diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 7caf899..20aaa26 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -47,7 +47,7 @@ MainWidget::MainWidget( KConfig * config, TQWidget * parent ) { loadTags(); - KIconLoader * il = KGlobal::iconLoader(); + KIconLoader * il = TDEGlobal::iconLoader(); btnRefreshTags->setIconSet( il->loadIconSet( "reload", KIcon::Small ) ); btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) ); @@ -234,7 +234,7 @@ void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) ); tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) ); tagMenu->insertSeparator(); - tagMenu->insertItem( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ), + tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ), i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) ); tagMenu->exec( pos ); @@ -323,7 +323,7 @@ void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos TQPopupMenu * menu = new TQPopupMenu( this ); TQ_CHECK_PTR( menu ); - menu->insertItem( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ), + menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ), i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) ); menu->exec( pos ); diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index b033e92..84843d7 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -71,7 +71,7 @@ extern "C" KDE_EXPORT void* create_konqsidebar_delicious( TDEInstance *instance, TQObject *par, TQWidget *widp, TQString &desktopname, const char *name ) { - KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); + TDEGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); return new KonqSidebarDelicious( instance, par, widp, desktopname, name ); } } diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index ab6463b..fc281b4 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -53,7 +53,7 @@ extern "C" { KDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { - KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); + TDEGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); } } diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 9839fd0..08e38a0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -11,7 +11,7 @@ Metabar::Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQSt KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); - KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); + TDEGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); widget = new MetabarWidget(widgetParent, "metabarwidget"); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 5e5650d..fd8c02b 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -57,7 +57,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int urlList.clear(); urlList.append(url); - TQStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); + TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); KConfig config("metabarrc", true, false); config.setGroup("General"); int maxActions = config.readNumEntry("MaxActions"); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 1ba4f94..87a3d00 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -256,7 +256,7 @@ namespace KSB_News { TQWidget *widp, TQString &desktopname, const char *name) { - KGlobal::locale()->insertCatalogue("konqsidebar_news"); + TDEGlobal::locale()->insertCatalogue("konqsidebar_news"); return new KonqSidebar_News(instance, par, widp, desktopname, name); } } diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index f216c18..f26e064 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -98,7 +98,7 @@ void UAChangerPlugin::parseDescFiles() struct utsname utsn; uname( &utsn ); - TQStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = TDEGlobal::locale()->languageList(); if ( languageList.count() ) { TQStringList::Iterator it = languageList.find(TQFL1("C")); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index c76f56c..a9c6d06 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -85,7 +85,7 @@ void PluginWebArchiver::slotSaveToArchive() archiveName.replace( "/", ""); archiveName = archiveName.replace( TQRegExp("\\s+"), "_"); - archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ; + archiveName = TDEGlobalSettings::documentPath() + "/" + archiveName + ".war" ; KURL url = KFileDialog::getSaveURL(archiveName, i18n("*.war *.tgz|Web Archives"), part->widget(), i18n("Save Page as Web-Archive") ); diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index 1cc7ca1..4f8a0c3 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -87,7 +87,7 @@ void KSig::setupLayout() sigEdit = new KTextEdit(splitter, "sigEdit"); sigEdit->setTextFormat(TQt::PlainText); - sigEdit->setFont(KGlobalSettings::fixedFont()); + sigEdit->setFont(TDEGlobalSettings::fixedFont()); sigEdit->setEnabled(false); sigEdit->setCheckSpellingEnabled(true); @@ -128,7 +128,7 @@ void KSig::loadData() void KSig::readConfig() { setAutoSaveSettings(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); { KConfigGroupSaver saver(config, "Settings"); if(splitter) { @@ -148,7 +148,7 @@ void KSig::readConfig() void KSig::writeConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); { KConfigGroupSaver saver(config, "Settings"); if(splitter) { diff --git a/ksig/siggenerator.cpp b/ksig/siggenerator.cpp index 0bfc4c1..aa2a7f3 100644 --- a/ksig/siggenerator.cpp +++ b/ksig/siggenerator.cpp @@ -28,7 +28,7 @@ SigGenerator::SigGenerator() { - TQString dir = KGlobal::dirs()->saveLocation("appdata"); + TQString dir = TDEGlobal::dirs()->saveLocation("appdata"); TQFile file(dir + "sigs.sigml"); if(file.open(IO_ReadOnly) && doc.setContent(&file)) { @@ -36,7 +36,7 @@ SigGenerator::SigGenerator() file.close(); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); { KConfigGroupSaver saver(config, "Settings"); header = config->readEntry("Header"); diff --git a/ksig/siglistview.cpp b/ksig/siglistview.cpp index 4bbc693..76a440f 100644 --- a/ksig/siglistview.cpp +++ b/ksig/siglistview.cpp @@ -112,7 +112,7 @@ SigListView::SigListView(TQWidget *parent, const char *name) : KListView(parent, { addColumn(i18n("Signatures")); - TQString dir = KGlobal::dirs()->saveLocation("appdata"); + TQString dir = TDEGlobal::dirs()->saveLocation("appdata"); if(!dir.isNull()) file.setName(dir + "sigs.sigml"); load(); diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index 28ae6c3..9bcffc8 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -41,7 +41,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("wakeup"); + TDEGlobal::locale()->insertCatalogue("wakeup"); return new Wakeup(); } @@ -67,7 +67,7 @@ Wakeup::~Wakeup() void Wakeup::update() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Noatun Alarm"); hour[0]=config->readNumEntry("Hour1",7); @@ -287,7 +287,7 @@ void WakeupPrefs::slotViewFrame(int state) void WakeupPrefs::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Noatun Alarm"); config->writeEntry("Monday",monday->isChecked()); config->writeEntry("Tuesday",tuesday->isChecked()); @@ -325,36 +325,36 @@ void WakeupPrefs::save() void WakeupPrefs::load() { - KGlobal::config()->setGroup("Noatun Alarm"); - monday->setChecked(KGlobal::config()->readBoolEntry("Monday",false)); - tuesday->setChecked(KGlobal::config()->readBoolEntry("Tuesday",false)); - wednesday->setChecked(KGlobal::config()->readBoolEntry("Wednesday",false)); - thursday->setChecked(KGlobal::config()->readBoolEntry("Thursday",false)); - friday->setChecked(KGlobal::config()->readBoolEntry("Friday",false)); - saturday->setChecked(KGlobal::config()->readBoolEntry("Saturday",false)); - sunday->setChecked(KGlobal::config()->readBoolEntry("Sunday",false)); - - hour1->setValue(KGlobal::config()->readNumEntry("Hour1",7)); - minute1->setValue(KGlobal::config()->readNumEntry("Minute1",0)); - hour2->setValue(KGlobal::config()->readNumEntry("Hour2",7)); - minute2->setValue(KGlobal::config()->readNumEntry("Minute2",0)); - hour3->setValue(KGlobal::config()->readNumEntry("Hour3",7)); - minute3->setValue(KGlobal::config()->readNumEntry("Minute3",0)); - hour4->setValue(KGlobal::config()->readNumEntry("Hour4",7)); - minute4->setValue(KGlobal::config()->readNumEntry("Minute4",0)); - hour5->setValue(KGlobal::config()->readNumEntry("Hour5",7)); - minute5->setValue(KGlobal::config()->readNumEntry("Minute5",0)); - hour6->setValue(KGlobal::config()->readNumEntry("Hour6",7)); - minute6->setValue(KGlobal::config()->readNumEntry("Minute6",0)); - hour7->setValue(KGlobal::config()->readNumEntry("Hour7",7)); - minute7->setValue(KGlobal::config()->readNumEntry("Minute7",0)); + TDEGlobal::config()->setGroup("Noatun Alarm"); + monday->setChecked(TDEGlobal::config()->readBoolEntry("Monday",false)); + tuesday->setChecked(TDEGlobal::config()->readBoolEntry("Tuesday",false)); + wednesday->setChecked(TDEGlobal::config()->readBoolEntry("Wednesday",false)); + thursday->setChecked(TDEGlobal::config()->readBoolEntry("Thursday",false)); + friday->setChecked(TDEGlobal::config()->readBoolEntry("Friday",false)); + saturday->setChecked(TDEGlobal::config()->readBoolEntry("Saturday",false)); + sunday->setChecked(TDEGlobal::config()->readBoolEntry("Sunday",false)); + + hour1->setValue(TDEGlobal::config()->readNumEntry("Hour1",7)); + minute1->setValue(TDEGlobal::config()->readNumEntry("Minute1",0)); + hour2->setValue(TDEGlobal::config()->readNumEntry("Hour2",7)); + minute2->setValue(TDEGlobal::config()->readNumEntry("Minute2",0)); + hour3->setValue(TDEGlobal::config()->readNumEntry("Hour3",7)); + minute3->setValue(TDEGlobal::config()->readNumEntry("Minute3",0)); + hour4->setValue(TDEGlobal::config()->readNumEntry("Hour4",7)); + minute4->setValue(TDEGlobal::config()->readNumEntry("Minute4",0)); + hour5->setValue(TDEGlobal::config()->readNumEntry("Hour5",7)); + minute5->setValue(TDEGlobal::config()->readNumEntry("Minute5",0)); + hour6->setValue(TDEGlobal::config()->readNumEntry("Hour6",7)); + minute6->setValue(TDEGlobal::config()->readNumEntry("Minute6",0)); + hour7->setValue(TDEGlobal::config()->readNumEntry("Hour7",7)); + minute7->setValue(TDEGlobal::config()->readNumEntry("Minute7",0)); - TQString volend(KGlobal::config()->readEntry("VolumeEnd","80%")); + TQString volend(TDEGlobal::config()->readEntry("VolumeEnd","80%")); volend.truncate(volend.length()-1); volEndValue->setValue(volend.toInt()); - switch (KGlobal::config()->readNumEntry("ModeAlarm",0)) + switch (TDEGlobal::config()->readNumEntry("ModeAlarm",0)) { case 0: alarmmode->setChecked(true); diff --git a/noatun-plugins/alsaplayer/alsaplayerui.cpp b/noatun-plugins/alsaplayer/alsaplayerui.cpp index 1620b78..0cd21a8 100644 --- a/noatun-plugins/alsaplayer/alsaplayerui.cpp +++ b/noatun-plugins/alsaplayer/alsaplayerui.cpp @@ -27,7 +27,7 @@ extern "C" { Plugin * create_plugin() { - KGlobal::locale()->insertCatalogue("alsaplayerui"); + TDEGlobal::locale()->insertCatalogue("alsaplayerui"); return new AlsaPlayer; } } diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 6fd02f8..9271616 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -53,7 +53,7 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) void AlsaPlayerConfigModule::save() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("AlsaPlayerInterface"); c->writeEntry("ScrollTitle", scroll_->isChecked()); c->sync(); @@ -63,7 +63,7 @@ AlsaPlayerConfigModule::save() void AlsaPlayerConfigModule::reopen() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("AlsaPlayerInterface"); scroll_->setChecked(c->readBoolEntry("ScrollTitle", true)); } diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp index a2a9bec..36113ff 100644 --- a/noatun-plugins/charlatan/charlatanui.cpp +++ b/noatun-plugins/charlatan/charlatanui.cpp @@ -27,7 +27,7 @@ extern "C" { Plugin * create_plugin() { - KGlobal::locale()->insertCatalogue("charlatanui"); + TDEGlobal::locale()->insertCatalogue("charlatanui"); return new Charlatan; } } diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp index 3624e0b..08056ae 100644 --- a/noatun-plugins/charlatan/configmodule.cpp +++ b/noatun-plugins/charlatan/configmodule.cpp @@ -53,7 +53,7 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent) void CharlatanConfigModule::save() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("CharlatanInterface"); c->writeEntry("ScrollTitle", scroll_->isChecked()); c->sync(); @@ -63,7 +63,7 @@ CharlatanConfigModule::save() void CharlatanConfigModule::reopen() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("CharlatanInterface"); scroll_->setChecked(c->readBoolEntry("ScrollTitle", true)); } diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index 7f7a41f..b708f02 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -394,7 +394,7 @@ void Charlatan::slotTimeout() void Charlatan::loadConfig() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("CharlatanInterface"); titleLabel_->setScroll(c->readBoolEntry("ScrollTitle", true)); } diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp index 581bbf2..970e9ad 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.cpp +++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp @@ -47,7 +47,7 @@ DubConfigModule::~DubConfigModule() void DubConfigModule::save(void) { - KConfig* config(KGlobal::config()); + KConfig* config(TDEGlobal::config()); config->setGroup("DubPlaylist"); mediaDirectory = prefs->mediaDirectory->url(); @@ -81,7 +81,7 @@ void DubConfigModule::save(void) void DubConfigModule::reopen(void) { kdDebug(90010) << "dubconfig: reopen" << endl; - KConfig* config(KGlobal::config()); + KConfig* config(TDEGlobal::config()); config->setGroup("DubPlaylist"); mediaDirectory = config->readPathEntry("MediaDirectory", "~/"); kdDebug(90010) << "dub: media home is " << mediaDirectory << endl; diff --git a/noatun-plugins/dub/dub/dubplaylist.cpp b/noatun-plugins/dub/dub/dubplaylist.cpp index 6803214..e7e1bef 100644 --- a/noatun-plugins/dub/dub/dubplaylist.cpp +++ b/noatun-plugins/dub/dub/dubplaylist.cpp @@ -26,7 +26,7 @@ // plugin interface extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("dub"); + TDEGlobal::locale()->insertCatalogue("dub"); DubPlaylist* dub = new DubPlaylist; return dub; } diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 9e73104..706ade4 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -16,7 +16,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("ffrs"); + TDEGlobal::locale()->insertCatalogue("ffrs"); return new FFRS(); } diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 1ce874c..1f94dcd 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -178,7 +178,7 @@ void LyricsCModule::queryChanged( const TQString &query ) { void LyricsCModule::save() { - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup( "Lyrics" ); TQStringList queryList, nameList; TQValueVector<SearchProvider>::iterator it; @@ -197,7 +197,7 @@ void LyricsCModule::save() { void LyricsCModule::reopen() { TQStringList queryList, nameList; - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); mProviders.clear(); providersBox->clear(); kdDebug(90020) << "config read" << endl; diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 30d7703..9fa4921 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -16,7 +16,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("lyrics"); + TDEGlobal::locale()->insertCatalogue("lyrics"); return new Lyrics(); } } @@ -69,7 +69,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) setAutoSaveSettings("Lyrics"); /* Load configuration */ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Lyrics"); follow_act->setChecked(config->readBoolEntry("follow", true)); /* Create config object */ @@ -245,7 +245,7 @@ void Lyrics::openURLRequest( const KURL &url, const KParts::URLArgs & ) Lyrics::~Lyrics() { /* Save configurations */ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Lyrics"); config->writeEntry("follow", follow_act->isChecked()); // Force saving, as closeEvent is probably never called diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index e0b3d28..a279d48 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -10,7 +10,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("nexscope"); + TDEGlobal::locale()->insertCatalogue("nexscope"); return new NexPlugin(); } } @@ -18,7 +18,7 @@ Plugin *create_plugin() NexPlugin::NexPlugin() { - connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); } NexPlugin::~NexPlugin() @@ -32,7 +32,7 @@ void NexPlugin::init() // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. - if(!process.start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin | KProcess::Stdout))) + if(!process.start(TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdin | TDEProcess::Stdout))) { KMessageBox::error(0, i18n("Unable to start noatunNex. Check your installation.")); unload(); @@ -40,7 +40,7 @@ void NexPlugin::init() } -void NexPlugin::processExited(KProcess *) +void NexPlugin::processExited(TDEProcess *) { unload(); } diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h index ad3e6e1..56cc21b 100644 --- a/noatun-plugins/nexscope/noatunplugin.h +++ b/noatun-plugins/nexscope/noatunplugin.h @@ -16,10 +16,10 @@ public: void init(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); private: - KProcess process; + TDEProcess process; }; diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp index aacb765..ec3485e 100644 --- a/noatun-plugins/oblique/kdatacollection.cpp +++ b/noatun-plugins/oblique/kdatacollection.cpp @@ -57,7 +57,7 @@ KDataCollection::KDataCollection(KConfig *config, const TQString &dir) KDataCollection::KDataCollection(const TQString &dir) { - init(KGlobal::config(), "KDataCollection", dir, "appdata", dir); + init(TDEGlobal::config(), "KDataCollection", dir, "appdata", dir); } void KDataCollection::init( @@ -78,7 +78,7 @@ TQStringList KDataCollection::names() const // these are the entries I have TQStringList n = g.readListEntry(mEntry); - TQStringList fs = KGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); + TQStringList fs = TDEGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); TQStringList total; for (TQStringList::Iterator i(fs.begin()); i != fs.end(); ++i) @@ -126,9 +126,9 @@ TQString KDataCollection::file(const TQString &name, bool create) TQString KDataCollection::saveFile(const TQString &name, bool create) { - if (!KGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name)) + if (!TDEGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name)) { - TQString s = KGlobal::dirs()->saveLocation(mDatadir, mDir, create); + TQString s = TDEGlobal::dirs()->saveLocation(mDatadir, mDir, create); if (s.length() && create) { diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h index 15cb98e..6230ddb 100644 --- a/noatun-plugins/oblique/kdatacollection.h +++ b/noatun-plugins/oblique/kdatacollection.h @@ -94,7 +94,7 @@ public: KDataCollection(KConfig *config, const TQString &dir); /** - * constructor. the KConfig is assumed to be KGlobal::config() + * constructor. the KConfig is assumed to be TDEGlobal::config() * * otherwise the same as the previous function **/ diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index 234833a..4b2b543 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -30,7 +30,7 @@ Oblique::Oblique() mView = 0; mAdder = 0; - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); mBase = new Base(::locate("data", "noatun/")+"/oblique-list"); diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 0087b99..b8909a1 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -478,7 +478,7 @@ Tree::Tree(Oblique *oblique, TQWidget *parent) mSlice = oblique->base()->defaultSlice(); - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); mFileOfQuery = g.readEntry("schema", "standard"); if (!setSchema(mFileOfQuery)) { diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 073873c..15b15e5 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -89,10 +89,10 @@ View::View(Oblique *oblique) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); - applyMainWindowSettings(KGlobal::config(), "Oblique View"); + applyMainWindowSettings(TDEGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); TQStringList tabids = g.readListEntry("tabids"); for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i) @@ -142,14 +142,14 @@ View::~View() tabids.append(t); } - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); g.writeEntry("tabids", tabids); g.sync(); } void View::configureToolBars() { - saveMainWindowSettings(KGlobal::config(), "Oblique View"); + saveMainWindowSettings(TDEGlobal::config(), "Oblique View"); KEditToolbar dlg(actionCollection(), "obliqueui.rc"); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); @@ -158,7 +158,7 @@ void View::configureToolBars() void View::newToolBarConfig() { createGUI("obliqueui.rc"); - applyMainWindowSettings(KGlobal::config(), "Oblique View"); + applyMainWindowSettings(TDEGlobal::config(), "Oblique View"); } void View::closeEvent(TQCloseEvent*) diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index 17d8e51..385ce53 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -27,7 +27,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("pitchablespeed"); + TDEGlobal::locale()->insertCatalogue("pitchablespeed"); return new PitchableSpeed(); } } diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index 5b881fd..5d64685 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -62,7 +62,7 @@ void SynaePrefs::save() if(!changed) return; - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup("Synaescope"); c->writeEntry("xResolution", xRes->value()); c->writeEntry("yResolution", yRes->value()); @@ -73,7 +73,7 @@ void SynaePrefs::save() void SynaePrefs::reopen() { // kdDebug(66666) << k_funcinfo << endl; - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup("Synaescope"); xRes->setValue(c->readNumEntry("xResolution", 320)); diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp index 16a6a2e..a401704 100644 --- a/noatun-plugins/synaescope/synaescope.cpp +++ b/noatun-plugins/synaescope/synaescope.cpp @@ -17,7 +17,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("synaescope"); + TDEGlobal::locale()->insertCatalogue("synaescope"); return new SynaeScope(); } } @@ -26,12 +26,12 @@ SynaeScope::SynaeScope() : Plugin(), scopeExePath(0) { kdDebug(66666) << k_funcinfo << endl; restarting=false; - connect(&process, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(processExited(KProcess *))); - connect(&process, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), - this, TQT_SLOT(receivedStdout(KProcess *,char *,int))); - connect(&process, TQT_SIGNAL(receivedStderr(KProcess *,char *,int)), - this, TQT_SLOT(receivedStderr(KProcess *,char *,int))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this, TQT_SLOT(receivedStdout(TDEProcess *,char *,int))); + connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this, TQT_SLOT(receivedStderr(TDEProcess *,char *,int))); } SynaeScope::~SynaeScope() @@ -63,7 +63,7 @@ void SynaeScope::init() void SynaeScope::runScope() { kdDebug(66666) << k_funcinfo << endl; - if(!process.start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin | KProcess::Stdout))) + if(!process.start(TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdin | TDEProcess::Stdout))) { KMessageBox::error(0, i18n("Unable to start noatunsynaescope. Check your installation.")); unload(); @@ -81,7 +81,7 @@ void SynaeScope::readConfig() process.kill(); } -void SynaeScope::processExited(KProcess *) +void SynaeScope::processExited(TDEProcess *) { kdDebug(66666) << k_funcinfo << endl; if(restarting) @@ -95,13 +95,13 @@ void SynaeScope::processExited(KProcess *) } } -void SynaeScope::receivedStdout(KProcess *, char *buf, int len) +void SynaeScope::receivedStdout(TDEProcess *, char *buf, int len) { TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; } -void SynaeScope::receivedStderr(KProcess *, char *buf, int len) +void SynaeScope::receivedStderr(TDEProcess *, char *buf, int len) { TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h index 2579151..e62fbe0 100644 --- a/noatun-plugins/synaescope/synaescope.h +++ b/noatun-plugins/synaescope/synaescope.h @@ -12,7 +12,7 @@ #include <kprocess.h> class SynaePrefs; -class KProcess; +class TDEProcess; class SynaeScope : public TQObject, public Plugin { @@ -27,13 +27,13 @@ public: void runScope(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); void readConfig(); - void receivedStdout(KProcess *, char *buf, int len); - void receivedStderr(KProcess *, char *buf, int len); + void receivedStdout(TDEProcess *, char *buf, int len); + void receivedStderr(TDEProcess *, char *buf, int len); private: - KProcess process; + TDEProcess process; TQString scopeExePath; bool restarting; SynaePrefs *mPrefs; diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index 9a0fb1b..9435408 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -21,7 +21,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("tippecanoe"); + TDEGlobal::locale()->insertCatalogue("tippecanoe"); return new SynaeScope(); } @@ -45,20 +45,20 @@ SynaeScope::SynaeScope() SynaeScope::~SynaeScope() { - connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); napp->pluginMenuRemove(pluginMenuItem); } void SynaeScope::init() { - connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(read(KProcess *, char *, int))); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int))); pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void))); process << KStandardDirs::findExe("noatuntippecanoe.bin"); // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. - if(!process.start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin | KProcess::Stdout))) + if(!process.start(TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdin | TDEProcess::Stdout))) { KMessageBox::error(0, i18n("Unable to start noatuntippecanoe.bin. Check your installation.")); unload(); @@ -79,7 +79,7 @@ void SynaeScope::scopeEvent(float *left, float *right, int size) } } -void SynaeScope::read(KProcess *, char *buf, int) +void SynaeScope::read(TDEProcess *, char *buf, int) { TQString num = TQString::fromLatin1(buf); num = num.left(num.find(TQRegExp("\\s"))); @@ -87,7 +87,7 @@ void SynaeScope::read(KProcess *, char *buf, int) embed->embed(id); } -void SynaeScope::processExited(KProcess *) +void SynaeScope::processExited(TDEProcess *) { unload(); } diff --git a/noatun-plugins/tippercanoe/synaescope.h b/noatun-plugins/tippercanoe/synaescope.h index e1e6ef0..5270f9b 100644 --- a/noatun-plugins/tippercanoe/synaescope.h +++ b/noatun-plugins/tippercanoe/synaescope.h @@ -28,9 +28,9 @@ public: void init(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); void toggle(void); - void read(KProcess *, char *, int); + void read(TDEProcess *, char *, int); protected: virtual void scopeEvent(float *left, float *right, int bands); @@ -38,7 +38,7 @@ protected: private: char *mBuffer; static const int bufferSize=512; - KProcess process; + TDEProcess process; int pluginMenuItem; QXEmbed *embed; WId id; diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp index c641bc0..cd61992 100644 --- a/noatun-plugins/tyler/file.cpp +++ b/noatun-plugins/tyler/file.cpp @@ -28,14 +28,14 @@ extern "C" static TQString getDataPath(void) { - KStandardDirs &dirs = *KGlobal::dirs(); + KStandardDirs &dirs = *TDEGlobal::dirs(); return dirs.findResource("data", "noatun/tylerstates"); } static TQString getSavePath(void) { - KStandardDirs &dirs = *KGlobal::dirs(); + KStandardDirs &dirs = *TDEGlobal::dirs(); return dirs.saveLocation("data", "noatun/") + "tylerstates"; } diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp index ad00cac..39be621 100644 --- a/noatun-plugins/tyler/tyler.cpp +++ b/noatun-plugins/tyler/tyler.cpp @@ -14,7 +14,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("tyler"); + TDEGlobal::locale()->insertCatalogue("tyler"); return new Tyler(); } @@ -37,11 +37,11 @@ Tyler::~Tyler() void Tyler::init() { process << KStandardDirs::findExe("noatuntyler.bin"); - connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. - if(!process.start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin | KProcess::Stdout))) + if(!process.start(TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdin | TDEProcess::Stdout))) { KMessageBox::error(0, i18n("Unable to start noatuntyler.bin. Check your installation.")); unload(); @@ -64,7 +64,7 @@ void Tyler::scopeEvent(float *left, float *right, int size) } } -void Tyler::processExited(KProcess *) +void Tyler::processExited(TDEProcess *) { unload(); } diff --git a/noatun-plugins/tyler/tyler.h b/noatun-plugins/tyler/tyler.h index 08b5bb2..2ae1ac9 100644 --- a/noatun-plugins/tyler/tyler.h +++ b/noatun-plugins/tyler/tyler.h @@ -21,7 +21,7 @@ public: void init(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); protected: virtual void scopeEvent(float *left, float *right, int bands); @@ -29,7 +29,7 @@ protected: private: char *mBuffer; static const int bufferSize; - KProcess process; + TDEProcess process; }; #endif diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index 0667951..b20ec1e 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -44,7 +44,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("wavecapture"); + TDEGlobal::locale()->insertCatalogue("wavecapture"); return new WaveCapture(); } } |