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 --- klinkstatus/src/ui/klshistorycombo.cpp | 4 ++-- klinkstatus/src/ui/sessionwidget.cpp | 2 +- klinkstatus/src/ui/sessionwidget.h | 4 ++-- klinkstatus/src/ui/treeview.cpp | 14 +++++++------- klinkstatus/src/ui/treeview.h | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'klinkstatus/src/ui') diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index 13c8a16d..d1bbf780 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -92,8 +92,8 @@ bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev ) return false; } - int delete_word_back = KStdAccel::deleteWordBack().keyCodeQt(); - int delete_word_forward = KStdAccel::deleteWordForward().keyCodeQt(); + int delete_word_back = TDEStdAccel::deleteWordBack().keyCodeQt(); + int delete_word_forward = TDEStdAccel::deleteWordForward().keyCodeQt(); if ( KKey( e ) == KKey(delete_word_back) || KKey( e ) == KKey(delete_word_forward) || diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index a761499d..6567b7db 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -111,7 +111,7 @@ void SessionWidget::init() resultsSearchBar->hide(); - start_search_action_ = static_cast (action_manager_->action("start_search")); + start_search_action_ = static_cast (action_manager_->action("start_search")); connect(resultsSearchBar, TQT_SIGNAL(signalSearch(LinkMatcher)), this, TQT_SLOT(slotApplyFilter(LinkMatcher))); diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index 111b059d..49b5b2a3 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -36,7 +36,7 @@ class TQListViewItem; class KURL; class TDEConfig; -class KToggleAction; +class TDEToggleAction; #include @@ -142,7 +142,7 @@ private: int time_out_; bool tree_display_; // tree/flat result display bool follow_last_link_checked_; - KToggleAction* start_search_action_; + TDEToggleAction* start_search_action_; }; diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index 882ca58f..bb24ac65 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -40,7 +40,7 @@ TreeView::TreeView(TQWidget *parent, const char *name) - : KListView(parent, name), + : TDEListView(parent, name), ResultView(), current_column_(0) { @@ -106,7 +106,7 @@ double TreeView::columnsWidth() const void TreeView::clear() { - KListView::clear(); + TDEListView::clear(); } void TreeView::removeColunas() @@ -116,7 +116,7 @@ void TreeView::removeColunas() void TreeView::show(ResultView::Status const& status) { - TQListViewItemIterator it(static_cast (this)); + TQListViewItemIterator it(static_cast (this)); while(it.current()) { TreeViewItem* item = myItem(it.current()); @@ -197,7 +197,7 @@ bool TreeView::isEmpty() const void TreeView::resizeEvent(TQResizeEvent *e) { - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); resetColumns(); clipper()->repaint(); } @@ -394,7 +394,7 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after, LinkStatus const* linkstatus) - : KListViewItem(parent, after), + : TDEListViewItem(parent, after), last_child_(0), root_(parent) { init(linkstatus); @@ -402,7 +402,7 @@ TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after, TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQListViewItem* after, LinkStatus const* linkstatus) - : KListViewItem(listview_item, after), + : TDEListViewItem(listview_item, after), last_child_(0), root_(root) { @@ -470,7 +470,7 @@ void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, TQColor color(item.textStatusColor()); m_cg.setColor(TQColorGroup::Text, color); - KListViewItem::paintCell(p, m_cg, column, width, align); + TDEListViewItem::paintCell(p, m_cg, column, width, align); setHeight(22); } diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index de2eb9a2..3481108d 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -26,7 +26,7 @@ because of ResultView. ResultView class was to be the base interface to a TQTable and a TQListView, but the APIs are a little diferent... then I realize that a TQTable view isn't needed at all so some day I will clean this up. */ -class TreeView : public KListView, public ResultView +class TreeView : public TDEListView, public ResultView { Q_OBJECT @@ -87,7 +87,7 @@ inline void TreeView::setTreeDisplay(bool tree_display) { /* ******************************* TreeViewItem ******************************* */ -class TreeViewItem: public KListViewItem +class TreeViewItem: public TDEListViewItem { public: -- cgit v1.2.1