Commit 805b37aa authored by Scott Wheeler's avatar Scott Wheeler

Starting on the road to compilation.

svn path=/trunk/KDE/kdemultimedia/juk/; revision=513863
parent 2083912b
......@@ -23,9 +23,12 @@
#include <q3hbox.h>
#include <q3vbox.h>
#include <qlayout.h>
//Added by qt3to4:
#include <QHBoxLayout>
#include <QBoxLayout>
#include <QGroupBox>
#include <Q3HButtonGroup>
#include "collectionlist.h"
#include "advancedsearchdialog.h"
......@@ -49,7 +52,7 @@ AdvancedSearchDialog::AdvancedSearchDialog(const QString &defaultName,
new QLabel(i18n("Playlist name:"), box);
m_playlistNameLineEdit = new KLineEdit(defaultName, box);
QVGroupBox *criteriaGroupBox = new QVGroupBox(i18n("Search Criteria"), mainWidget());
QGroupBox *criteriaGroupBox = new QGroupBox(i18n("Search Criteria"), mainWidget());
static_cast<Q3HBox *>(mainWidget())->setStretchFactor(criteriaGroupBox, 1);
Q3HButtonGroup *group = new Q3HButtonGroup(criteriaGroupBox);
......
......@@ -75,7 +75,7 @@ void Cache::save()
return;
QByteArray data;
QDataStream s(data, QIODevice::WriteOnly);
QDataStream s(&data, QIODevice::WriteOnly);
for(Iterator it = begin(); it != end(); ++it) {
s << (*it).absFilePath();
......@@ -125,7 +125,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
// Create a new stream just based on the data.
QDataStream s(data, QIODevice::ReadOnly);
QDataStream s(&data, QIODevice::ReadOnly);
while(!s.atEnd()) {
......@@ -293,7 +293,7 @@ void Cache::load()
s >> checksum
>> data;
buffer.setBuffer(data);
buffer.setBuffer(&data);
buffer.open(QIODevice::ReadOnly);
s.setDevice(&buffer);
......
......@@ -53,7 +53,7 @@ QString CategoryReaderInterface::fixupTrack(const QString &track, unsigned categ
return QString::null;
}
unsigned minimumWidth = trackWidth(categoryNum);
int minimumWidth = trackWidth(categoryNum);
if(str.length() < minimumWidth) {
QString prefix;
......
......@@ -25,12 +25,13 @@
*
* @author Michael Pyne <michael.pyne@kdemail.net>
*/
class FileRenamerTagOptions : public FileRenamerTagOptionsBase
class FileRenamerTagOptions : public Ui_FileRenamerTagOptionsBase
{
Q_OBJECT
public:
public:
FileRenamerTagOptions(QWidget *parent, const TagRenamerOptions &options);
virtual ~FileRenamerTagOptions() {}
const TagRenamerOptions &options() const { return m_options; }
......@@ -39,7 +40,7 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase
virtual void slotTrackWidthChanged();
virtual void slotEmptyActionChanged();
private:
private:
TagRenamerOptions m_options;
};
......@@ -52,7 +53,7 @@ class TagOptionsDialog : public KDialogBase
{
Q_OBJECT
public:
public:
TagOptionsDialog(QWidget *parent, const TagRenamerOptions &options, unsigned categoryNumber);
const TagRenamerOptions &options() const { return m_options; }
......@@ -60,7 +61,7 @@ class TagOptionsDialog : public KDialogBase
protected slots:
virtual void accept();
private:
private:
// Private methods
......
This diff is collapsed.
......@@ -9,9 +9,9 @@ class CollectionIface : public DCOPObject
{
K_DCOP
k_dcop:
void openFile(const QString &file) { open(file); }
void openFile(const QString &file) { open(QStringList(file)); }
void openFile(const QStringList &files) { open(files); }
void openFile(const QString &playlist, const QString &file) { open(playlist, file); }
void openFile(const QString &playlist, const QString &file) { open(playlist, QStringList(file)); }
void openFile(const QString &playlist, const QStringList &files) { open(playlist, files); }
virtual QStringList playlists() const = 0;
......
......@@ -17,7 +17,6 @@
#define STRINGHASH_H
#include <q3ptrvector.h>
//Added by qt3to4:
#include <Q3ValueList>
#include <Q3CString>
......@@ -136,8 +135,7 @@ inline int hashString(const StringType &s)
{
uint h = 0;
uint g;
for(uint i = 0; i < s.length(); i++)
{
for(int i = 0; i < s.length(); i++) {
h = (h << 4) + hashStringAccess(s, i);
if((g = h & 0xf0000000))
h ^= g >> 24;
......@@ -159,6 +157,7 @@ template<> inline int Hash<QString>::hash(QString key) const
{
return hashString(key) % tableSize();
}
typedef Hash<QString> StringHash;
// PtrHash
......
......@@ -16,7 +16,8 @@
#ifndef TAG_H
#define TAG_H
#include <qfileinfo.h>
#include <QFileInfo>
#include <QDateTime>
namespace TagLib { class File; }
......
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