From: <ck...@us...> - 2008-04-22 06:03:03
|
Revision: 2760 http://krusader.svn.sourceforge.net/krusader/?rev=2760&view=rev Author: ckarai Date: 2008-04-21 23:03:06 -0700 (Mon, 21 Apr 2008) Log Message: ----------- QStringList::split -> QString::split Modified Paths: -------------- trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp trunk/krusader_kde4/krusader/KViewer/krviewer.cpp trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp trunk/krusader_kde4/krusader/Locate/locate.cpp trunk/krusader_kde4/krusader/MountMan/kmountman.cpp trunk/krusader_kde4/krusader/Panel/panelfunc.cpp trunk/krusader_kde4/krusader/Splitter/combiner.cpp trunk/krusader_kde4/krusader/UserAction/expander.cpp trunk/krusader_kde4/krusader/VFS/krarchandler.cpp trunk/krusader_kde4/krusader/VFS/krarchandler.h trunk/krusader_kde4/krusader/krservices.cpp trunk/krusader_kde4/krusader/krusader.cpp Modified: trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp =================================================================== --- trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -307,7 +307,7 @@ currentText, &ok, this ); if ( ok && !text.isEmpty() ) { - lbShowonlyProtocol->addItems( QStringList::split( ";", text ) ); + lbShowonlyProtocol->addItems( text.split( ";" ) ); setModified(); } } @@ -385,7 +385,7 @@ currentText, &ok, this ); if ( ok && !text.isEmpty() ) { - lbShowonlyMime->addItems( QStringList::split( ";", text ) ); + lbShowonlyMime->addItems( text.split( ";" ) ); setModified(); } } @@ -429,7 +429,7 @@ currentText, &ok, this ); if ( ok && !text.isEmpty() ) { - lbShowonlyFile->addItems( QStringList::split( ";", text ) ); + lbShowonlyFile->addItems( text.split( ";" ) ); setModified(); } } Modified: trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp =================================================================== --- trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -417,7 +417,7 @@ new QLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); - _combobox->insertStringList( QStringList::split( ";", parameter.preset().section(":", 1) ) ); + _combobox->insertStringList( parameter.preset().section(":", 1).split( ";" ) ); } QString ParameterChoose::text() { @@ -606,7 +606,7 @@ new QLabel( i18n( parameter.description().utf8() ), this ); _spinbox = new KIntSpinBox( this ); - QStringList para = QStringList::split( ";", parameter.preset().section(":", 1) ); + QStringList para = parameter.preset().section(":", 1).split( ";" ); _spinbox->setMinValue( para[0].toInt() ); _spinbox->setMaxValue( para[1].toInt() ); Modified: trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -92,7 +92,7 @@ QFile info(file+".info"); if (info.open(QIODevice::ReadOnly)) { QTextStream stream(&info); - QStringList infoText = QStringList::split("\n", stream.read()); + QStringList infoText = stream.read().split("\n"); if (KMessageBox::questionYesNoList(krApp, i18n("The following information was attached to the keymap. Do you really want to import this keymap?"), infoText)!=KMessageBox::Yes) return; } Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -282,9 +282,9 @@ // if the file is local, pass a normal path and not a url. this solves // the problem for editors that aren't url-aware if ( url.isLocalFile() ) - proc << QStringList::split( ' ', edit ) << url.path(); + proc << edit.split( ' ' ) << url.path(); else - proc << QStringList::split( ' ', edit ) << url.prettyUrl(); + proc << edit.split( ' ' ) << url.prettyUrl(); if ( !proc.startDetached() ) KMessageBox::sorry( krApp, i18n( "Can't open " ) + "\"" + edit + "\"" ); return ; Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -114,7 +114,7 @@ QVariant argsProp = ptr->property( "X-KDE-BrowserView-Args" ); if ( argsProp.isValid() ) { QString argStr = argsProp.toString(); - args = QStringList::split( " ", argStr ); + args = argStr.split( " " ); } QVariant prop = ptr->property( "X-KDE-BrowserView-AllowAsDefault" ); if ( !prop.isValid() || prop.toBool() ) // defaults to true @@ -284,7 +284,7 @@ QVariant argsProp = ptr->property( "X-KDE-BrowserView-Args" ); if ( argsProp.isValid() ) { QString argStr = argsProp.toString(); - args = QStringList::split( " ", argStr ); + args = argStr.split( " " ); } QVariant prop = ptr->property( "X-KDE-BrowserView-AllowAsDefault" ); if ( !prop.isValid() || prop.toBool() ) // defaults to true Modified: trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -135,7 +135,7 @@ QString dflt = KrServices::fullPathName( name ); /* try to autodetect the full path name */ if( dflt.isEmpty() ) { - QStringList list = QStringList::split( ',', additionalList ); + QStringList list = additionalList.split( ',' ); for( int i=0; i != list.count(); i++ ) if( !KrServices::fullPathName( list[ i ] ).isEmpty() ) { dflt = KrServices::fullPathName( list[ i ] ); Modified: trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -346,17 +346,17 @@ removeProtocol( linkList->topLevelItem( 0 )->text( 0 ) ); addProtocol( "iso" ); - QStringList isoMimes = QStringList::split( ',', defaultIsoMimes ); + QStringList isoMimes = defaultIsoMimes.split( ',' ); for( QStringList::Iterator it = isoMimes.begin(); it != isoMimes.end(); it++ ) addMime( *it, "iso" ); addProtocol( "krarc" ); - QStringList krarcMimes = QStringList::split( ',', defaultKrarcMimes ); + QStringList krarcMimes = defaultKrarcMimes.split( ',' ); for( QStringList::Iterator it = krarcMimes.begin(); it != krarcMimes.end(); it++ ) addMime( *it, "krarc" ); addProtocol( "tar" ); - QStringList tarMimes = QStringList::split( ',', defaultTarMimes ); + QStringList tarMimes = defaultTarMimes.split( ',' ); for( QStringList::Iterator it = tarMimes.begin(); it != tarMimes.end(); it++ ) addMime( *it, "tar" ); Modified: trunk/krusader_kde4/krusader/Locate/locate.cpp =================================================================== --- trunk/krusader_kde4/krusader/Locate/locate.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/Locate/locate.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -338,7 +338,7 @@ { remaining += QString::fromLocal8Bit( locateProc->readAllStandardOutput() ); - QStringList list = QStringList::split("\n", remaining ); + QStringList list = remaining.split("\n" ); int items = list.size(); for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) Modified: trunk/krusader_kde4/krusader/MountMan/kmountman.cpp =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kmountman.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/MountMan/kmountman.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -79,7 +79,7 @@ nonmount_fs << "supermount"; { KConfigGroup group( krConfig, "Advanced"); - QStringList nonmount = QStringList::split(",", group.readEntry("Nonmount Points", _NonMountPoints)); + QStringList nonmount = group.readEntry("Nonmount Points", _NonMountPoints).split(","); nonmount_fs_mntpoint += nonmount; // simplify the white space for ( QStringList::Iterator it = nonmount_fs_mntpoint.begin(); it != nonmount_fs_mntpoint.end(); ++it ) { Modified: trunk/krusader_kde4/krusader/Panel/panelfunc.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -503,7 +503,7 @@ if ( !ok || dirName.isEmpty() ) return ; - QStringList dirTree = QStringList::split( "/", dirName ); + QStringList dirTree = dirName.split( "/" ); for ( QStringList::Iterator it = dirTree.begin(); it != dirTree.end(); ++it ) { // check if the name is already taken Modified: trunk/krusader_kde4/krusader/Splitter/combiner.cpp =================================================================== --- trunk/krusader_kde4/krusader/Splitter/combiner.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/Splitter/combiner.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -113,7 +113,7 @@ else { splitFile.remove( '\r' ); // Windows compatibility - QStringList splitFileContent = QStringList::split( '\n', splitFile ); + QStringList splitFileContent = splitFile.split( '\n' ); bool hasFileName = false, hasSize = false, hasCrc = false; Modified: trunk/krusader_kde4/krusader/UserAction/expander.cpp =================================================================== --- trunk/krusader_kde4/krusader/UserAction/expander.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/UserAction/expander.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -987,7 +987,7 @@ if ( parameter[1].toLower() == "yes" ) // to stay compatible with the old-style parameter jsReturn = "cmd"; else { - QStringList jsVariables = QStringList::split( ';', parameter[1] ); + QStringList jsVariables = parameter[1].split( ';' ); QString jsVariable, jsValue; for ( QStringList::Iterator it = jsVariables.begin(); it != jsVariables.end(); ++it ) { jsVariable = (*it).section('=', 0, 0).trimmed(); Modified: trunk/krusader_kde4/krusader/VFS/krarchandler.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/krarchandler.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/VFS/krarchandler.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -45,7 +45,7 @@ #include "../Dialogs/krpleasewait.h" #include <unistd.h> // for usleep -static QStringList arcProtocols = QStringList::split(";", "tar;bzip;bzip2;gzip;krarc;zip"); +static QStringList arcProtocols = QString("tar;bzip;bzip2;gzip;krarc;zip").split(";"); KWallet::Wallet * KRarcHandler::wallet = 0; Modified: trunk/krusader_kde4/krusader/VFS/krarchandler.h =================================================================== --- trunk/krusader_kde4/krusader/VFS/krarchandler.h 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/VFS/krarchandler.h 2008-04-22 06:03:06 UTC (rev 2760) @@ -139,7 +139,7 @@ QString checkable = lastData + data; - QStringList lines = QStringList::split( '\n', checkable ); + QStringList lines = checkable.split( '\n' ); lastData = lines[ lines.count() - 1 ]; for( int i=0; i != lines.count(); i++ ) { QString line = lines[ i ].trimmed().toLower(); Modified: trunk/krusader_kde4/krusader/krservices.cpp =================================================================== --- trunk/krusader_kde4/krusader/krservices.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/krservices.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -39,7 +39,7 @@ QString KrServices::detectFullPathName(QString name) { - QStringList path = QStringList::split(":",getenv("PATH")); + QStringList path = QString::fromLocal8Bit(getenv("PATH")).split(":"); for ( QStringList::Iterator it = path.begin(); it != path.end(); ++it ) { Modified: trunk/krusader_kde4/krusader/krusader.cpp =================================================================== --- trunk/krusader_kde4/krusader/krusader.cpp 2008-04-21 06:45:49 UTC (rev 2759) +++ trunk/krusader_kde4/krusader/krusader.cpp 2008-04-22 06:03:06 UTC (rev 2760) @@ -288,7 +288,7 @@ // get command-line arguments if ( args->isSet( "left" ) ) { - leftTabs = QStringList::split( ',', args->getOption( "left" ) ); + leftTabs = args->getOption( "left" ).split( ',' ); leftTabTypes.clear(); leftTabProps.clear(); @@ -304,7 +304,7 @@ startProfile = QString(); } if ( args->isSet( "right" ) ) { - rightTabs = QStringList::split( ',', args->getOption( "right" ) ); + rightTabs = args->getOption( "right" ).split( ',' ); rightTabTypes.clear(); rightTabProps.clear(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |