Commit e89a1bea authored by Pino Toscano's avatar Pino Toscano

less qt3_support

svn path=/trunk/KDE/kdemultimedia/juk/; revision=650872
parent d1229952
......@@ -155,7 +155,7 @@ protected:
if(KProtocolManager::useProxy()) {
// split code copied from kcm_kio.
QString noProxiesFor = KProtocolManager::noProxyFor();
QStringList noProxies = QStringList::split(QRegExp("[',''\t'' ']"), noProxiesFor);
QStringList noProxies = noProxiesFor.split(QRegExp("[',''\t'' ']"), QString::SkipEmptyParts);
bool useProxy = true;
// Host that libtunepimp will contact.
......@@ -736,13 +736,13 @@ double stringSimilarity(QString s1, QString s2)
while(p1 < l1 && p2 < l2) {
c1 = s1.at(p1); c2 = s2.at(p2);
if( c1.upper() == c2.upper()) {
if( c1.toUpper() == c2.toUpper()) {
++nCommon;
++p1; ++p2;
}
else {
x1 = s1.find(c2,p1,false);
x2 = s2.find(c1,p2,false);
x1 = s1.indexOf(c2,p1,Qt::CaseInsensitive);
x2 = s2.indexOf(c1,p2,Qt::CaseInsensitive);
if( (x1 == x2 || -1 == x1) || (-1 != x2 && x1 > x2) )
++p2;
......
......@@ -9,7 +9,7 @@
#include "tagguesser.h"
#include "tagguesserconfigdlg.h"
#include <kiconloader.h>
#include <kicon.h>
#include <k3listview.h>
#include <klocale.h>
#include <kpushbutton.h>
......@@ -36,8 +36,8 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(QWidget *parent, const char *name)
m_child->lvSchemes->setItemsRenameable(true);
m_child->lvSchemes->setSorting(-1);
m_child->lvSchemes->setDefaultRenameAction(Q3ListView::Accept);
m_child->bMoveUp->setIcon(BarIconSet("arrow-up"));
m_child->bMoveDown->setIcon(BarIconSet("arrow-down"));
m_child->bMoveUp->setIcon(KIcon("arrow-up"));
m_child->bMoveDown->setIcon(KIcon("arrow-down"));
const QStringList schemes = TagGuesser::schemeStrings();
QStringList::ConstIterator it = schemes.begin();
......
......@@ -123,9 +123,9 @@ int main( int argc, char **argv )
"Block Rockin' Beats", "Chemical Brothers", QString::null, QString::null );
check( "/home/frerich/mp3/Chemical Brothers/Dig your own hole/[01] Block rockin' beats.mp3",
"Block Rockin' Beats", "Chemical Brothers", "01", QString::null, "Dig Your Own Hole");
check( QDir::homeDirPath() + "/[01] Randy - Religion, religion.mp3",
check( QDir::homePath() + "/[01] Randy - Religion, religion.mp3",
"Religion, Religion", "Randy", "01", QString::null, QString::null );
check( QDir::homeDirPath() + "/(3) Mr. Doe - Punk.mp3",
check( QDir::homePath() + "/(3) Mr. Doe - Punk.mp3",
"Punk", "Mr. Doe", "3", QString::null, QString::null );
check( "c:\\music\\mp3s\\(3) Mr. Doe - Punk.mp3",
"Punk", "Mr. Doe", "3", QString::null, QString::null );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment