Commit edaa0aa3 authored by Stephan Kulow's avatar Stephan Kulow

fix make final

svn path=/trunk/kdemultimedia/juk/; revision=369060
parent dbd3fef4
bin_PROGRAMS = juk
check_PROGRAMS = tagguessertest mbtest
check_PROGRAMS = tagguessertest
juk_SOURCES = \
advancedsearchdialog.cpp \
......@@ -69,7 +69,6 @@ juk_SOURCES = \
viewmode.cpp
tagguessertest_SOURCES = tagguessertest.cpp tagguesser.cpp
mbtest_SOURCES = mbtest.cpp musicbrainzquery.cpp
INCLUDES= $(all_includes) $(taglib_includes) $(GST_CFLAGS) $(ARTS_CFLAGS)
......@@ -87,9 +86,6 @@ juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST)
tagguessertest_LDADD = $(LIB_KDECORE)
tagguessertest_LDFLAGS = $(all_libraries)
mbtest_LDADD = $(LIB_KDECORE) $(mblibs)
mbtest_LDFLAGS = $(all_libraries)
SUBDIRS = pics
rcdir = $(kde_datadir)/juk
......
......@@ -34,6 +34,7 @@
#include <qfile.h>
#include <tunepimp/tp_c.h>
#include <fixx11h.h>
class KTRMLookup;
......
......@@ -35,7 +35,7 @@ using namespace ActionCollection;
PlayerManager *PlayerManager::m_instance = 0;
enum Status { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
////////////////////////////////////////////////////////////////////////////////
// helper functions
......
......@@ -27,10 +27,10 @@
#define NUMBER(x) (x == 0 ? QString::null : QString::number(x))
class TrackItem : public KListViewItem
class TrackPickerItem : public KListViewItem
{
public:
TrackItem(KListView *parent, const KTRMResult &result) :
TrackPickerItem(KListView *parent, const KTRMResult &result) :
KListViewItem(parent, parent->lastChild(),
result.title(), result.artist(), result.album(),
NUMBER(result.track()), NUMBER(result.year())),
......@@ -57,7 +57,7 @@ TrackPickerDialog::TrackPickerDialog(const QString &name,
m_base->trackList->setSorting(-1);
for(KTRMResultList::ConstIterator it = results.begin(); it != results.end(); ++it)
new TrackItem(m_base->trackList, *it);
new TrackPickerItem(m_base->trackList, *it);
m_base->trackList->setSelected(m_base->trackList->firstChild(), true);
setMinimumWidth(kMax(400, width()));
......@@ -71,7 +71,7 @@ TrackPickerDialog::~TrackPickerDialog()
KTRMResult TrackPickerDialog::result() const
{
if(m_base->trackList->selectedItem())
return static_cast<TrackItem *>(m_base->trackList->selectedItem())->result();
return static_cast<TrackPickerItem *>(m_base->trackList->selectedItem())->result();
else
return KTRMResult();
}
......
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