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 --- kfind/ChangeLog | 2 +- kfind/kdatecombo.cpp | 2 +- kfind/kdatecombo.h | 4 ++-- kfind/kfindpart.h | 6 +++--- kfind/kfwin.cpp | 16 ++++++++-------- kfind/kfwin.h | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kfind') diff --git a/kfind/ChangeLog b/kfind/ChangeLog index 61359c8a5..18b80091a 100644 --- a/kfind/ChangeLog +++ b/kfind/ChangeLog @@ -88,7 +88,7 @@ ver. 0.3.3: ver. 0.3.2: - o uses KTopLevelWidget and KToolBar + o uses KTopLevelWidget and TDEToolBar o new documentations ver. 0.3.1: diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index b901b0f0d..d27ea7a3b 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -30,7 +30,7 @@ KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name) void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) { clearValidator(); - popupFrame = new KPopupFrame(this, "popupFrame"); + popupFrame = new TDEPopupFrame(this, "popupFrame"); popupFrame->installEventFilter(this); datePicker = new KDatePicker(popupFrame, date, "datePicker"); datePicker->setMinimumSize(datePicker->sizeHint()); diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h index ab714a3ba..d1aa3ecdc 100644 --- a/kfind/kdatecombo.h +++ b/kfind/kdatecombo.h @@ -16,7 +16,7 @@ */ class KDatePicker; -class KPopupFrame; +class TDEPopupFrame; class KDateCombo : public TQComboBox { Q_OBJECT @@ -30,7 +30,7 @@ public: bool setDate(const TQDate & newDate); private: - KPopupFrame * popupFrame; + TDEPopupFrame * popupFrame; KDatePicker * datePicker; void initObject(const TQDate & date, TQWidget *parent, const char *name); diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h index c0bf8b825..3ec83970a 100644 --- a/kfind/kfindpart.h +++ b/kfind/kfindpart.h @@ -31,9 +31,9 @@ class KQuery; class TDEAboutData; //added class KonqPropsView; -class KAction; -class KToggleAction; -class KActionMenu; +class TDEAction; +class TDEToggleAction; +class TDEActionMenu; class TQIconViewItem; class IconViewBrowserExtension; //end added diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 6cbbe1268..7b5f510bc 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -105,7 +105,7 @@ TQString KfFileLVI::key(int column, bool) const } KfindWindow::KfindWindow( TQWidget *parent, const char *name ) - : KListView( parent, name ) + : TDEListView( parent, name ) ,m_baseDir("") ,m_menu(0) { @@ -134,8 +134,8 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( selectionHasChanged() )); - connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem*,const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView *,TQListViewItem*,const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&))); connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecute(TQListViewItem*))); @@ -330,10 +330,10 @@ void KfindWindow::slotExecute(TQListViewItem* item) ((KfFileLVI*)item)->fileitem.run(); } -// Resizes KListView to occupy all visible space +// Resizes TDEListView to occupy all visible space void KfindWindow::resizeEvent(TQResizeEvent *e) { - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); resetColumns(false); clipper()->repaint(); } @@ -390,7 +390,7 @@ void KfindWindow::resetColumns(bool init) setColumnWidth(1, dir_w); } -void KfindWindow::slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p) +void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoint&p) { if (!item) return; int count = selectedItems().count(); @@ -401,13 +401,13 @@ void KfindWindow::slotContextMenu(KListView *,TQListViewItem *item,const TQPoint }; if (m_menu==0) - m_menu = new KPopupMenu(this); + m_menu = new TDEPopupMenu(this); else m_menu->clear(); if (count == 1) { - //menu = new KPopupMenu(item->text(0), this); + //menu = new TDEPopupMenu(item->text(0), this); m_menu->insertTitle(item->text(0)); m_menu->insertItem(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding())); m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder())); diff --git a/kfind/kfwin.h b/kfind/kfwin.h index ded6a0631..66d9424b2 100644 --- a/kfind/kfwin.h +++ b/kfind/kfwin.h @@ -14,7 +14,7 @@ class KfArchiver; class TQPixmap; class TQFileInfo; -class KPopupMenu; +class TDEPopupMenu; class KfindWindow; class KfFileLVI : public TQListViewItem @@ -29,7 +29,7 @@ class KfFileLVI : public TQListViewItem KFileItem fileitem; }; -class KfindWindow: public KListView +class KfindWindow: public TDEListView { Q_OBJECT public: @@ -44,7 +44,7 @@ public: public slots: void copySelection(); - void slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p); + void slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoint&p); private slots: void deleteFiles(); @@ -66,7 +66,7 @@ signals: private: TQString m_baseDir; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; bool haveSelection; bool m_pressed; void resetColumns(bool init); -- cgit v1.2.1