diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/keditbookmarks | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/keditbookmarks')
| -rw-r--r-- | konqueror/keditbookmarks/toplevel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index f96ab6cd6..8ae218611 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -185,8 +185,8 @@ TQString CurrentMgr::makeTimeStr(int b) TQDateTime dt; dt.setTime_t(b); return (dt.daysTo(TQDateTime::currentDateTime()) > 31) - ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) - : KGlobal::locale()->formatDateTime(dt, false); + ? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) + : TDEGlobal::locale()->formatDateTime(dt, false); } /* -------------------------- */ @@ -252,7 +252,7 @@ KEBApp::KEBApp( ListView::self()->connectSignals(); - KGlobal::locale()->insertCatalogue("libkonq"); + TDEGlobal::locale()->insertCatalogue("libkonq"); m_canPaste = false; @@ -337,7 +337,7 @@ void KEBApp::notifyCommandExecuted() { /* -------------------------- */ void KEBApp::slotConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), "MainWindow"); + saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() )); @@ -347,7 +347,7 @@ void KEBApp::slotConfigureToolbars() { void KEBApp::slotNewToolbarConfig() { // called when OK or Apply is clicked createGUI(); - applyMainWindowSettings(KGlobal::config(), "MainWindow"); + applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } /* -------------------------- */ |