summaryrefslogtreecommitdiffstats
path: root/noatun/modules/splitplaylist
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules/splitplaylist')
-rw-r--r--noatun/modules/splitplaylist/find.cpp6
-rw-r--r--noatun/modules/splitplaylist/find.h2
-rw-r--r--noatun/modules/splitplaylist/playlist.cpp6
-rw-r--r--noatun/modules/splitplaylist/playlist.h2
-rw-r--r--noatun/modules/splitplaylist/splitplaylist.cpp2
-rw-r--r--noatun/modules/splitplaylist/view.cpp65
-rw-r--r--noatun/modules/splitplaylist/view.h4
7 files changed, 45 insertions, 42 deletions
diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp
index 67b7f332..7c504383 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -26,10 +26,10 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
layout->addWidget(mRegexp, 1, 0);
layout->addWidget(mBackwards, 1, 1);
- connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked()));
+ connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(clicked()));
- connect(mText, TQT_SIGNAL(activated(int)), TQT_SLOT(clicked()));
- connect(mText, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+ connect(mText, TQ_SIGNAL(activated(int)), TQ_SLOT(clicked()));
+ connect(mText, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
enableButton(User1, false);
}
diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h
index d44bb0e5..c77a6424 100644
--- a/noatun/modules/splitplaylist/find.h
+++ b/noatun/modules/splitplaylist/find.h
@@ -9,7 +9,7 @@ class TQPushButton;
class Finder : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
Finder(TQWidget *parent);
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index 34690f91..d940c8ca 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -20,9 +20,9 @@ SplitPlaylist::SplitPlaylist()
void SplitPlaylist::init()
{
view=new View(this); // 195
- connect(view->listView(), TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(listItemSelected(TQListViewItem*)));
- connect(view, TQT_SIGNAL(shown()), TQT_SIGNAL(listShown()));
- connect(view, TQT_SIGNAL(hidden()), TQT_SIGNAL(listHidden()));
+ connect(view->listView(), TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(listItemSelected(TQListViewItem*)));
+ connect(view, TQ_SIGNAL(shown()), TQ_SIGNAL(listShown()));
+ connect(view, TQ_SIGNAL(hidden()), TQ_SIGNAL(listHidden()));
view->init(); // 1000
}
diff --git a/noatun/modules/splitplaylist/playlist.h b/noatun/modules/splitplaylist/playlist.h
index de025ad5..9ac27bc2 100644
--- a/noatun/modules/splitplaylist/playlist.h
+++ b/noatun/modules/splitplaylist/playlist.h
@@ -27,7 +27,7 @@ class TQListViewItem;
class SplitPlaylist : public Playlist, public Plugin
{
-Q_OBJECT
+TQ_OBJECT
friend class SafeListViewItem;
friend class List;
diff --git a/noatun/modules/splitplaylist/splitplaylist.cpp b/noatun/modules/splitplaylist/splitplaylist.cpp
index fd854311..92e075a5 100644
--- a/noatun/modules/splitplaylist/splitplaylist.cpp
+++ b/noatun/modules/splitplaylist/splitplaylist.cpp
@@ -5,7 +5,7 @@
extern "C"
{
- KDE_EXPORT Plugin *create_plugin()
+ TDE_EXPORT Plugin *create_plugin()
{
return new SplitPlaylist();
}
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index bfdd0112..f724d490 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -26,8 +26,8 @@
#include <tdeio/netaccess.h>
#include <tdelocale.h>
#include <tdemenubar.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
#include <kstdaction.h>
#include <kedittoolbar.h>
#include <kurldrag.h>
@@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
addRef();
setUrl(text);
- static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(parent)->moveItem(this, 0, after);
setOn(true);
// is this really needed, it makes the listview too wide for me :(
@@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
}
}
- static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(parent)->moveItem(this, 0, after);
modified();
if (!streamable() && enqueue(url()))
@@ -355,10 +355,10 @@ List::List(View *parent)
setDragEnabled(true);
setItemsMovable(true);
setSelectionMode(TQListView::Extended);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move()));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected()));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQ_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
+ connect(this, TQ_SIGNAL(moved()), TQ_SLOT(move()));
+ connect(this, TQ_SIGNAL(aboutToMove()), parent, TQ_SLOT(setNoSorting()));
+ connect(this, TQ_SIGNAL(deleteCurrentItem()), parent, TQ_SLOT(deleteSelected()));
}
List::~List()
@@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const
void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
{
- static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting();
+ static_cast<View*>(parent())->setNoSorting();
KURL::List textlist;
if (!KURLDrag::decode(event, textlist)) return;
event->acceptAction();
@@ -569,16 +569,16 @@ void List::addNextPendingDirectory()
currentJobURL= *pendingIt;
listJob= TDEIO::listRecursive(currentJobURL, false,false);
connect(
- listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
- TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
+ listJob, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+ TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
);
connect(
- listJob, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotResult(TDEIO::Job *))
+ listJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotResult(TDEIO::Job *))
);
connect(
- listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
- TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
+ listJob, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
+ TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
);
pendingAddDirectories.remove(pendingIt);
}
@@ -638,25 +638,25 @@ View::View(SplitPlaylist *)
{
list=new List(this);
setCentralWidget(list);
- connect(list, TQT_SIGNAL(modified(void)), TQT_TQOBJECT(this), TQT_SLOT(setModified(void)) );
+ connect(list, TQ_SIGNAL(modified(void)), this, TQ_SLOT(setModified(void)) );
// connect the click on the header with sorting
- connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) );
+ connect(list->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(headerClicked(int)) );
- mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
- (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
- mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete");
+ mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQ_SLOT(addFiles()), actionCollection(), "add_files");
+ (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQ_SLOT(addDirectory()), actionCollection(), "add_dir");
+ mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, this, TQ_SLOT(deleteSelected()), actionCollection(), "delete");
- mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
+ mClose=KStdAction::close(this, TQ_SLOT(close()), actionCollection());
+ mFind=KStdAction::find(this, TQ_SLOT(find()), actionCollection());
- (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
- mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
- mOpenpl=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
- mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
- mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
+ (void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection());
+ mOpenNew=KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection());
+ mOpenpl=KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+ mSave=KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+ mSaveAs=KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
- (void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
- (void) new TDEAction(i18n("Clear"), "edit-clear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
+ (void) new TDEAction(i18n("Shuffle"), "misc", 0, SPL, TQ_SLOT( randomize() ), actionCollection(), "shuffle");
+ (void) new TDEAction(i18n("Clear"), "edit-clear", 0, list, TQ_SLOT( clear() ), actionCollection(), "clear");
createGUI("splui.rc");
@@ -669,7 +669,7 @@ View::View(SplitPlaylist *)
void View::find()
{
mFinder->show();
- connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*)));
+ connect(mFinder, TQ_SIGNAL(search(Finder*)), TQ_SLOT(findIt(Finder*)));
}
static bool testWord(TQListViewItem *i, const TQString &finder)
@@ -797,6 +797,9 @@ void View::init()
list->openGlobal(internalURL);
}
+ for(PlaylistItem item = SPL->getFirst(); item; item = SPL->getAfter(item))
+ if(item.url().path().isEmpty()) item.remove();
+
TDEConfig &config = *TDEGlobal::config();
config.setGroup("splitplaylist");
@@ -964,7 +967,7 @@ void View::configureToolBars()
{
saveMainWindowSettings(TDEGlobal::config(), "SPL Window");
KEditToolbar dlg(actionCollection(), "splui.rc");
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig()));
dlg.exec();
}
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 4eef4e9b..54578cb4 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -57,7 +57,7 @@ private:
class List : public TDEListView
{
-Q_OBJECT
+TQ_OBJECT
friend class View;
public:
@@ -105,7 +105,7 @@ class TDEToolBar;
class View : public TDEMainWindow
{
-Q_OBJECT
+TQ_OBJECT
public:
View(SplitPlaylist *mother);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 07:46:01 +0000