diff options
| -rw-r--r-- | src/kreadconfig/Makefile.am | 1 | ||||
| -rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 8 | ||||
| -rw-r--r-- | src/kreadconfig/kwriteconfig.cpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/kreadconfig/Makefile.am b/src/kreadconfig/Makefile.am index c7b5644c..7c4cbc3c 100644 --- a/src/kreadconfig/Makefile.am +++ b/src/kreadconfig/Makefile.am @@ -3,6 +3,7 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) LDADD = $(LIB_KDECORE) +KDE_CXXFLAGS = -UQT3_SUPPORT bin_PROGRAMS = kreadconfig kwriteconfig kreadconfig_SOURCES = kreadconfig.cpp diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index 041e2f91..f21d64e7 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) QString key=QString::fromLocal8Bit(args->getOption("key")); QString file=QString::fromLocal8Bit(args->getOption("file")); QString dflt=args->getOption("default"); - QString type=args->getOption("type").lower(); + QString type=args->getOption("type").toLower(); if (key.isNull()) { KCmdLineArgs::usage(); @@ -78,7 +78,7 @@ int main(int argc, char **argv) } konfig->setGroup(group); if(type=="bool") { - dflt=dflt.lower(); + dflt=dflt.toLower(); bool def=(dflt=="true" || dflt=="on" || dflt=="yes" || dflt=="1"); bool retValue = !konfig->readBoolEntry(key, def); if ( configMustDeleted ) @@ -90,13 +90,13 @@ int main(int argc, char **argv) delete konfig; return retValue; } else if (type=="path"){ - fprintf(stdout, "%s\n", konfig->readPathEntry(key, dflt).local8Bit().data()); + fprintf(stdout, "%s\n", konfig->readPathEntry(key, dflt).toLocal8Bit().data()); if ( configMustDeleted ) delete konfig; return 0; } else { /* Assume it's a string... */ - fprintf(stdout, "%s\n", konfig->readEntry(key, dflt).local8Bit().data()); + fprintf(stdout, "%s\n", konfig->readEntry(key, dflt).toLocal8Bit().data()); if ( configMustDeleted ) delete konfig; return 0; diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp index 0b382f2d..ba589287 100644 --- a/src/kreadconfig/kwriteconfig.cpp +++ b/src/kreadconfig/kwriteconfig.cpp @@ -41,7 +41,7 @@ int main(int argc, char **argv) QString group=QString::fromLocal8Bit(args->getOption("group")); QString key=QString::fromLocal8Bit(args->getOption("key")); QString file=QString::fromLocal8Bit(args->getOption("file")); - QByteArray type=args->getOption("type").lower(); + QByteArray type=args->getOption("type").toLower(); if (key.isNull() || !args->count()) { |