From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:11:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kicker/applets/media/mediaapplet.cpp | 2 +- kicker/applets/media/mediumbutton.cpp | 4 ++-- kicker/applets/media/mediumbutton.h | 2 +- kicker/applets/media/preferencesdialog.cpp | 4 ++-- kicker/applets/media/preferencesdialog.h | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kicker/applets/media') diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index f8a1ac630..b6e1e7995 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -427,7 +427,7 @@ void MediaApplet::mousePressEvent(TQMouseEvent *e) { if(e->button()==Qt::RightButton) { - KPopupMenu menu(this); + TDEPopupMenu menu(this); menu.insertTitle(i18n("Media")); menu.insertItem(SmallIcon("configure"), i18n("&Configure..."), 1); diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 0f240fcea..a180cfbd9 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -48,7 +48,7 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); @@ -110,7 +110,7 @@ void MediumButton::initPopup() KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items, KURL("media:/"), mActions, 0L, this, kpf, bef); - KPopupTitle *title = new KPopupTitle(new_popup); + TDEPopupTitle *title = new TDEPopupTitle(new_popup); title->setTitle(mFileItem.text()); new_popup->insertItem(title, -1, 0); diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h index 5f6a2b80b..1bc6380c2 100644 --- a/kicker/applets/media/mediumbutton.h +++ b/kicker/applets/media/mediumbutton.h @@ -58,7 +58,7 @@ protected slots: void slotDragOpen(); private: - KActionCollection mActions; + TDEActionCollection mActions; KFileItem mFileItem; TQTimer mOpenTimer; }; diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index f53381a10..bd1a21b0d 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -63,7 +63,7 @@ PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent, mMedia(media) { TQVBox *types_page = addVBoxPage( i18n("Medium Types") ); - mpMediumTypesListView = new KListView(types_page); + mpMediumTypesListView = new TDEListView(types_page); //mpMediumTypesListView->setFullWidth(true); mpMediumTypesListView->addColumn( i18n("Types to Display") ); @@ -72,7 +72,7 @@ PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent, TQVBox *media_page = addVBoxPage( i18n("Media") ); - mpMediaListView = new KListView(media_page); + mpMediaListView = new TDEListView(media_page); //mpMediaListView->setFullWidth(true); mpMediaListView->addColumn( i18n("Media to Display") ); diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h index f758d280b..b29f697ae 100644 --- a/kicker/applets/media/preferencesdialog.h +++ b/kicker/applets/media/preferencesdialog.h @@ -45,8 +45,8 @@ protected slots: void slotDefault(); private: - KListView *mpMediumTypesListView; - KListView *mpMediaListView; + TDEListView *mpMediumTypesListView; + TDEListView *mpMediaListView; KFileItemList mMedia; }; -- cgit v1.2.1