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

pull/1/head
Timothy Pearson 12 years ago
parent 3e27b9798f
commit 68156265e3

@ -51,7 +51,7 @@ NotifierContainer::NotifierContainer() : TQWidget() {
// Determine bottom of desktop // Determine bottom of desktop
TQPoint cursorPos = TQCursor::pos(); TQPoint cursorPos = TQCursor::pos();
TQRect r = KGlobalSettings::desktopGeometry(cursorPos); TQRect r = TDEGlobalSettings::desktopGeometry(cursorPos);
mTopOfStack = r.height(); mTopOfStack = r.height();
mRightOfStack = r.width(); mRightOfStack = r.width();
} }
@ -65,7 +65,7 @@ void NotifierContainer::handleGTKMain() {
void NotifierContainer::displayMessage(TQString title, TQString message, TQString icon, int x, int y) { void NotifierContainer::displayMessage(TQString title, TQString message, TQString icon, int x, int y) {
TQPixmap px; TQPixmap px;
KIconLoader* il = KGlobal::iconLoader(); KIconLoader* il = TDEGlobal::iconLoader();
px = il->loadIcon( icon, KIcon::NoGroup ); px = il->loadIcon( icon, KIcon::NoGroup );
// if (px.isNull()) { // if (px.isNull()) {
// px = il->loadIcon( "gnome_apps", KIcon::NoGroup ); // px = il->loadIcon( "gnome_apps", KIcon::NoGroup );
@ -80,7 +80,7 @@ void NotifierContainer::displayMessage(TQString title, TQString message, TQStrin
if (mPopupList.isEmpty()) { if (mPopupList.isEmpty()) {
// Determine bottom of desktop // Determine bottom of desktop
TQPoint cursorPos = TQCursor::pos(); TQPoint cursorPos = TQCursor::pos();
TQRect r = KGlobalSettings::desktopGeometry(cursorPos); TQRect r = TDEGlobalSettings::desktopGeometry(cursorPos);
mTopOfStack = r.height(); mTopOfStack = r.height();
mRightOfStack = r.width(); mRightOfStack = r.width();
} }
@ -108,7 +108,7 @@ void NotifierContainer::popupClosed(KPassivePopup* popup) {
if (mPopupList.isEmpty()) { if (mPopupList.isEmpty()) {
// Determine bottom of desktop // Determine bottom of desktop
TQPoint cursorPos = TQCursor::pos(); TQPoint cursorPos = TQCursor::pos();
TQRect r = KGlobalSettings::desktopGeometry(cursorPos); TQRect r = TDEGlobalSettings::desktopGeometry(cursorPos);
mTopOfStack = r.height(); mTopOfStack = r.height();
mRightOfStack = r.width(); mRightOfStack = r.width();
} }

Loading…
Cancel
Save