Commit d36e9ab8 authored by Thiago Macieira's avatar Thiago Macieira

Adapt to no k_funcinfo

svn path=/trunk/KDE/kdemultimedia/juk/; revision=702590
parent e6eac2ed
......@@ -140,7 +140,7 @@ void CoverManagerPrivate::createDataDir() const
void CoverManagerPrivate::saveCovers() const
{
kDebug() << k_funcinfo;
kDebug() ;
// Make sure the directory exists first.
createDataDir();
......@@ -177,7 +177,7 @@ void CoverManagerPrivate::saveCovers() const
void CoverManagerPrivate::loadCovers()
{
kDebug() << k_funcinfo;
kDebug() ;
QFile file(coverLocation());
......@@ -385,7 +385,7 @@ QPixmap CoverManager::coverFromData(const CoverData &coverData, Size size)
coverKey CoverManager::addCover(const QPixmap &large, const QString &artist, const QString &album)
{
kDebug() << k_funcinfo;
kDebug() ;
coverKey id = data()->nextId();
CoverDataPtr coverData(new CoverData);
......
......@@ -235,7 +235,7 @@ FileRenamerWidget::FileRenamerWidget(QWidget *parent) :
CategoryReaderInterface(),
m_exampleFromFile(false)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
setupUi(this);
......@@ -280,7 +280,7 @@ FileRenamerWidget::FileRenamerWidget(QWidget *parent) :
void FileRenamerWidget::loadConfig()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
QList<int> checkedSeparators;
KConfigGroup config(KGlobal::config(), "FileRenamer");
......@@ -306,7 +306,7 @@ void FileRenamerWidget::loadConfig()
void FileRenamerWidget::saveConfig()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
KConfigGroup config(KGlobal::config(), "FileRenamer");
QList<int> checkedSeparators;
QList<int> categoryOrder;
......@@ -335,7 +335,7 @@ FileRenamerWidget::~FileRenamerWidget()
int FileRenamerWidget::addRowCategory(TagType category)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
static QIcon up = SmallIcon("go-up");
static QIcon down = SmallIcon("go-down");
......@@ -406,7 +406,7 @@ int FileRenamerWidget::addRowCategory(TagType category)
void FileRenamerWidget::moveSignalMappings(int oldId, int newId)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
mapper->setMapping(m_rows[oldId].optionsButton, newId);
downMapper->setMapping(m_rows[oldId].downButton, newId);
upMapper->setMapping(m_rows[oldId].upButton, newId);
......@@ -415,7 +415,7 @@ void FileRenamerWidget::moveSignalMappings(int oldId, int newId)
bool FileRenamerWidget::removeRow(int id)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
if(id >= m_rows.count()) {
kWarning(65432) << "Trying to remove row, but " << id << " is out-of-range.\n";
return false;
......@@ -484,7 +484,7 @@ bool FileRenamerWidget::removeRow(int id)
void FileRenamerWidget::addFolderSeparatorCheckbox()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
QWidget *temp = new QWidget(m_mainFrame);
QHBoxLayout *l = new QHBoxLayout(temp);
......@@ -501,7 +501,7 @@ void FileRenamerWidget::addFolderSeparatorCheckbox()
void FileRenamerWidget::createTagRows()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
KConfigGroup config(KGlobal::config(), "FileRenamer");
QList<int> categoryOrder = config.readEntry("CategoryOrder", QList<int>());
......@@ -577,7 +577,7 @@ void FileRenamerWidget::createTagRows()
void FileRenamerWidget::exampleTextChanged()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
// Just use .mp3 as an example
#if 0
if(m_exampleFromFile && (m_exampleFile.isEmpty() ||
......@@ -593,7 +593,7 @@ void FileRenamerWidget::exampleTextChanged()
QString FileRenamerWidget::fileCategoryValue(TagType category) const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
FileHandle file(m_exampleFile);
Tag *tag = file.tag();
......@@ -623,7 +623,7 @@ QString FileRenamerWidget::fileCategoryValue(TagType category) const
QString FileRenamerWidget::categoryValue(TagType category) const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
if(m_exampleFromFile)
return fileCategoryValue(category);
......@@ -655,7 +655,7 @@ QString FileRenamerWidget::categoryValue(TagType category) const
QList<CategoryID> FileRenamerWidget::categoryOrder() const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
QList<CategoryID> list;
// Iterate in GUI row order.
......@@ -669,7 +669,7 @@ QList<CategoryID> FileRenamerWidget::categoryOrder() const
bool FileRenamerWidget::hasFolderSeparator(int index) const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
if(index >= m_folderSwitches.count())
return false;
return m_folderSwitches[index]->isChecked();
......@@ -677,7 +677,7 @@ bool FileRenamerWidget::hasFolderSeparator(int index) const
void FileRenamerWidget::moveItem(int id, MovementDirection direction)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
QWidget *l = m_rows[id].widget;
int bottom = m_rows.count() - 1;
int pos = m_rows[id].position;
......@@ -739,7 +739,7 @@ void FileRenamerWidget::moveItem(int id, MovementDirection direction)
int FileRenamerWidget::idOfPosition(int position) const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
if(position >= m_rows.count()) {
kError(65432) << "Search for position " << position << " out-of-range.\n";
return -1;
......@@ -755,7 +755,7 @@ int FileRenamerWidget::idOfPosition(int position) const
int FileRenamerWidget::findIdentifier(const CategoryID &category) const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
for(int index = 0; index < m_rows.count(); ++index)
if(m_rows[index].category == category)
return index;
......@@ -769,21 +769,21 @@ int FileRenamerWidget::findIdentifier(const CategoryID &category) const
void FileRenamerWidget::enableAllUpButtons()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
for(int i = 0; i < m_rows.count(); ++i)
m_rows[i].upButton->setEnabled(true);
}
void FileRenamerWidget::enableAllDownButtons()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
for(int i = 0; i < m_rows.count(); ++i)
m_rows[i].downButton->setEnabled(true);
}
void FileRenamerWidget::showCategoryOption(int id)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
TagOptionsDialog *dialog = new TagOptionsDialog(this, m_rows[id].options, m_rows[id].category.categoryNumber);
if(dialog->exec() == QDialog::Accepted) {
......@@ -796,25 +796,25 @@ void FileRenamerWidget::showCategoryOption(int id)
void FileRenamerWidget::moveItemUp(int id)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
moveItem(id, MoveUp);
}
void FileRenamerWidget::moveItemDown(int id)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
moveItem(id, MoveDown);
}
void FileRenamerWidget::toggleExampleDialog()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
m_exampleDialog->setHidden(!m_exampleDialog->isHidden());
}
void FileRenamerWidget::insertCategory()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
TagType category = TagRenamerOptions::tagFromCategoryText(m_category->currentText());
if(category == Unknown) {
kError(65432) << "Trying to add unknown category somehow.\n";
......@@ -844,19 +844,19 @@ void FileRenamerWidget::insertCategory()
void FileRenamerWidget::exampleDialogShown()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
m_showExample->setText(i18n("Hide Renamer Test Dialog"));
}
void FileRenamerWidget::exampleDialogHidden()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
m_showExample->setText(i18n("Show Renamer Test Dialog"));
}
void FileRenamerWidget::fileSelected(const QString &file)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
m_exampleFromFile = true;
m_exampleFile = file;
exampleTextChanged();
......@@ -864,26 +864,26 @@ void FileRenamerWidget::fileSelected(const QString &file)
void FileRenamerWidget::dataSelected()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
m_exampleFromFile = false;
exampleTextChanged();
}
QString FileRenamerWidget::separator() const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
return m_separator->currentText();
}
QString FileRenamerWidget::musicFolder() const
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
return m_musicFolder->url().path();
}
void FileRenamerWidget::slotRemoveRow(int id)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
// Remove the given identified row.
if(!removeRow(id))
kError(65432) << "Unable to remove row " << id << endl;
......@@ -899,7 +899,7 @@ FileRenamer::FileRenamer()
void FileRenamer::rename(PlaylistItem *item)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
PlaylistItemList list;
list.append(item);
......@@ -908,7 +908,7 @@ void FileRenamer::rename(PlaylistItem *item)
void FileRenamer::rename(const PlaylistItemList &items)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
ConfigCategoryReader reader;
QStringList errorFiles;
QMap<QString, QString> map;
......@@ -952,7 +952,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
bool FileRenamer::moveFile(const QString &src, const QString &dest)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
kDebug(65432) << "Moving file " << src << " to " << dest;
if(src == dest)
......@@ -987,7 +987,7 @@ bool FileRenamer::moveFile(const QString &src, const QString &dest)
void FileRenamer::setFolderIcon(const KUrl &dst, const PlaylistItem *item)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
if(item->file().tag()->album().isEmpty() ||
!item->file().coverInfo()->hasCover())
{
......@@ -1035,7 +1035,7 @@ void FileRenamer::setFolderIcon(const KUrl &dst, const PlaylistItem *item)
QList<CategoryID>::ConstIterator lastEnabledItem(const QList<CategoryID> &list,
const CategoryReaderInterface &interface)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
QList<CategoryID>::ConstIterator it = list.constBegin();
QList<CategoryID>::ConstIterator last = list.constEnd();
......@@ -1052,7 +1052,7 @@ QList<CategoryID>::ConstIterator lastEnabledItem(const QList<CategoryID> &list,
QString FileRenamer::fileName(const CategoryReaderInterface &interface)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
const QList<CategoryID> categoryOrder = interface.categoryOrder();
const QString separator = interface.separator();
const QString folder = interface.musicFolder();
......
......@@ -98,7 +98,7 @@ JuK::JuK(QWidget *parent) :
JuK::~JuK()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
}
KActionCollection *JuK::actionCollection() const
......@@ -436,7 +436,7 @@ bool JuK::queryExit()
{
m_startDocked = !isVisible();
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
hide();
......@@ -454,7 +454,7 @@ bool JuK::queryExit()
bool JuK::queryClose()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
if(!m_shuttingDown &&
!kapp->sessionSaving() &&
......@@ -488,7 +488,7 @@ void JuK::slotAboutToQuit()
void JuK::slotQuit()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
m_shuttingDown = true;
kapp->quit();
......
......@@ -72,7 +72,7 @@ class PlaylistAction : public KAction
protected slots:
void slotActivated()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
// Determine current playlist, and call its slot.
Playlist *p = PlaylistCollection::instance()->visiblePlaylist();
......
......@@ -493,7 +493,7 @@ int KTRMLookup::fileId() const
void KTRMLookup::recognized()
{
kDebug() << k_funcinfo << d->file;
kDebug() << d->file;
d->results.clear();
......@@ -519,7 +519,7 @@ void KTRMLookup::recognized()
void KTRMLookup::unrecognized()
{
kDebug() << k_funcinfo << d->file;
kDebug() << d->file;
#if HAVE_TUNEPIMP >= 4
char trm[255];
bool finish = false;
......@@ -550,7 +550,7 @@ void KTRMLookup::unrecognized()
void KTRMLookup::collision()
{
#if HAVE_TUNEPIMP && HAVE_TUNEPIMP < 5
kDebug() << k_funcinfo << d->file;
kDebug() << d->file;
track_t track = tp_GetTrack(KTRMRequestHandler::instance()->tunePimp(), d->fileId);
......@@ -569,7 +569,7 @@ void KTRMLookup::collision()
switch(type) {
case eNone:
kDebug() << k_funcinfo << "eNone";
kDebug() << "eNone";
break;
case eArtistList:
kDebug() << "eArtistList";
......@@ -604,7 +604,7 @@ void KTRMLookup::collision()
break;
}
case eMatchedTrack:
kDebug() << k_funcinfo << "eMatchedTrack";
kDebug() << "eMatchedTrack";
break;
}
......@@ -699,7 +699,7 @@ void KTRMLookup::lookupResult( KJob* job )
void KTRMLookup::error()
{
kDebug() << k_funcinfo << d->file;
kDebug() << d->file;
d->results.clear();
finished();
......
......@@ -467,7 +467,7 @@ void PlayerManager::slotNeedNextUrl()
FileHandle nextFile = m_playlistInterface->currentFile();
if(!nextFile.isNull())
{
//kDebug() << k_funcinfo << m_file.absFilePath();
//kDebug() << m_file.absFilePath();
m_file = nextFile;
m_media->enqueue(KUrl::fromPath(m_file.absFilePath()));
}
......@@ -478,7 +478,7 @@ void PlayerManager::slotFinished()
{
if(m_file.isNull())
{
//kDebug() << k_funcinfo << "ignoring finished signal";
//kDebug() << "ignoring finished signal";
return;
}
m_playlistInterface->playNext();
......@@ -557,7 +557,7 @@ void PlayerManager::setup()
!action("forward") ||
!action("trackPositionAction"))
{
kWarning(65432) << k_funcinfo << "Could not find all of the required actions.";
kWarning(65432) << "Could not find all of the required actions.";
return;
}
......
......@@ -1814,7 +1814,7 @@ void Playlist::calculateColumnWeights()
foreach(int column, m_weightDirty) {
m_columnWeights[column] = int(sqrt(averageWidth[column]) + 0.5);
// kDebug(65432) << k_funcinfo << "m_columnWeights[" << column << "] == "
// kDebug(65432) << "m_columnWeights[" << column << "] == "
// << m_columnWeights[column] << endl;
}
......
......@@ -355,7 +355,7 @@ void PlaylistCollection::open(const QString &playlist, const QStringList &files)
void PlaylistCollection::addFolder()
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
DirectoryList l(m_folderList, m_importPlaylists, JuK::JuKInstance());
DirectoryList::Result result = l.exec();
......
......@@ -71,7 +71,7 @@ void SearchPlaylist::updateItems()
newItems.append(item->collectionItem());
}
// kDebug(65432) << k_funcinfo << "newItems.size() == " << newItems.size();
// kDebug(65432) << "newItems.size() == " << newItems.size();
foreach(PlaylistItem *item, oldItems)
clearItem(item, false);
......@@ -82,7 +82,7 @@ void SearchPlaylist::updateItems()
createItems(newItems);
if(synchronizePlaying()) {
kDebug(65432) << k_funcinfo << "synchronizing playing";
kDebug(65432) << "synchronizing playing";
synchronizePlayingItems(m_search.playlists(), true);
}
}
......
......@@ -251,7 +251,7 @@ void DefaultSequenceIterator::refillRandomList(Playlist *p)
p = current()->playlist();
if(!p) {
kError(65432) << k_funcinfo << "Item has no playlist!\n";
kError(65432) << "Item has no playlist!\n";
return;
}
}
......
......@@ -328,7 +328,7 @@ void TreeViewMode::removeItem(const QString &item, unsigned column)
else if(column == PlaylistItem::AlbumColumn)
itemKey = "albums" + item;
else {
kWarning() << k_funcinfo << "Unhandled column type " << column;
kWarning() << "Unhandled column type " << column;
return;
}
......@@ -360,7 +360,7 @@ void TreeViewMode::addItems(const QStringList &items, unsigned column)
else if(column == PlaylistItem::AlbumColumn)
searchCategory = "albums";
else {
kWarning() << k_funcinfo << "Unhandled column type " << column;
kWarning() << "Unhandled column type " << column;
return;
}
......
......@@ -114,7 +114,7 @@ void WebImageFetcher::slotLoadImageURLs()
void WebImageFetcher::slotWebRequestFinished(KJob *job)
{
kDebug(65432) << k_funcinfo;
kDebug(65432) ;
if(job != d->connection)
return;
......
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