diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:10:05 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:10:05 -0600 |
commit | 74a2067d286867e313f736d6733407586b71195e (patch) | |
tree | 182ea565d6909db1541424e4ffb3168b4b139c21 /konq-plugins/sidebar/metabar/src | |
parent | 081670a12774435ae60cf8eba9226b91d27852b3 (diff) | |
download | tdeaddons-74a2067d286867e313f736d6733407586b71195e.tar.gz tdeaddons-74a2067d286867e313f736d6733407586b71195e.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'konq-plugins/sidebar/metabar/src')
6 files changed, 13 insertions, 13 deletions
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; |