Compile without qt3support

svn path=/trunk/KDE/kdebase/src/kreadconfig/; revision=470530
wilder
Laurent Montel 21 years ago committed by Aleix Pol
parent 2a1d6753c3
commit df60d721f6
  1. 1
      src/kreadconfig/Makefile.am
  2. 8
      src/kreadconfig/kreadconfig.cpp
  3. 2
      src/kreadconfig/kwriteconfig.cpp

@ -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

@ -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;

@ -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()) {

Loading…
Cancel
Save