diff options
Diffstat (limited to 'konq-plugins/sidebar')
-rw-r--r-- | konq-plugins/sidebar/delicious/bookmarkListItem.cpp | 2 | ||||
-rw-r--r-- | konq-plugins/sidebar/delicious/bookmarkListItem.h | 2 | ||||
-rw-r--r-- | konq-plugins/sidebar/delicious/widget.ui | 2 | ||||
-rw-r--r-- | konq-plugins/sidebar/mediaplayer/controls.cpp | 18 | ||||
-rw-r--r-- | konq-plugins/sidebar/mediaplayer/controls.h | 4 | ||||
-rw-r--r-- | konq-plugins/sidebar/metabar/src/configdialog.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/sidebar/metabar/src/configdialog.h | 4 | ||||
-rw-r--r-- | konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 6 | ||||
-rw-r--r-- | konq-plugins/sidebar/metabar/src/metabarwidget.h | 2 | ||||
-rw-r--r-- | konq-plugins/sidebar/metabar/src/serviceloader.cpp | 8 | ||||
-rw-r--r-- | konq-plugins/sidebar/metabar/src/serviceloader.h | 2 | ||||
-rw-r--r-- | konq-plugins/sidebar/newsticker/nspanel.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/sidebar/newsticker/nspanel.h | 2 | ||||
-rw-r--r-- | konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/sidebar/newsticker/nsstacktabwidget.h | 4 |
15 files changed, 34 insertions, 34 deletions
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index d4066c8..0229031 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -25,7 +25,7 @@ #include <klocale.h> BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) - : KListViewItem( parent ), m_desc( desc ) + : TDEListViewItem( parent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 5b4c8c7..40316c1 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -31,7 +31,7 @@ class TQString; -class BookmarkListItem: public KListViewItem +class BookmarkListItem: public TDEListViewItem { public: BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui index c85760a..7bf7c0b 100644 --- a/konq-plugins/sidebar/delicious/widget.ui +++ b/konq-plugins/sidebar/delicious/widget.ui @@ -114,7 +114,7 @@ <string>Post a new bookmark</string> </property> </widget> - <widget class="KListView" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Description</string> diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 5b110a0..49c6d1f 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -77,7 +77,7 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; @@ -85,10 +85,10 @@ SliderAction::SliderAction(const TQString& text, int accel, const TQObject *rece int SliderAction::plug( TQWidget *w, int index ) { - if (!w->inherits("KToolBar")) return -1; + if (!w->inherits("TDEToolBar")) return -1; - KToolBar *toolBar = (KToolBar *)w; - int id = KAction::getToolButtonID(); + TDEToolBar *toolBar = (TDEToolBar *)w; + int id = TDEAction::getToolButtonID(); //Create it. m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); @@ -100,20 +100,20 @@ int SliderAction::plug( TQWidget *w, int index ) connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); - if (w->inherits( "KToolBar" )) - connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); + if (w->inherits( "TDEToolBar" )) + connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition))); emit plugged(); return containerCount() - 1; } -void SliderAction::toolbarMoved(KToolBar::BarPosition) +void SliderAction::toolbarMoved(TDEToolBar::BarPosition) { // I wish this worked :) return; /* - if (pos == KToolBar::Left || pos == KToolBar::Right) + if (pos == TDEToolBar::Left || pos == TDEToolBar::Right) { m_slider->setOrientationQt::Vertical); m_slider->setFixedWidth(m_slider->height()); @@ -128,7 +128,7 @@ return; void SliderAction::unplug( TQWidget *w ) { - KToolBar *toolBar = (KToolBar *)w; + TDEToolBar *toolBar = (TDEToolBar *)w; int idx = findContainer( w ); toolBar->removeItem( itemId( idx ) ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index 3ecd9af..0c19d23 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -69,7 +69,7 @@ private: /** * A slider for your toolbar **/ -class SliderAction : public KAction +class SliderAction : public TDEAction { Q_OBJECT @@ -84,7 +84,7 @@ signals: void plugged(); public slots: - void toolbarMoved(KToolBar::BarPosition pos); + void toolbarMoved(TDEToolBar::BarPosition pos); private: TQGuardedPtr<TQSlider> m_slider; TQStringList m_items; diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index ba2b129..45938a9 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -143,7 +143,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent link_down->setEnabled(false); connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); - link_list = new KListView(links); + link_list = new TDEListView(links); link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSorting(-1); link_list->setItemsMovable(TRUE); @@ -154,7 +154,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQWidget *actionPage = new TQWidget; - actionSelector = new KActionSelector(actionPage); + actionSelector = new TDEActionSelector(actionPage); loadAvailableActions(); tab->addTab(general, i18n("General")); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 190c982..b37469a 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -70,13 +70,13 @@ class ConfigDialog : public TQDialog TQCheckBox *servicemenus; TQCheckBox *showframe; - KListView *link_list; + TDEListView *link_list; KComboBox *themes; TQCString topWidgetName; - KActionSelector *actionSelector; + TDEActionSelector *actionSelector; TQPtrDict<LinkEntry> linkList; diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index af141cc..2548c3f 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -117,11 +117,11 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare TQVBoxLayout *layout = new TQVBoxLayout(this); layout->addWidget(html->view()); - popup = new KPopupMenu(0); - KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); + popup = new TDEPopupMenu(0); + TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); + TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index 667b461..b832bc5 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -61,7 +61,7 @@ class MetabarWidget : public TQWidget MetabarFunctions *functions; KDirWatch *dir_watch; - KPopupMenu *popup; + TDEPopupMenu *popup; TQDict<ProtocolPlugin> plugins; diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index af04017..bbffb01 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -145,7 +145,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int const TQString priority = cfg.readEntry("X-TDE-Priority"); const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" ); bool usePopup = false; - KPopupMenu *popup; + TDEPopupMenu *popup; if(!submenuName.isEmpty()){ usePopup = true; @@ -156,7 +156,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int else{ MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions); - popup = new KPopupMenu(); + popup = new TDEPopupMenu(); popups.insert(idString, popup); count++; @@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8()); + TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8()); action->plug(popup); } else{ @@ -204,7 +204,7 @@ void ServiceLoader::runAction(const TQString& name) void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point) { - KPopupMenu *p = popups[popup]; + TDEPopupMenu *p = popups[popup]; if(p){ p->exec(point); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index 99d85ed..42268de 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -49,7 +49,7 @@ class ServiceLoader : public TQObject void showPopup(const TQString &popup, const TQPoint &point); private: - TQDict<KPopupMenu> popups; + TQDict<TDEPopupMenu> popups; TQMap<TQString,KDEDesktopMimeType::Service> services; KURL::List urlList; diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index a5c1261..22bb3a7 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -36,12 +36,12 @@ namespace KSB_News { // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) - : KListBox(parent, name, f), + : TDEListBox(parent, name, f), TQToolTip(this) { } void TTListBox::clear() { - KListBox::clear(); + TDEListBox::clear(); } void TTListBox::maybeTip(const TQPoint &point) { diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index b09ab33..36b503e 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -42,7 +42,7 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - class TTListBox : public KListBox, TQToolTip { + class TTListBox : public TDEListBox, TQToolTip { public: TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); void clear(); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index f6b3b7d..12be5c7 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -83,7 +83,7 @@ namespace KSB_News { // popup menu - popup = new KPopupMenu(this); + popup = new TDEPopupMenu(this); popup->insertItem(KStdGuiItem::configure().iconSet(), i18n("&Configure Newsticker..."), this, TQT_SLOT(slotConfigure())); @@ -94,7 +94,7 @@ namespace KSB_News { popup->insertSeparator(); // help menu - helpmenu = new KPopupMenu(this); + helpmenu = new TDEPopupMenu(this); helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, TQT_SLOT(slotShowAbout())); helpmenu->insertItem(i18n("&Report Bug..."), this, diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 2be171f..a1d6783 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -35,7 +35,7 @@ class TQVBoxLayout; class TQPushButton; class TQStringList; -class KPopupMenu; +class TDEPopupMenu; class TDEAboutData; class KAboutApplication; class KBugReport; @@ -76,7 +76,7 @@ namespace KSB_News { TQPtrDict<TQWidget> pagesheader; TQVBoxLayout *layout; TQWidget *currentPage; - KPopupMenu *popup, *helpmenu; + TDEPopupMenu *popup, *helpmenu; TDEAboutData *m_aboutdata; KAboutApplication *m_about; KBugReport *m_bugreport; |