diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
| commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
| tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kresources/scalix/scalixadmin/settings.h | |
| parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
| download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kresources/scalix/scalixadmin/settings.h')
| -rw-r--r-- | kresources/scalix/scalixadmin/settings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kresources/scalix/scalixadmin/settings.h b/kresources/scalix/scalixadmin/settings.h index 1e36833ad..29028f3b8 100644 --- a/kresources/scalix/scalixadmin/settings.h +++ b/kresources/scalix/scalixadmin/settings.h @@ -32,11 +32,11 @@ class Settings static Settings* self(); - KIO::MetaData accountData() const; + TDEIO::MetaData accountData() const; KURL accountUrl() const; TQString accountPassword() const; - KIO::Slave *globalSlave() const; + TDEIO::Slave *globalSlave() const; TQString rulesWizardUrl() const; @@ -48,7 +48,7 @@ class Settings private: Settings(); - KIO::Slave *mSlave; + TDEIO::Slave *mSlave; static Settings* mSelf; }; |