kstartupconfig: indent and format source

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-03-19 20:12:01 +00:00
parent ec5f92aeda
commit 9e0d4ac59a

View file

@ -41,35 +41,34 @@ DEALINGS IN THE SOFTWARE.
#define KPATH_SEPARATOR ':' #define KPATH_SEPARATOR ':'
static QString get_entry( QString* ll ) static QString get_entry( QString* ll )
{ {
QString& l = *ll; QString& l = *ll;
l = l.trimmed(); l = l.trimmed();
if( l.isEmpty()) if( l.isEmpty())
return QString(); return QString();
QString ret; QString ret;
if( l[ 0 ] == '\'' ) if( l[ 0 ] == '\'' ) {
{
int pos = 1; int pos = 1;
while( pos < l.length() && l[ pos ] != '\'' ) while( pos < l.length() && l[ pos ] != '\'' )
ret += l[ pos++ ]; ret += l[ pos++ ];
if( pos >= l.length()) if( pos >= l.length()) {
{
*ll = QString(); *ll = QString();
return QString(); return QString();
} }
*ll = l.mid( pos + 1 ); *ll = l.mid( pos + 1 );
return ret; return ret;
} }
int pos = 0; int pos = 0;
while( pos < l.length() && l[ pos ] != ' ' ) while( pos < l.length() && l[ pos ] != ' ' )
ret += l[ pos++ ]; ret += l[ pos++ ];
*ll = l.mid( pos ); *ll = l.mid( pos );
return ret; return ret;
} }
#define I18N_NOEXTRACT( x ) ki18n( x )
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
#define I18N_NOEXTRACT( x ) ki18n( x )
// Set catalog to "kdelibs4" for KLocale to initialize languages properly. // Set catalog to "kdelibs4" for KLocale to initialize languages properly.
KAboutData about( "kdostartupconfig4", "kdelibs4", KAboutData about( "kdostartupconfig4", "kdelibs4",
I18N_NOEXTRACT( "kdostartupconfig4" ), "1.0" ); I18N_NOEXTRACT( "kdostartupconfig4" ), "1.0" );
@ -89,16 +88,15 @@ int main( int argc, char **argv )
QTextStream startupconfig( &f1 ); QTextStream startupconfig( &f1 );
QTextStream startupconfigfiles( &f2 ); QTextStream startupconfigfiles( &f2 );
startupconfig << "#! /bin/sh\n"; startupconfig << "#! /bin/sh\n";
for(;;) for(;;) {
QString line;
{ {
QString line; QByteArray buf;
{ buf.resize(1024);
QByteArray buf; if( keys.readLine( buf.data(), buf.length() ) < 0 )
buf.resize(1024); break;
if( keys.readLine( buf.data(), buf.length() ) < 0 ) line = QString::fromLocal8Bit(buf);
break; }
line = QString::fromLocal8Bit(buf);
}
line = line.trimmed(); line = line.trimmed();
if( line.isEmpty()) if( line.isEmpty())
break; break;
@ -110,27 +108,22 @@ int main( int argc, char **argv )
def = get_entry( &tmp ); def = get_entry( &tmp );
if( file.isEmpty() || group.isEmpty()) if( file.isEmpty() || group.isEmpty())
return 6; return 6;
if( group.startsWith( '[' ) && group.endsWith( ']' ) ) if( group.startsWith( '[' ) && group.endsWith( ']' ) ) { // whole config group
{ // whole config group
KConfig cfg( file ); KConfig cfg( file );
group = group.mid( 1, group.length() - 2 ); group = group.mid( 1, group.length() - 2 );
KConfigGroup cg(&cfg, group); KConfigGroup cg(&cfg, group);
QMap< QString, QString > entries = cg.entryMap( ); QMap< QString, QString > entries = cg.entryMap( );
startupconfig << "# " << line << "\n"; startupconfig << "# " << line << "\n";
for( QMap< QString, QString >::ConstIterator it = entries.constBegin(); for( QMap< QString, QString >::ConstIterator it = entries.constBegin();
it != entries.constEnd(); it != entries.constEnd(); ++it ) {
++it )
{
QString key = it.key(); QString key = it.key();
QString value = *it; QString value = *it;
startupconfig << file.replace( ' ', '_' ).toLower() startupconfig << file.replace( ' ', '_' ).toLower()
<< "_" << group.replace( ' ', '_' ).toLower() << "_" << group.replace( ' ', '_' ).toLower()
<< "_" << key.replace( ' ', '_' ).toLower() << "_" << key.replace( ' ', '_' ).toLower()
<< "=" << KShell::quoteArg( value ) << "\n"; << "=" << KShell::quoteArg( value ) << "\n";
}
} }
else } else { // a single key
{ // a single key
if( key.isEmpty()) if( key.isEmpty())
return 7; return 7;
KConfig cfg( file ); KConfig cfg( file );
@ -141,25 +134,23 @@ int main( int argc, char **argv )
<< "_" << group.replace( ' ', '_' ).toLower() << "_" << group.replace( ' ', '_' ).toLower()
<< "_" << key.replace( ' ', '_' ).toLower() << "_" << key.replace( ' ', '_' ).toLower()
<< "=" << KShell::quoteArg( value ) << "\n"; << "=" << KShell::quoteArg( value ) << "\n";
} }
startupconfigfiles << line << endl; startupconfigfiles << line << endl;
// use even currently non-existing paths in $KDEDIRS // use even currently non-existing paths in $KDEDIRS
const QStringList dirs = KGlobal::dirs()->kfsstnd_prefixes().split( KPATH_SEPARATOR, QString::SkipEmptyParts); const QStringList dirs = KGlobal::dirs()->kfsstnd_prefixes().split( KPATH_SEPARATOR, QString::SkipEmptyParts);
for( QStringList::ConstIterator it = dirs.constBegin(); foreach(const QString &it, dirs) {
it != dirs.constEnd(); QString cfg = it + "share/config/" + file;
++it ) if( KGlobal::dirs()->exists( cfg )) {
{
QString cfg = *it + "share/config/" + file;
if( KGlobal::dirs()->exists( cfg ))
startupconfigfiles << cfg << "\n"; startupconfigfiles << cfg << "\n";
else } else {
startupconfigfiles << "!" << cfg << "\n"; startupconfigfiles << "!" << cfg << "\n";
} }
startupconfigfiles << "*\n"; startupconfigfiles << "*\n";
} }
// Get languages by priority from KLocale.
const QStringList langs = KGlobal::locale()->languageList();
startupconfig << "klocale_languages=" << langs.join( ":" ) << "\n";
return 0;
} }
// Get languages by priority from KLocale.
const QStringList langs = KGlobal::locale()->languageList();
startupconfig << "klocale_languages=" << langs.join( ":" ) << "\n";
return 0;
}