From 940c092f32d40263ad6b24f948eaf4c48b01e99a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:25 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- noatun/modules/splitplaylist/view.cpp | 24 ++++++++++++------------ noatun/modules/splitplaylist/view.h | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'noatun/modules/splitplaylist') diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index cce64897..8e150cc1 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co addRef(); setUrl(text); - static_cast(TQT_TQWIDGET(parent))->moveItem(this, 0, after); + static_cast(TQT_TQWIDGET(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(TQT_TQWIDGET(parent))->moveItem(this, 0, after); + static_cast(TQT_TQWIDGET(parent))->moveItem(this, 0, after); modified(); if (!streamable() && enqueue(url())) @@ -345,7 +345,7 @@ void SafeListViewItem::remove() } List::List(View *parent) - : KListView(parent), recursiveAddAfter(0), listJob(0) + : TDEListView(parent), recursiveAddAfter(0), listJob(0) { addColumn(i18n("File")); addColumn(i18n("Time")); @@ -372,7 +372,7 @@ void List::move() bool List::acceptDrag(TQDropEvent *event) const { - return KURLDrag::canDecode(event) || KListView::acceptDrag(event); + return KURLDrag::canDecode(event) || TDEListView::acceptDrag(event); } void List::dropEvent(TQDropEvent *event, TQListViewItem *after) @@ -396,7 +396,7 @@ void List::keyPressEvent(TQKeyEvent *e) { if (currentItem()) { - emit KListView::executed(currentItem()); + emit TDEListView::executed(currentItem()); } return; @@ -412,7 +412,7 @@ void List::keyPressEvent(TQKeyEvent *e) return; } - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } @@ -634,7 +634,7 @@ void List::slotRedirection(TDEIO::Job *, const KURL & url) ///////////////////////////////// View::View(SplitPlaylist *) - : KMainWindow(0, "NoatunSplitplaylistView") + : TDEMainWindow(0, "NoatunSplitplaylistView") { list=new List(this); setCentralWidget(list); @@ -642,9 +642,9 @@ View::View(SplitPlaylist *) // connect the click on the header with sorting connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) ); - mOpen=new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); - (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); - mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete"); + 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"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete"); mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); @@ -655,8 +655,8 @@ View::View(SplitPlaylist *) mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void) new KAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle"); - (void) new KAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear"); + (void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle"); + (void) new TDEAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear"); createGUI("splui.rc"); diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 48a0be67..9bff4335 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -55,7 +55,7 @@ private: bool removed; }; -class List : public KListView +class List : public TDEListView { Q_OBJECT @@ -100,10 +100,10 @@ protected: }; class KFileDialog; -class KToggleAction; -class KToolBar; +class TDEToggleAction; +class TDEToolBar; -class View : public KMainWindow +class View : public TDEMainWindow { Q_OBJECT @@ -155,9 +155,9 @@ signals: private: List *list; - KAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew; - KAction *mClose; - KAction *mFind; + TDEAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew; + TDEAction *mClose; + TDEAction *mFind; Finder *mFinder; KURL mPlaylistFile; -- cgit v1.2.1