Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 88fbfd5f authored by Laurent Montel's avatar Laurent Montel 😁

Q3CString--

svn path=/trunk/KDE/kdemultimedia/juk/; revision=561786
parent 9c93e069
......@@ -37,7 +37,6 @@
#include <Q3ValueList>
#include <QDragMoveEvent>
#include <Q3CString>
#include <QDropEvent>
using ActionCollection::action;
......@@ -368,7 +367,7 @@ void CollectionListItem::refresh()
if(id != TrackNumberColumn && id != LengthColumn) {
// All columns other than track num and length need local-encoded data for sorting
Q3CString lower = text(i).lower().local8Bit();
QByteArray lower = text(i).lower().local8Bit();
// For some columns, we may be able to share some strings
......
......@@ -15,8 +15,6 @@
#define FILEHANDLEPROPERTIES_H
#include <QMap>
//Added by qt3to4:
#include <Q3CString>
/*
* These ugly macros make possible a property registration system that makes it
......@@ -68,15 +66,15 @@ namespace FileHandleProperties
}
};
static QMap<Q3CString, const Property *> propertyMap;
static QMap<QByteArray, const Property *> propertyMap;
static int addToPropertyMap(const Q3CString &name, Property *property)
static int addToPropertyMap(const QByteArray &name, Property *property)
{
propertyMap[name] = property;
return 0;
}
static QString property(const FileHandle &file, const Q3CString &key)
static QString property(const FileHandle &file, const QByteArray &key)
{
return propertyMap.contains(key) ? propertyMap[key]->value(file) : QString::null;
}
......@@ -86,7 +84,7 @@ namespace FileHandleProperties
static QStringList l;
if(l.isEmpty()) {
QMap<Q3CString, const Property *>::ConstIterator it = propertyMap.begin();
QMap<QByteArray, const Property *>::ConstIterator it = propertyMap.begin();
for(; it != propertyMap.end(); ++it)
l.append(QString(it.key()));
}
......
......@@ -92,7 +92,7 @@ class PlaylistAction : public KAction
}
private:
Q3CString m_slot;
QByteArray m_slot;
PlaylistRecipientMap m_playlistRecipient;
};
......@@ -150,7 +150,7 @@ void K3bExporter::slotExport()
void K3bExporter::exportViaCmdLine(const PlaylistItemList &items)
{
K3bOpenMode mode = openMode();
Q3CString cmdOption;
QByteArray cmdOption;
switch(mode) {
case AudioCD:
......
......@@ -25,7 +25,6 @@
//Added by qt3to4:
#include <QPixmap>
#include <Q3ValueList>
#include <Q3CString>
#include "tagguesser.h"
#include "filehandle.h"
......@@ -189,7 +188,7 @@ protected:
Data(const QString &path) : fileHandle(path) {}
FileHandle fileHandle;
Q3ValueVector<Q3CString> local8Bit;
Q3ValueVector<QByteArray> local8Bit;
Q3ValueVector<int> cachedWidths;
};
......
......@@ -18,7 +18,6 @@
#include <q3ptrvector.h>
#include <QList>
#include <Q3CString>
#include "filehandle.h"
......@@ -123,7 +122,7 @@ inline char hashStringAccess(const QString &in, int index)
return in.unicode()[index].cell();
}
inline char hashStringAccess(const Q3CString &in, int index)
inline char hashStringAccess(const QByteArray &in, int index)
{
return in[index];
}
......
......@@ -14,8 +14,6 @@
***************************************************************************/
#include "stringshare.h"
#include "stringhash.h"
//Added by qt3to4:
#include <Q3CString>
const int SIZE = 5003;
......@@ -34,7 +32,7 @@ StringShare::Data* StringShare::s_data = 0;
struct StringShare::Data
{
QString qstringHash [SIZE];
Q3CString qcstringHash[SIZE];
QByteArray qcstringHash[SIZE];
};
StringShare::Data* StringShare::data()
......@@ -59,7 +57,7 @@ QString StringShare::tryShare(const QString& in)
}
}
Q3CString StringShare::tryShare(const Q3CString& in)
QByteArray StringShare::tryShare(const QByteArray& in)
{
int index = hashString(in) % SIZE;
......
......@@ -17,8 +17,6 @@
#define STRING_SHARE_H
#include <QString>
//Added by qt3to4:
#include <Q3CString>
/**
This class attempts to normalize repeated occurances of strings to use
......@@ -29,7 +27,7 @@ class StringShare
struct Data;
public:
static QString tryShare(const QString& in);
static Q3CString tryShare(const Q3CString& in);
static QByteArray tryShare(const QByteArray& in);
private:
static Data* data();
......
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