From 9771f17f8cc5252b12ec5f3edf47ff9bffdf997f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:16:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kommander/widgets/execbutton.cpp | 2 +- kommander/widgets/fontdialog.cpp | 4 ++-- kommander/widgets/listbox.cpp | 2 +- kommander/widgets/listbox.h | 2 +- kommander/widgets/popupmenu.cpp | 2 +- kommander/widgets/popupmenu.h | 6 +++--- kommander/widgets/treewidget.cpp | 10 +++++----- kommander/widgets/treewidget.h | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kommander/widgets') diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index 4e88eb22..a9a906f0 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -209,7 +209,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args) ++it; if (w->name() == args[0] && ( strcmp(w->className(), "PopupMenu")) == 0 ) { - TQPopupMenu *popup = dynamic_cast(w->child("unnamed", "KPopupMenu")); + TQPopupMenu *popup = dynamic_cast(w->child("unnamed", "TDEPopupMenu")); this->setPopup(popup); } } diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index fefd8d85..739fb0e0 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -140,8 +140,8 @@ TQString FontDialog::handleDCOP(int function, const TQStringList& args) } case DCOP::execute: { - int result = KFontDialog::getFont( m_font ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( m_font ); + if ( result == TDEFontDialog::Accepted ) { return m_font.toString(); } diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index bf6f8b4a..9a84bd4b 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -30,7 +30,7 @@ #include "listbox.h" ListBox::ListBox(TQWidget *a_parent, const char *a_name) - : KListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h index 2b20f24b..b970c280 100644 --- a/kommander/widgets/listbox.h +++ b/kommander/widgets/listbox.h @@ -31,7 +31,7 @@ class TQWidget; class TQShowEvent; -class KOMMANDER_EXPORT ListBox : public KListBox, public KommanderWidget +class KOMMANDER_EXPORT ListBox : public TDEListBox, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index dfa7b325..ba6c3781 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -49,7 +49,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name) else setHidden(true); - m_menu = new KPopupMenu(this); + m_menu = new TDEPopupMenu(this); connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index b044d74e..b7ed192a 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -17,7 +17,7 @@ #include -class KPopupMenu; +class TDEPopupMenu; /** @author Andras Mantia @@ -41,7 +41,7 @@ public: virtual void setAssociatedText(const TQStringList&); virtual TQString populationText() const; virtual void setPopulationText(const TQString&); - KPopupMenu *menu() {return m_menu;} + TDEPopupMenu *menu() {return m_menu;} public slots: virtual void setWidgetText(const TQString &); @@ -54,7 +54,7 @@ private slots: private: TQString insertSubmenu(const TQString& title, const TQString &menuWidget, int index, const TQString& icon); - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; TQMap m_associations; TQStringList m_params; }; diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index 8a1aabf6..7c1c989a 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -55,7 +55,7 @@ enum Functions { }; TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name) - : KListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; @@ -243,7 +243,7 @@ bool TreeWidget::isKommanderWidget() const void TreeWidget::setCurrentItem(TQListViewItem* item) { - KListView::setCurrentItem(item); + TDEListView::setCurrentItem(item); setSelected(item, true); ensureItemVisible(item); } @@ -458,10 +458,10 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args) break; } case addColumnTree: - return TQString::number(KListView::addColumn(args[0], args[1].toInt())); + return TQString::number(TDEListView::addColumn(args[0], args[1].toInt())); break; case setSortCol: - KListView::setSorting(args[0].toInt(), args[1].toInt()); + TDEListView::setSorting(args[0].toInt(), args[1].toInt()); break; case DCOP::columnCount: return TQString::number(TQListView::columns() ); @@ -476,7 +476,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args) setColAlign(args[0].toInt(), args[1]); break; case setAltBackground: - KListView::setAlternateBackground(TQColor(args[0])); + TDEListView::setAlternateBackground(TQColor(args[0])); break; case DCOP::removeColumn: { diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index d1055547..19cbcea6 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; -class KOMMANDER_EXPORT TreeWidget : public KListView, public KommanderWidget +class KOMMANDER_EXPORT TreeWidget : public TDEListView, public KommanderWidget { Q_OBJECT -- cgit v1.2.1