From fd5d099065a748cac49e20a13481f85666c53c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:12 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kgantt/kgantt/KGantt.h | 4 ++-- kgantt/kgantt/xQGanttBarViewPort.cpp | 16 ++++++++-------- kgantt/kgantt/xQGanttBarViewPort.h | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kgantt') diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index 200b5a434..950bd7c7e 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -179,7 +179,7 @@ public: /*! * */ - KPopupMenu* menu() { + TDEPopupMenu* menu() { return _ganttbar->viewport()->menu(); } @@ -195,7 +195,7 @@ public: * you want to access the pointer to a already created toolbar you * can invoke this method without any parameter. */ - KToolBar* toolbar(TQMainWindow* mw = 0) { + TDEToolBar* toolbar(TQMainWindow* mw = 0) { return _ganttbar->viewport()->toolbar(mw); } diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index 536761eaa..e27140c0e 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -102,12 +102,12 @@ xQGanttBarViewPort::~xQGanttBarViewPort() -KToolBar* +TDEToolBar* xQGanttBarViewPort::toolbar(TQMainWindow* mw) { if(_toolbar || mw == 0) return _toolbar; - _toolbar = new KToolBar(mw,TQMainWindow::TQt::DockTop); + _toolbar = new TDEToolBar(mw,TQMainWindow::TQt::DockTop); mw->addToolBar(_toolbar); @@ -120,7 +120,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) TQT_TQOBJECT(this), TQT_SLOT(setSelect()), true, i18n("Select") ); - KPopupMenu *selectMenu = new KPopupMenu(_toolbar); + TDEPopupMenu *selectMenu = new TDEPopupMenu(_toolbar); /* @@ -139,7 +139,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) ); - KToolBarButton* b = _toolbar->getButton(0); + TDEToolBarButton* b = _toolbar->getButton(0); b->setDelayedPopup(selectMenu); @@ -148,7 +148,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) TQT_TQOBJECT(this), TQT_SLOT(setZoom()), true, i18n("Zoom") ); - KPopupMenu* zoomMenu = new KPopupMenu(_toolbar); + TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar); pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); @@ -181,13 +181,13 @@ void xQGanttBarViewPort::initMenu() ///////////////////////////////// { - _menu = new KPopupMenu(this); + _menu = new TDEPopupMenu(this); /* select */ - _selectMenu = new KPopupMenu(_menu); + _selectMenu = new TDEPopupMenu(_menu); TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelect.png not found !\n"); @@ -210,7 +210,7 @@ xQGanttBarViewPort::initMenu() zoom */ - KPopupMenu* _zoomMenu = new KPopupMenu(_menu); + TDEPopupMenu* _zoomMenu = new TDEPopupMenu(_menu); pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index 52244ea43..ec6beeffa 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -145,7 +145,7 @@ public: - KPopupMenu* menu() { + TDEPopupMenu* menu() { return _menu; } @@ -155,7 +155,7 @@ public: /*! * */ - KToolBar* toolbar(TQMainWindow* mw = 0); + TDEToolBar* toolbar(TQMainWindow* mw = 0); // zoom by factor sfactor and move wx,wy to the center @@ -269,12 +269,12 @@ private: static KGanttItem* _currentItem; - KPopupMenu* _menu; - KPopupMenu* _selectMenu; + TDEPopupMenu* _menu; + TDEPopupMenu* _selectMenu; KIconLoader* _iconloader; - KToolBar* _toolbar; + TDEToolBar* _toolbar; TQPoint* _startPoint, *_endPoint; -- cgit v1.2.1