diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:08 -0600 |
| commit | 3294a2b0edca71b65173ac97558db46e21cc05cc (patch) | |
| tree | 3b46a47d6946dc037faffbe38f54b55afc74a12c /src | |
| parent | 77edf672f1181c83a55907f982887142e7aaeca8 (diff) | |
| download | kcmldap-3294a2b0edca71b65173ac97558db46e21cc05cc.tar.gz kcmldap-3294a2b0edca71b65173ac97558db46e21cc05cc.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/bondwizard.cpp | 2 | ||||
| -rw-r--r-- | src/ldapbonding.cpp | 2 | ||||
| -rw-r--r-- | src/ldapbonding.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bondwizard.cpp b/src/bondwizard.cpp index cbf1586..e29e4f9 100644 --- a/src/bondwizard.cpp +++ b/src/bondwizard.cpp @@ -240,7 +240,7 @@ void BondWizard::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/ldapbonding.cpp b/src/ldapbonding.cpp index 78b1bfc..c2beac0 100644 --- a/src/ldapbonding.cpp +++ b/src/ldapbonding.cpp @@ -125,7 +125,7 @@ LDAPConfig::~LDAPConfig() { } void LDAPConfig::load() { - kgs = new KGlobalSettings(); + kgs = new TDEGlobalSettings(); load(false); } diff --git a/src/ldapbonding.h b/src/ldapbonding.h index ba7aec9..afdc7ff 100644 --- a/src/ldapbonding.h +++ b/src/ldapbonding.h @@ -75,7 +75,7 @@ class LDAPConfig: public KCModule private: TDEAboutData *myAboutData; - KGlobalSettings *kgs; + TDEGlobalSettings *kgs; LDAPConfigBase *base; LDAPRealmConfigList m_realms; TQString m_fqdn; |