From 6d3902bd20c24613b2f13f5c04294ff83f104006 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:18:58 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/bookmarkselector.cpp | 6 +++--- src/dolphincontextmenu.cpp | 2 +- src/dolphindetailsview.cpp | 2 +- src/dolphindetailsviewsettings.cpp | 2 +- src/dolphiniconsviewsettings.cpp | 2 +- src/dolphinsettings.cpp | 4 ++-- src/iconsviewsettingspage.cpp | 2 +- src/infosidebarpage.cpp | 8 ++++---- src/statusbarmessagelabel.cpp | 2 +- src/statusbarspaceinfo.cpp | 8 ++++---- src/urlnavigatorbutton.cpp | 6 +++--- src/viewproperties.cpp | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp index 7272aac..c9fee79 100644 --- a/src/bookmarkselector.cpp +++ b/src/bookmarkselector.cpp @@ -128,12 +128,12 @@ void BookmarkSelector::drawButton(TQPainter* painter) const bool isHighlighted = isDisplayHintEnabled(EnteredHint) || isDisplayHintEnabled(DraggedHint); if (isHighlighted) { - backgroundColor = KGlobalSettings::highlightColor(); - foregroundColor = KGlobalSettings::highlightedTextColor(); + backgroundColor = TDEGlobalSettings::highlightColor(); + foregroundColor = TDEGlobalSettings::highlightedTextColor(); } else { backgroundColor = colorGroup().background(); - foregroundColor = KGlobalSettings::buttonTextColor(); + foregroundColor = TDEGlobalSettings::buttonTextColor(); } // dimm the colors if the parent view does not have the focus diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 3d7f68f..43ac5ea 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -357,7 +357,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, int actionsIndex = 0; - TQStringList dirs = KGlobal::dirs()->findDirs("data", "d3lphin/servicemenus/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "d3lphin/servicemenus/"); KPopupMenu* menu = 0; for (TQStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index c24ed4c..8c1077d 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -750,7 +750,7 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, if (column < listView()->columns() - 1) { // draw a separator between columns - painter->setPen(KGlobalSettings::buttonBackground()); + painter->setPen(TDEGlobalSettings::buttonBackground()); painter->drawLine(cellWidth - 1, 0, cellWidth - 1, height() - 1); } } diff --git a/src/dolphindetailsviewsettings.cpp b/src/dolphindetailsviewsettings.cpp index 5575ebc..eda6043 100644 --- a/src/dolphindetailsviewsettings.cpp +++ b/src/dolphindetailsviewsettings.cpp @@ -53,7 +53,7 @@ DolphinDetailsViewSettings::DolphinDetailsViewSettings() : m_fontSize = config->readNumEntry("Font Size", -1); m_fontFamily = config->readEntry("Font Family"); - const TQFont font(KGlobalSettings::generalFont()); + const TQFont font(TDEGlobalSettings::generalFont()); if (m_fontSize < 0) { m_fontSize = font.pointSize(); } diff --git a/src/dolphiniconsviewsettings.cpp b/src/dolphiniconsviewsettings.cpp index 1affc38..5fa4960 100644 --- a/src/dolphiniconsviewsettings.cpp +++ b/src/dolphiniconsviewsettings.cpp @@ -79,7 +79,7 @@ DolphinIconsViewSettings::DolphinIconsViewSettings(DolphinIconsView::LayoutMode m_fontSize = config->readNumEntry("Font Size", -1); m_fontFamily = config->readEntry("Font Family"); - const TQFont font(KGlobalSettings::generalFont()); + const TQFont font(TDEGlobalSettings::generalFont()); if (m_fontSize < 0) { m_fontSize = font.pointSize(); } diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp index 1b13d2b..8c26889 100644 --- a/src/dolphinsettings.cpp +++ b/src/dolphinsettings.cpp @@ -109,7 +109,7 @@ DolphinIconsViewSettings* DolphinSettings::iconsView(DolphinIconsView::LayoutMod KBookmarkManager* DolphinSettings::bookmarkManager() const { - TQString basePath = KGlobal::instance()->instanceName(); + TQString basePath = TDEGlobal::instance()->instanceName(); basePath.append("/bookmarks.xml"); const TQString file = locateLocal("data", basePath); @@ -133,7 +133,7 @@ void DolphinSettings::save() m_leftsidebar->save(); m_rightsidebar->save(); - TQString basePath = KGlobal::instance()->instanceName(); + TQString basePath = TDEGlobal::instance()->instanceName(); basePath.append("/bookmarks.xml"); const TQString file = locateLocal( "data", basePath); diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 570b961..02a6ec1 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -70,7 +70,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setMargin(margin); - const TQColor iconBackgroundColor(KGlobalSettings::baseColor()); + const TQColor iconBackgroundColor(TDEGlobalSettings::baseColor()); TQHBox* iconSizeVBox = new TQHBox(iconSizeGroup); iconSizeVBox->setSpacing(spacing); diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 8efcba5..f713bd1 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -435,7 +435,7 @@ void InfoSidebarPage::insertActions() // 'itemList' contains now all KFileItems, where an item information should be shown. // TODO: the following algorithm is quite equal to DolphinContextMenu::insertActionItems(). // It's open yet whether they should be merged or whether they have to work slightly different. - TQStringList dirs = KGlobal::dirs()->findDirs("data", "d3lphin/servicemenus/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "d3lphin/servicemenus/"); for (TQStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { TQDir dir(*dirIt); TQStringList entries = dir.entryList("*.desktop", TQDir::Files); @@ -553,12 +553,12 @@ void ServiceButton::drawButton(TQPainter* painter) TQColor backgroundColor; TQColor foregroundColor; if (m_hover) { - backgroundColor = KGlobalSettings::highlightColor(); - foregroundColor = KGlobalSettings::highlightedTextColor(); + backgroundColor = TDEGlobalSettings::highlightColor(); + foregroundColor = TDEGlobalSettings::highlightedTextColor(); } else { backgroundColor = colorGroup().background(); - foregroundColor = KGlobalSettings::buttonTextColor(); + foregroundColor = TDEGlobalSettings::buttonTextColor(); } // draw button background diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index c79fc44..42fbf2f 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -109,7 +109,7 @@ void StatusBarMessageLabel::paintEvent(TQPaintEvent* /* event */) // draw background TQColor backgroundColor(colorGroup().background()); - TQColor foregroundColor(KGlobalSettings::textColor()); + TQColor foregroundColor(TDEGlobalSettings::textColor()); if (m_illumination > 0) { backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination); foregroundColor = mixColors(foregroundColor, TQColor(0, 0, 0), m_illumination); diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index 16eb36b..a93deeb 100644 --- a/src/statusbarspaceinfo.cpp +++ b/src/statusbarspaceinfo.cpp @@ -65,13 +65,13 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */) const int widthDec = 3; // visual decrement for the available width const TQColor c1 = colorGroup().background(); - const TQColor c2 = KGlobalSettings::buttonTextColor(); + const TQColor c2 = TDEGlobalSettings::buttonTextColor(); const TQColor frameColor((c1.red() + c2.red()) / 2, (c1.green() + c2.green()) / 2, (c1.blue() + c2.blue()) / 2); painter.setPen(frameColor); - const TQColor backgrColor = KGlobalSettings::baseColor(); + const TQColor backgrColor = TDEGlobalSettings::baseColor(); painter.setBrush(backgrColor); painter.drawRect(TQRect(0, barTop + 1 , barWidth - widthDec, barHeight)); @@ -103,7 +103,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */) } // draw text (usually 'Y GB free') - painter.setPen(KGlobalSettings::textColor()); + painter.setPen(TDEGlobalSettings::textColor()); painter.drawText(TQRect(1, 1, barWidth - 2, barHeight + 4), TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak, text); @@ -166,7 +166,7 @@ void StatusBarSpaceInfo::refresh() TQColor StatusBarSpaceInfo::progressColor(const TQColor& bgColor) const { - TQColor color = KGlobalSettings::buttonBackground(); + TQColor color = TDEGlobalSettings::buttonBackground(); // assure that enough contrast is given between the background color // and the progressbar color diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp index 64064bb..ae97d46 100644 --- a/src/urlnavigatorbutton.cpp +++ b/src/urlnavigatorbutton.cpp @@ -100,12 +100,12 @@ void URLNavigatorButton::drawButton(TQPainter* painter) isDisplayHintEnabled(DraggedHint) || isDisplayHintEnabled(PopupActiveHint); if (isHighlighted) { - backgroundColor = KGlobalSettings::highlightColor(); - foregroundColor = KGlobalSettings::highlightedTextColor(); + backgroundColor = TDEGlobalSettings::highlightColor(); + foregroundColor = TDEGlobalSettings::highlightedTextColor(); } else { backgroundColor = colorGroup().background(); - foregroundColor = KGlobalSettings::buttonTextColor(); + foregroundColor = TDEGlobalSettings::buttonTextColor(); } // dimm the colors if the parent view does not have the focus diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index 0d34dd4..4517a7d 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -55,14 +55,14 @@ ViewProperties::ViewProperties(KURL url) : TQFileInfo info(m_filepath); if (!info.isWritable()) { - TQString basePath = KGlobal::instance()->instanceName(); + TQString basePath = TDEGlobal::instance()->instanceName(); basePath.append("/view_properties/local"); rootDir = locateLocal("data", basePath); m_filepath = rootDir + m_filepath; } } else { - TQString basePath = KGlobal::instance()->instanceName(); + TQString basePath = TDEGlobal::instance()->instanceName(); basePath.append("/view_properties/remote/").append(url.host()); rootDir = locateLocal("data", basePath); m_filepath = rootDir + m_filepath; -- cgit v1.2.1