Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 87346b386f
commit 6d3902bd20

@ -128,12 +128,12 @@ void BookmarkSelector::drawButton(TQPainter* painter)
const bool isHighlighted = isDisplayHintEnabled(EnteredHint) || const bool isHighlighted = isDisplayHintEnabled(EnteredHint) ||
isDisplayHintEnabled(DraggedHint); isDisplayHintEnabled(DraggedHint);
if (isHighlighted) { if (isHighlighted) {
backgroundColor = KGlobalSettings::highlightColor(); backgroundColor = TDEGlobalSettings::highlightColor();
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = TDEGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = colorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = TDEGlobalSettings::buttonTextColor();
} }
// dimm the colors if the parent view does not have the focus // dimm the colors if the parent view does not have the focus

@ -357,7 +357,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup,
int actionsIndex = 0; int actionsIndex = 0;
TQStringList dirs = KGlobal::dirs()->findDirs("data", "d3lphin/servicemenus/"); TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "d3lphin/servicemenus/");
KPopupMenu* menu = 0; KPopupMenu* menu = 0;
for (TQStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { for (TQStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) {

@ -750,7 +750,7 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter,
if (column < listView()->columns() - 1) { if (column < listView()->columns() - 1) {
// draw a separator between columns // draw a separator between columns
painter->setPen(KGlobalSettings::buttonBackground()); painter->setPen(TDEGlobalSettings::buttonBackground());
painter->drawLine(cellWidth - 1, 0, cellWidth - 1, height() - 1); painter->drawLine(cellWidth - 1, 0, cellWidth - 1, height() - 1);
} }
} }

@ -53,7 +53,7 @@ DolphinDetailsViewSettings::DolphinDetailsViewSettings() :
m_fontSize = config->readNumEntry("Font Size", -1); m_fontSize = config->readNumEntry("Font Size", -1);
m_fontFamily = config->readEntry("Font Family"); m_fontFamily = config->readEntry("Font Family");
const TQFont font(KGlobalSettings::generalFont()); const TQFont font(TDEGlobalSettings::generalFont());
if (m_fontSize < 0) { if (m_fontSize < 0) {
m_fontSize = font.pointSize(); m_fontSize = font.pointSize();
} }

@ -79,7 +79,7 @@ DolphinIconsViewSettings::DolphinIconsViewSettings(DolphinIconsView::LayoutMode
m_fontSize = config->readNumEntry("Font Size", -1); m_fontSize = config->readNumEntry("Font Size", -1);
m_fontFamily = config->readEntry("Font Family"); m_fontFamily = config->readEntry("Font Family");
const TQFont font(KGlobalSettings::generalFont()); const TQFont font(TDEGlobalSettings::generalFont());
if (m_fontSize < 0) { if (m_fontSize < 0) {
m_fontSize = font.pointSize(); m_fontSize = font.pointSize();
} }

@ -109,7 +109,7 @@ DolphinIconsViewSettings* DolphinSettings::iconsView(DolphinIconsView::LayoutMod
KBookmarkManager* DolphinSettings::bookmarkManager() const KBookmarkManager* DolphinSettings::bookmarkManager() const
{ {
TQString basePath = KGlobal::instance()->instanceName(); TQString basePath = TDEGlobal::instance()->instanceName();
basePath.append("/bookmarks.xml"); basePath.append("/bookmarks.xml");
const TQString file = locateLocal("data", basePath); const TQString file = locateLocal("data", basePath);
@ -133,7 +133,7 @@ void DolphinSettings::save()
m_leftsidebar->save(); m_leftsidebar->save();
m_rightsidebar->save(); m_rightsidebar->save();
TQString basePath = KGlobal::instance()->instanceName(); TQString basePath = TDEGlobal::instance()->instanceName();
basePath.append("/bookmarks.xml"); basePath.append("/bookmarks.xml");
const TQString file = locateLocal( "data", basePath); const TQString file = locateLocal( "data", basePath);

@ -70,7 +70,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setSizePolicy(sizePolicy);
iconSizeGroup->setMargin(margin); iconSizeGroup->setMargin(margin);
const TQColor iconBackgroundColor(KGlobalSettings::baseColor()); const TQColor iconBackgroundColor(TDEGlobalSettings::baseColor());
TQHBox* iconSizeVBox = new TQHBox(iconSizeGroup); TQHBox* iconSizeVBox = new TQHBox(iconSizeGroup);
iconSizeVBox->setSpacing(spacing); iconSizeVBox->setSpacing(spacing);

@ -435,7 +435,7 @@ void InfoSidebarPage::insertActions()
// 'itemList' contains now all KFileItems, where an item information should be shown. // 'itemList' contains now all KFileItems, where an item information should be shown.
// TODO: the following algorithm is quite equal to DolphinContextMenu::insertActionItems(). // 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. // 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) { for (TQStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) {
TQDir dir(*dirIt); TQDir dir(*dirIt);
TQStringList entries = dir.entryList("*.desktop", TQDir::Files); TQStringList entries = dir.entryList("*.desktop", TQDir::Files);
@ -553,12 +553,12 @@ void ServiceButton::drawButton(TQPainter* painter)
TQColor backgroundColor; TQColor backgroundColor;
TQColor foregroundColor; TQColor foregroundColor;
if (m_hover) { if (m_hover) {
backgroundColor = KGlobalSettings::highlightColor(); backgroundColor = TDEGlobalSettings::highlightColor();
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = TDEGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = colorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = TDEGlobalSettings::buttonTextColor();
} }
// draw button background // draw button background

@ -109,7 +109,7 @@ void StatusBarMessageLabel::paintEvent(TQPaintEvent* /* event */)
// draw background // draw background
TQColor backgroundColor(colorGroup().background()); TQColor backgroundColor(colorGroup().background());
TQColor foregroundColor(KGlobalSettings::textColor()); TQColor foregroundColor(TDEGlobalSettings::textColor());
if (m_illumination > 0) { if (m_illumination > 0) {
backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination); backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination);
foregroundColor = mixColors(foregroundColor, TQColor(0, 0, 0), m_illumination); foregroundColor = mixColors(foregroundColor, TQColor(0, 0, 0), m_illumination);

@ -65,13 +65,13 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */)
const int widthDec = 3; // visual decrement for the available width const int widthDec = 3; // visual decrement for the available width
const TQColor c1 = colorGroup().background(); const TQColor c1 = colorGroup().background();
const TQColor c2 = KGlobalSettings::buttonTextColor(); const TQColor c2 = TDEGlobalSettings::buttonTextColor();
const TQColor frameColor((c1.red() + c2.red()) / 2, const TQColor frameColor((c1.red() + c2.red()) / 2,
(c1.green() + c2.green()) / 2, (c1.green() + c2.green()) / 2,
(c1.blue() + c2.blue()) / 2); (c1.blue() + c2.blue()) / 2);
painter.setPen(frameColor); painter.setPen(frameColor);
const TQColor backgrColor = KGlobalSettings::baseColor(); const TQColor backgrColor = TDEGlobalSettings::baseColor();
painter.setBrush(backgrColor); painter.setBrush(backgrColor);
painter.drawRect(TQRect(0, barTop + 1 , barWidth - widthDec, barHeight)); painter.drawRect(TQRect(0, barTop + 1 , barWidth - widthDec, barHeight));
@ -103,7 +103,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */)
} }
// draw text (usually 'Y GB free') // draw text (usually 'Y GB free')
painter.setPen(KGlobalSettings::textColor()); painter.setPen(TDEGlobalSettings::textColor());
painter.drawText(TQRect(1, 1, barWidth - 2, barHeight + 4), painter.drawText(TQRect(1, 1, barWidth - 2, barHeight + 4),
TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak, TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak,
text); text);
@ -166,7 +166,7 @@ void StatusBarSpaceInfo::refresh()
TQColor StatusBarSpaceInfo::progressColor(const TQColor& bgColor) const 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 // assure that enough contrast is given between the background color
// and the progressbar color // and the progressbar color

@ -100,12 +100,12 @@ void URLNavigatorButton::drawButton(TQPainter* painter)
isDisplayHintEnabled(DraggedHint) || isDisplayHintEnabled(DraggedHint) ||
isDisplayHintEnabled(PopupActiveHint); isDisplayHintEnabled(PopupActiveHint);
if (isHighlighted) { if (isHighlighted) {
backgroundColor = KGlobalSettings::highlightColor(); backgroundColor = TDEGlobalSettings::highlightColor();
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = TDEGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = colorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = TDEGlobalSettings::buttonTextColor();
} }
// dimm the colors if the parent view does not have the focus // dimm the colors if the parent view does not have the focus

@ -55,14 +55,14 @@ ViewProperties::ViewProperties(KURL url) :
TQFileInfo info(m_filepath); TQFileInfo info(m_filepath);
if (!info.isWritable()) { if (!info.isWritable()) {
TQString basePath = KGlobal::instance()->instanceName(); TQString basePath = TDEGlobal::instance()->instanceName();
basePath.append("/view_properties/local"); basePath.append("/view_properties/local");
rootDir = locateLocal("data", basePath); rootDir = locateLocal("data", basePath);
m_filepath = rootDir + m_filepath; m_filepath = rootDir + m_filepath;
} }
} }
else { else {
TQString basePath = KGlobal::instance()->instanceName(); TQString basePath = TDEGlobal::instance()->instanceName();
basePath.append("/view_properties/remote/").append(url.host()); basePath.append("/view_properties/remote/").append(url.host());
rootDir = locateLocal("data", basePath); rootDir = locateLocal("data", basePath);
m_filepath = rootDir + m_filepath; m_filepath = rootDir + m_filepath;

Loading…
Cancel
Save