From 2381863623364e8d646bf05bbd1cfd5d099c5664 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:10 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/ldapcontroller.cpp | 2 +- src/primaryrealmwizard/primaryrealmwizard.cpp | 2 +- src/secondaryrealmwizard/secondaryrealmwizard.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp index 55b385a..50e42e2 100644 --- a/src/ldapcontroller.cpp +++ b/src/ldapcontroller.cpp @@ -1623,7 +1623,7 @@ int LDAPController::createNewLDAPRealm(TQWidget* dialogparent, LDAPRealmConfig r tqApp->processEvents(); // Load database - KProcess slapadd; + TDEProcess slapadd; slapadd << "slapadd" << "-l" << configTempDir.name() + "skel.ldif"; slapadd.start(); while (slapadd.isRunning()) { diff --git a/src/primaryrealmwizard/primaryrealmwizard.cpp b/src/primaryrealmwizard/primaryrealmwizard.cpp index 3177afa..d86788e 100644 --- a/src/primaryrealmwizard/primaryrealmwizard.cpp +++ b/src/primaryrealmwizard/primaryrealmwizard.cpp @@ -345,7 +345,7 @@ void PrimaryRealmWizard::setPosition() { hint.setHeight(finish_size.height()); // set the position - TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos()); int w = rect.x() + (rect.width() - hint.width())/2 - 9; int h = rect.y() + (rect.height() - hint.height())/2; move(w, h); diff --git a/src/secondaryrealmwizard/secondaryrealmwizard.cpp b/src/secondaryrealmwizard/secondaryrealmwizard.cpp index baefe8d..f7dfe18 100644 --- a/src/secondaryrealmwizard/secondaryrealmwizard.cpp +++ b/src/secondaryrealmwizard/secondaryrealmwizard.cpp @@ -253,7 +253,7 @@ void SecondaryRealmWizard::setPosition() { hint.setHeight(finish_size.height()); // set the position - TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos()); int w = rect.x() + (rect.width() - hint.width())/2 - 9; int h = rect.y() + (rect.height() - hint.height())/2; move(w, h);