diff options
Diffstat (limited to 'chalk/ui')
-rw-r--r-- | chalk/ui/kis_dlg_preferences.cc | 12 | ||||
-rw-r--r-- | chalk/ui/kis_filters_listview.cc | 8 | ||||
-rw-r--r-- | chalk/ui/kis_filters_listview.h | 2 | ||||
-rw-r--r-- | chalk/ui/kis_layerbox.cc | 14 | ||||
-rw-r--r-- | chalk/ui/kis_layerbox.h | 4 | ||||
-rw-r--r-- | chalk/ui/kis_previewwidget.cc | 8 |
6 files changed, 24 insertions, 24 deletions
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 1314e0e6..7d1f5faa 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -728,22 +728,22 @@ PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name ) { TQVBox *vbox; - vbox = addVBoxPage( i18n( "General"), i18n( "General"), BarIcon( "misc", KIcon::SizeMedium )); + vbox = addVBoxPage( i18n( "General"), i18n( "General"), BarIcon( "misc", TDEIcon::SizeMedium )); m_general = new GeneralTab( vbox ); #ifdef HAVE_GL - vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "tdescreensaver", KIcon::SizeMedium )); + vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "tdescreensaver", TDEIcon::SizeMedium )); m_displaySettings = new DisplaySettingsTab( vbox ); #endif - vbox = addVBoxPage( i18n( "Color Management"), i18n( "Color"), BarIcon( "colorize", KIcon::SizeMedium )); + vbox = addVBoxPage( i18n( "Color Management"), i18n( "Color"), BarIcon( "colorize", TDEIcon::SizeMedium )); m_colorSettings = new ColorSettingsTab( vbox ); - vbox = addVBoxPage( i18n( "Performance"), i18n( "Performance"), BarIcon( "fork", KIcon::SizeMedium )); + vbox = addVBoxPage( i18n( "Performance"), i18n( "Performance"), BarIcon( "fork", TDEIcon::SizeMedium )); m_performanceSettings = new PerformanceTab ( vbox ); - vbox = addVBoxPage ( i18n( "Tablet" ), i18n( "Tablet" ), BarIcon( "tablet", KIcon::SizeMedium )); + vbox = addVBoxPage ( i18n( "Tablet" ), i18n( "Tablet" ), BarIcon( "tablet", TDEIcon::SizeMedium )); m_tabletSettings = new TabletSettingsTab( vbox ); - vbox = addVBoxPage ( i18n( "Grid" ), i18n( "Grid" ), BarIcon( "grid", KIcon::SizeMedium )); + vbox = addVBoxPage ( i18n( "Grid" ), i18n( "Grid" ), BarIcon( "grid", TDEIcon::SizeMedium )); m_gridSettings = new GridSettingsTab( vbox ); } diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index 0112ceb0..c6343f39 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -107,7 +107,7 @@ KisFiltersIconViewItem::~KisFiltersIconViewItem() // ------------------------------------------------ KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers, const char* name) - : KIconView(parent, name) + : TDEIconView(parent, name) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -116,7 +116,7 @@ KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmen } KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFlags f, bool filterForAdjustmentLayers) - : KIconView(parent, name, f) + : TDEIconView(parent, name, f) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -125,7 +125,7 @@ KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFl } KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers, const char * name) - : KIconView(parent, name) + : TDEIconView(parent, name) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -140,7 +140,7 @@ KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool } KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* parent, bool filterForAdjustmentLayers, const char * name) - : KIconView(parent, name) + : TDEIconView(parent, name) , m_original(device) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) diff --git a/chalk/ui/kis_filters_listview.h b/chalk/ui/kis_filters_listview.h index 3b7fa77b..8d57bc87 100644 --- a/chalk/ui/kis_filters_listview.h +++ b/chalk/ui/kis_filters_listview.h @@ -102,7 +102,7 @@ private: KisFiltersThumbnailThread * m_thread; }; -class KisFiltersListView : public KIconView { +class KisFiltersListView : public TDEIconView { public: explicit KisFiltersListView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false); diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index e5b8dea4..7e14dcf0 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -82,17 +82,17 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char TQToolTip::add(m_lst->bnProperties, i18n("Properties for layer")); - KIconLoader il( "chalk" ); + TDEIconLoader il( "chalk" ); list()->setPreviewsShown(true); list()->setFoldersCanBeActive(true); - list()->addProperty("visible", i18n("Visible"), loadPixmap("visible.png", il, KIcon::SizeSmallMedium), - loadPixmap("novisible.png", il, KIcon::SizeSmallMedium), true); + list()->addProperty("visible", i18n("Visible"), loadPixmap("visible.png", il, TDEIcon::SizeSmallMedium), + loadPixmap("novisible.png", il, TDEIcon::SizeSmallMedium), true); - list()->addProperty("locked", i18n("Locked"), loadPixmap("locked.png", il, KIcon::SizeSmallMedium), - loadPixmap("unlocked.png", il, KIcon::SizeSmallMedium)); + list()->addProperty("locked", i18n("Locked"), loadPixmap("locked.png", il, TDEIcon::SizeSmallMedium), + loadPixmap("unlocked.png", il, TDEIcon::SizeSmallMedium)); connect(list()->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); @@ -588,10 +588,10 @@ void KisLayerBox::setUpdatesAndSignalsEnabled(bool enable) } -TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader& +TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const TDEIconLoader& il, int size) { - TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size); + TQPixmap pixmap = il.loadIcon(filename, TDEIcon::NoGroup, size); if (pixmap.isNull()) KMessageBox::error(0, i18n("Cannot find %1").arg(filename), diff --git a/chalk/ui/kis_layerbox.h b/chalk/ui/kis_layerbox.h index 9d05601f..fb93bb0f 100644 --- a/chalk/ui/kis_layerbox.h +++ b/chalk/ui/kis_layerbox.h @@ -33,7 +33,7 @@ class WdgLayerBox; class TQButton; class TQPainter; class TQWidget; -class KIconLoader; +class TDEIconLoader; class TDEPopupMenu; class KoDocumentEntry; class KisCompositeOp; @@ -106,7 +106,7 @@ private slots: private: void updateUI(); - TQPixmap loadPixmap(const TQString& filename, const KIconLoader& il, int size); + TQPixmap loadPixmap(const TQString& filename, const TDEIconLoader& il, int size); KisLayerList* list() const; void markModified(KisLayer *layer); diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc index daed3a14..b7045f16 100644 --- a/chalk/ui/kis_previewwidget.cc +++ b/chalk/ui/kis_previewwidget.cc @@ -85,17 +85,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name ) , m_firstFilter(true) , m_firstZoom(true) { - btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 )); + btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", TDEIcon::MainToolbar, 16 )); connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn())); - btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 )); + btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", TDEIcon::MainToolbar, 16 )); connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut())); - btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 )); + btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", TDEIcon::MainToolbar, 16 )); connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate())); connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool))); connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool))); - btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 )); + btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", TDEIcon::MainToolbar, 16 )); connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne())); m_progress = new KisLabelProgress(frmProgress); |