From b97ee238f88e9578da228388210cd8cab5360778 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:18:14 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kgantt/kgantt/xQGanttBarViewPort.cpp | 30 +++++++++++++++--------------- kgantt/kgantt/xQGanttBarViewPort.h | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kgantt') diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index 1abf46d70..1a3c8a7da 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -55,7 +55,7 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, connect(_itemTextEdit, TQT_SIGNAL(returnPressed ()), this, TQT_SLOT(textEdited())); - _iconloader = new KIconLoader(); + _iconloader = new TDEIconLoader(); initMenu(); @@ -112,7 +112,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) mw->addToolBar(_toolbar); - // KIconLoader* iconloader = new KIconLoader("kgantt"); + // TDEIconLoader* iconloader = new TDEIconLoader("kgantt"); _toolbar->insertButton("ganttSelect.png", 0, @@ -126,7 +126,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) /* select all items */ - TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", KIcon::Toolbar , 16 ); + TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelecttask.png not found !\n"); selectMenu->insertItem(pix, i18n("Select All"), TQT_TQOBJECT(this), TQT_SLOT(selectAll()) ); @@ -134,7 +134,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) /* unselect all items */ - pix = _iconloader->loadIcon("ganttUnselecttask", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttUnselecttask.png not found !\n"); selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) ); @@ -150,16 +150,16 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar); - pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); zoomMenu->insertItem(pix, i18n("Zoom All"), TQT_TQOBJECT(this), TQT_SLOT(zoomAll()) ); zoomMenu->insertSeparator(); - pix = _iconloader->loadIcon("viewmag+.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag+.png not found !\n"); zoomMenu->insertItem(pix, i18n("Zoom In +"), TQT_TQOBJECT(this), TQT_SLOT(zoomIn()) ); - pix = _iconloader->loadIcon("viewmag-.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag-.png not found !\n"); zoomMenu->insertItem(pix, i18n("Zoom Out -"), TQT_TQOBJECT(this), TQT_SLOT(zoomOut()) ); @@ -189,17 +189,17 @@ xQGanttBarViewPort::initMenu() _selectMenu = new TDEPopupMenu(_menu); - TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", KIcon::Toolbar , 16 ); + TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelect.png not found !\n"); _selectMenu->insertItem(pix, i18n("Select Mode"), this, TQT_SLOT(setSelect())); _selectMenu->insertSeparator(); - pix = _iconloader->loadIcon("ganttSelecttask.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelecttask.png not found !\n"); _selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) ); - pix = _iconloader->loadIcon("ganttUnselecttask", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttUnselecttask.png not found !\n"); _selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) ); @@ -212,7 +212,7 @@ xQGanttBarViewPort::initMenu() TDEPopupMenu* _zoomMenu = new TDEPopupMenu(_menu); - pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); _zoomMenu->insertItem(i18n("Zoom Mode"), this, TQT_SLOT(setZoom()) ); @@ -221,23 +221,23 @@ xQGanttBarViewPort::initMenu() _zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) ); _zoomMenu->insertSeparator(); - pix = _iconloader->loadIcon("viewmag+.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag+.png not found !\n"); _zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) ); - pix = _iconloader->loadIcon("viewmag-.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag-.png not found !\n"); _zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) ); _menu->insertItem( "Zoom", _zoomMenu); - pix = _iconloader->loadIcon("move.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("move.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("move.png not found !\n"); _menu->insertItem(pix, i18n("Move Mode"), this, TQT_SLOT(setMove()) ); _menu->insertSeparator(); - pix = _iconloader->loadIcon("configure.png", KIcon::Toolbar , 16 ); + pix = _iconloader->loadIcon("configure.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("configure.png not found !\n"); _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig())); diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index 66f44be98..c78ffd5a7 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -272,7 +272,7 @@ private: TDEPopupMenu* _menu; TDEPopupMenu* _selectMenu; - KIconLoader* _iconloader; + TDEIconLoader* _iconloader; TDEToolBar* _toolbar; -- cgit v1.2.1