From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/editorproxy.cpp | 2 +- src/generalinfowidget.cpp | 8 ++++---- src/mainwindowshare.cpp | 8 ++++---- src/profileengine/editor/profileeditor.cpp | 2 +- src/profileengine/lib/profile.cpp | 6 +++--- src/profileengine/lib/profileengine.cpp | 2 +- src/projectmanager.cpp | 4 ++-- src/simplemainwindow.cpp | 4 ++-- src/splashscreen.cpp | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index ee2db5bc..ef5fede9 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -125,7 +125,7 @@ void EditorProxy::installPopup( KParts::Part * part ) KAction * action = NULL; //If there is a tab for this file, we don't need to plug the closing menu entries here - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("UI"); bool m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); if (!m_tabBarShown) diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index 99330c1b..d84bc1e8 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -56,7 +56,7 @@ void GeneralInfoWidget::readConfig() { TQStringList encodings; encodings << i18n("Use global editor settings"); - encodings += KGlobal::charsets()->descriptiveEncodingNames(); + encodings += TDEGlobal::charsets()->descriptiveEncodingNames(); TQStringList::const_iterator it = encodings.constBegin(); while ( it != encodings.constEnd() ) { @@ -65,11 +65,11 @@ void GeneralInfoWidget::readConfig() { } encoding_combo->setCurrentItem( 0 ); -// const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) ); +// const TQString DefaultEncoding = TDEGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) ); const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ); for ( int i = 0; i < encoding_combo->count(); i++ ) { - if ( KGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding ) + if ( TDEGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding ) { encoding_combo->setCurrentItem( i ); break; @@ -192,7 +192,7 @@ void GeneralInfoWidget::writeConfig() { TQString DefaultEncoding = TQString(); if ( encoding_combo->currentItem() > 0 ) { - DefaultEncoding = KGlobal::charsets()->encodingForName( encoding_combo->currentText() ); + DefaultEncoding = TDEGlobal::charsets()->encodingForName( encoding_combo->currentText() ); } DomUtil::writeEntry( m_projectDom, "/general/defaultencoding", DefaultEncoding ); } diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 6386f211..7046c679 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -186,7 +186,7 @@ void MainWindowShare::createActions() void MainWindowShare::slotReportBug() { - KBugReport a(m_pMainWnd, true, KGlobal::instance()->aboutData() ); + KBugReport a(m_pMainWnd, true, TDEGlobal::instance()->aboutData() ); a.exec(); } @@ -285,7 +285,7 @@ void MainWindowShare::slotShowMenuBar() } else { m_pMainWnd->menuBar()->show(); } - m_pMainWnd->saveMainWindowSettings( KGlobal::config(), "Mainwindow" ); + m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); } void MainWindowShare::slotConfigureNotifications() @@ -384,7 +384,7 @@ void MainWindowShare::slotNewToolbarConfig() { // replug actionlists here... - m_pMainWnd->applyMainWindowSettings( KGlobal::config(), "Mainwindow" ); + m_pMainWnd->applyMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); // PartController::getInstance()->reinstallPopups(); } @@ -427,7 +427,7 @@ void MainWindowShare::slotKeyBindings() void MainWindowShare::slotConfigureToolbars() { - m_pMainWnd->saveMainWindowSettings( KGlobal::config(), "Mainwindow" ); + m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); KEditToolbar dlg( m_pMainWnd->factory() ); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 435e9986..78ed451d 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -73,7 +73,7 @@ public: { TQColorGroup cgNew = cg; if (m_derived) - cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); + cgNew.setColor(TQColorGroup::Text, TDEGlobalSettings::inactiveTextColor()); KListViewItem::paintCell(p, cgNew, column, width, alignment); } diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index 68666f3a..4a75b387 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -165,7 +165,7 @@ bool Profile::hasInEntryList(EntryList &list, TQString value) bool Profile::remove() { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName()); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName()); if ((dirs.count() == 1) && dirs[0].startsWith(TQDir::homeDirPath())) return KIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0); return false; @@ -180,7 +180,7 @@ void Profile::detachFromParent() KURL::List Profile::resources(const TQString &nameFilter) { TQStringList resources; - TQStringList resourceDirs = KGlobal::dirs()->resourceDirs("data"); + TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs("data"); for (TQStringList::const_iterator it = resourceDirs.begin(); it != resourceDirs.end(); ++it) { TQString dir = *it; @@ -200,6 +200,6 @@ KURL::List Profile::resources(const TQString &nameFilter) void Profile::addResource(const KURL &url) { - TQString saveLocation = KGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true); + TQString saveLocation = TDEGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true); KIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true); } diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index 6664aba9..78df6789 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -29,7 +29,7 @@ ProfileEngine::ProfileEngine() { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdevelop/profiles"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles"); m_rootProfile = new Profile(0, "KDevelop"); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 91d4d59a..cf545ac9 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -618,7 +618,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) return false; } - TQString cmd = KGlobal::dirs()->findExe( "kdevprj2tdevelop" ); + TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" ); if (cmd.isEmpty()) { KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed.")); return false; @@ -629,7 +629,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) KShellProcess proc( "/bin/sh" ); proc.setWorkingDirectory( fileInfo.dirPath(true) ); proc << "perl" << cmd << KShellProcess::quote( url.path() ); - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".tdevelop"; return loadProject( KURL(projectFile) ); diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 3f1c3d4a..4e96785d 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -666,7 +666,7 @@ void SimpleMainWindow::tabContextActivated(int id) void SimpleMainWindow::configureToolbars() { - saveMainWindowSettings(KGlobal::config(), "SimpleMainWindow"); + saveMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); KEditToolbar dlg(factory()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); @@ -676,7 +676,7 @@ void SimpleMainWindow::slotNewToolbarConfig() { // setupWindowMenu(); m_mainWindowShare->slotGUICreated(PartController::getInstance()->activePart()); - applyMainWindowSettings(KGlobal::config(), "SimpleMainWindow"); + applyMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); } bool SimpleMainWindow::queryClose() diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 22ffcf9d..4ec02322 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -67,7 +67,7 @@ void KDevSplashScreen::drawContents (TQPainter* painter) } painter->setPen(TQColor(74,112,18)); - TQFont fnt(KGlobalSettings::generalFont()); + TQFont fnt(TDEGlobalSettings::generalFont()); fnt.setPointSize(8); painter->setFont(fnt); -- cgit v1.2.1