| author | zautrix <zautrix> | 2005-01-29 05:45:29 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-01-29 05:45:29 (UTC) |
| commit | 0850ade22908615389800c6ee973f5906154d980 (patch) (side-by-side diff) | |
| tree | f15401c42b2b4e86662f478c7e148c8de1a04b2b | |
| parent | a710cbadcbce154dff51445e756f8e3fc77278f9 (diff) | |
| download | kdepimpi-0850ade22908615389800c6ee973f5906154d980.zip kdepimpi-0850ade22908615389800c6ee973f5906154d980.tar.gz kdepimpi-0850ade22908615389800c6ee973f5906154d980.tar.bz2 | |
desktop fix
| -rw-r--r-- | kabc/addresseedialog.cpp | 2 | ||||
| -rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 9ea9d04..34f4160 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -149,9 +149,9 @@ void AddresseeDialog::loadAddressBook() QString name = (*it).familyName()+", "+ (*it).givenName(); if ( name.length() == 2 ) name = (*it).realName(); name += (*it).preferredEmail(); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 if (re.search(name) != -1) #else if (re.match(name) != -1) #endif diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index f3584d7..cf0d1ee 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp @@ -1282,9 +1282,21 @@ void KStandardDirs::addKDEDefaults() //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); } else { - KConfig cfg ( QDir::homeDirPath() + "/.microkdehome" ); + QString confFile; +#ifdef DESKTOP_VERSION + confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; + QFileInfo fi ( confFile ); + if ( !fi.exists() ) + confFile = QDir::homeDirPath() + "/.microkdehome"; + else + qDebug("Loading path info from " + confFile ); + +#else + confFile = QDir::homeDirPath() + "/.microkdehome"; +#endif + KConfig cfg ( confFile ); cfg.setGroup("Global"); localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); } } |