TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 391e0b69f2
commit 1d4158dd75
83 changed files with 251 additions and 251 deletions
Show Stats Download Patch File Download Diff File

12
chalk/ui/kis_dlg_preferences.cc
Unescape View File

@ -728,22 +728,22 @@ PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name )
{ {
TQVBox *vbox; 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 ); m_general = new GeneralTab( vbox );
#ifdef HAVE_GL #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 ); m_displaySettings = new DisplaySettingsTab( vbox );
#endif #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 ); 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 ); 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 ); 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 ); m_gridSettings = new GridSettingsTab( vbox );
} }

8
chalk/ui/kis_filters_listview.cc
Unescape View File

@ -107,7 +107,7 @@ KisFiltersIconViewItem::~KisFiltersIconViewItem()
// ------------------------------------------------ // ------------------------------------------------
KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers, const char* name) KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers, const char* name)
: KIconView(parent, name) : TDEIconView(parent, name)
, m_original(0) , m_original(0)
, m_profile(0) , m_profile(0)
, m_filterForAdjustmentLayers(filterForAdjustmentLayers) , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
@ -116,7 +116,7 @@ KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmen
} }
KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFlags f, bool filterForAdjustmentLayers) KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFlags f, bool filterForAdjustmentLayers)
: KIconView(parent, name, f) : TDEIconView(parent, name, f)
, m_original(0) , m_original(0)
, m_profile(0) , m_profile(0)
, m_filterForAdjustmentLayers(filterForAdjustmentLayers) , 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) KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers, const char * name)
: KIconView(parent, name) : TDEIconView(parent, name)
, m_original(0) , m_original(0)
, m_profile(0) , m_profile(0)
, m_filterForAdjustmentLayers(filterForAdjustmentLayers) , 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) KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* parent, bool filterForAdjustmentLayers, const char * name)
: KIconView(parent, name) : TDEIconView(parent, name)
, m_original(device) , m_original(device)
, m_profile(0) , m_profile(0)
, m_filterForAdjustmentLayers(filterForAdjustmentLayers) , m_filterForAdjustmentLayers(filterForAdjustmentLayers)

2
chalk/ui/kis_filters_listview.h
Unescape View File

@ -102,7 +102,7 @@ private:
KisFiltersThumbnailThread * m_thread; KisFiltersThumbnailThread * m_thread;
}; };
class KisFiltersListView : public KIconView { class KisFiltersListView : public TDEIconView {
public: public:
explicit KisFiltersListView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false); explicit KisFiltersListView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false);

14
chalk/ui/kis_layerbox.cc
Unescape View File

@ -82,17 +82,17 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
TQToolTip::add(m_lst->bnProperties, i18n("Properties for layer")); TQToolTip::add(m_lst->bnProperties, i18n("Properties for layer"));
KIconLoader il( "chalk" ); TDEIconLoader il( "chalk" );
list()->setPreviewsShown(true); list()->setPreviewsShown(true);
list()->setFoldersCanBeActive(true); list()->setFoldersCanBeActive(true);
list()->addProperty("visible", i18n("Visible"), loadPixmap("visible.png", il, KIcon::SizeSmallMedium), list()->addProperty("visible", i18n("Visible"), loadPixmap("visible.png", il, TDEIcon::SizeSmallMedium),
loadPixmap("novisible.png", il, KIcon::SizeSmallMedium), true); loadPixmap("novisible.png", il, TDEIcon::SizeSmallMedium), true);
list()->addProperty("locked", i18n("Locked"), loadPixmap("locked.png", il, KIcon::SizeSmallMedium), list()->addProperty("locked", i18n("Locked"), loadPixmap("locked.png", il, TDEIcon::SizeSmallMedium),
loadPixmap("unlocked.png", il, KIcon::SizeSmallMedium)); loadPixmap("unlocked.png", il, TDEIcon::SizeSmallMedium));
connect(list()->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); 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) il, int size)
{ {
TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size); TQPixmap pixmap = il.loadIcon(filename, TDEIcon::NoGroup, size);
if (pixmap.isNull()) if (pixmap.isNull())
KMessageBox::error(0, i18n("Cannot find %1").arg(filename), KMessageBox::error(0, i18n("Cannot find %1").arg(filename),

4
chalk/ui/kis_layerbox.h
Unescape View File

@ -33,7 +33,7 @@ class WdgLayerBox;
class TQButton; class TQButton;
class TQPainter; class TQPainter;
class TQWidget; class TQWidget;
class KIconLoader; class TDEIconLoader;
class TDEPopupMenu; class TDEPopupMenu;
class KoDocumentEntry; class KoDocumentEntry;
class KisCompositeOp; class KisCompositeOp;
@ -106,7 +106,7 @@ private slots:
private: private:
void updateUI(); 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; KisLayerList* list() const;
void markModified(KisLayer *layer); void markModified(KisLayer *layer);

8
chalk/ui/kis_previewwidget.cc
Unescape View File

@ -85,17 +85,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name )
, m_firstFilter(true) , m_firstFilter(true)
, m_firstZoom(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())); 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())); 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(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate()));
connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool))); connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool)));
connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(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())); connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne()));
m_progress = new KisLabelProgress(frmProgress); m_progress = new KisLabelProgress(frmProgress);

8
karbon/dialogs/vconfiguredlg.cc
Unescape View File

@ -51,19 +51,19 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
{ {
TQVBox * page = addVBoxPage( TQVBox * page = addVBoxPage(
i18n( "Interface" ), i18n( "Interface" ), i18n( "Interface" ), i18n( "Interface" ),
BarIcon( "misc", KIcon::SizeMedium ) ); BarIcon( "misc", TDEIcon::SizeMedium ) );
m_interfacePage = new VConfigInterfacePage( parent, page ); m_interfacePage = new VConfigInterfacePage( parent, page );
page = addVBoxPage( page = addVBoxPage(
i18n( "Misc" ), i18n( "Misc" ), i18n( "Misc" ), i18n( "Misc" ),
BarIcon( "misc", KIcon::SizeMedium ) ); BarIcon( "misc", TDEIcon::SizeMedium ) );
m_miscPage = new VConfigMiscPage( parent, page ); m_miscPage = new VConfigMiscPage( parent, page );
page = addVBoxPage( page = addVBoxPage(
i18n( "Grid" ), i18n( "Grid" ), i18n( "Grid" ), i18n( "Grid" ),
BarIcon( "grid", KIcon::SizeMedium ) ); BarIcon( "grid", TDEIcon::SizeMedium ) );
m_gridPage = new VConfigGridPage( parent, page ); m_gridPage = new VConfigGridPage( parent, page );
@ -71,7 +71,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
page = addVBoxPage( page = addVBoxPage(
i18n( "Document" ), i18n( "Document Settings" ), i18n( "Document" ), i18n( "Document Settings" ),
BarIcon( "document", KIcon::SizeMedium ) ); BarIcon( "document", TDEIcon::SizeMedium ) );
m_defaultDocPage = new VConfigDefaultPage( parent, page ); m_defaultDocPage = new VConfigDefaultPage( parent, page );
connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) ); connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );

10
karbon/dockers/vdocumentdocker.cc
Unescape View File

@ -357,9 +357,9 @@ VObjectListViewItem::update()
// set thumb preview, lock and visible pixmaps // set thumb preview, lock and visible pixmaps
setPixmap( 0, preview ); setPixmap( 0, preview );
TQString s = ( m_object->state() == VObject::normal_locked || m_object->state() == VObject::hidden_locked ) ? "locked" : "unlocked"; TQString s = ( m_object->state() == VObject::normal_locked || m_object->state() == VObject::hidden_locked ) ? "locked" : "unlocked";
setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) ); setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
s = ( m_object->state() == VObject::hidden || m_object->state() == VObject::hidden_locked ) ? "14_layer_novisible" : "14_layer_visible"; s = ( m_object->state() == VObject::hidden || m_object->state() == VObject::hidden_locked ) ? "14_layer_novisible" : "14_layer_visible";
setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) ); setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
} }
int int
@ -414,9 +414,9 @@ VLayerListViewItem::update()
// set thumb preview, lock and visible pixmaps // set thumb preview, lock and visible pixmaps
setPixmap( 0, preview ); setPixmap( 0, preview );
TQString s = ( m_layer->state() == VObject::normal_locked || m_layer->state() == VObject::hidden_locked ) ? "locked" : "unlocked"; TQString s = ( m_layer->state() == VObject::normal_locked || m_layer->state() == VObject::hidden_locked ) ? "locked" : "unlocked";
setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) ); setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
s = ( m_layer->state() == VObject::normal || m_layer->state() == VObject::normal_locked ) ? "14_layer_visible" : "14_layer_novisible"; s = ( m_layer->state() == VObject::normal || m_layer->state() == VObject::normal_locked ) ? "14_layer_visible" : "14_layer_novisible";
setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) ); setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
} // VLayerListViewItem::update } // VLayerListViewItem::update
void void
@ -1164,7 +1164,7 @@ VHistoryItem::init()
char buffer[70]; char buffer[70];
sprintf( buffer, "%064ld", ++g_lastKey ); sprintf( buffer, "%064ld", ++g_lastKey );
m_key = buffer; m_key = buffer;
setPixmap( 0, TQPixmap( TDEGlobal::iconLoader()->iconPath( m_command->icon(), KIcon::Small ) ) ); setPixmap( 0, TQPixmap( TDEGlobal::iconLoader()->iconPath( m_command->icon(), TDEIcon::Small ) ) );
setText( 0, m_command->name() ); setText( 0, m_command->name() );
} // VHistoryITem::init } // VHistoryITem::init

2
karbon/dockers/vstyledocker.cc
Unescape View File

@ -126,7 +126,7 @@ VStyleDocker::mouseReleaseEvent( TQMouseEvent * )
ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent ) ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent )
: TQWidget( parent ), m_part( part ) : TQWidget( parent ), m_part( part )
{ {
KIconLoader il; TDEIconLoader il;
TQVBoxLayout* layout = new TQVBoxLayout( this ); TQVBoxLayout* layout = new TQVBoxLayout( this );
layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) ); layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) );

2
karbon/render/vkopainter.cc
Unescape View File

@ -625,7 +625,7 @@ VKoPainter::applyPattern( ArtSVP *svp, bool fill )
VPattern pat = fill ? m_fill->pattern() : m_stroke->pattern(); VPattern pat = fill ? m_fill->pattern() : m_stroke->pattern();
if( !pat.isValid() ) { if( !pat.isValid() ) {
pat.load( TDEGlobal::iconLoader()->iconPath( "karbon.png", -KIcon::SizeMedium ) ); } pat.load( TDEGlobal::iconLoader()->iconPath( "karbon.png", -TDEIcon::SizeMedium ) ); }
if( !pat.isValid() ) { if( !pat.isValid() ) {
pat = *(dynamic_cast<VPattern *>(KarbonFactory::rServer()->patterns().getFirst() )) ;} pat = *(dynamic_cast<VPattern *>(KarbonFactory::rServer()->patterns().getFirst() )) ;}

4
karbon/tools/vtexttool.cc
Unescape View File

@ -116,8 +116,8 @@ ShadowPreview::paintEvent( TQPaintEvent* )
VColor color( VColor::rgb ); VColor color( VColor::rgb );
VFill fill; VFill fill;
KIconLoader il; TDEIconLoader il;
fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) ); fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
fill.setType( VFill::patt ); fill.setType( VFill::patt );
p.newPath(); p.newPath();

4
karbon/widgets/vgradienttabwidget.cc
Unescape View File

@ -130,8 +130,8 @@ void VGradientPreview::paintEvent( TQPaintEvent* )
gradient.setVector( KoPoint( 2 * ( width() / 3 ), height() / 3 ) ); gradient.setVector( KoPoint( 2 * ( width() / 3 ), height() / 3 ) );
} }
VFill fill; VFill fill;
KIconLoader il; TDEIconLoader il;
fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) ); fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
fill.setType( VFill::patt ); fill.setType( VFill::patt );
gp.setBrush( fill ); gp.setBrush( fill );
gp.fillPath(); gp.fillPath();

4
karbon/widgets/vgradientwidget.cc
Unescape View File

@ -104,8 +104,8 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
gradient.setFocalPoint( KoPoint( 2, 2 ) ); gradient.setFocalPoint( KoPoint( 2, 2 ) );
gradient.setVector( KoPoint( 2 + w, 2 ) ); gradient.setVector( KoPoint( 2 + w, 2 ) );
VFill fill; VFill fill;
KIconLoader il; TDEIconLoader il;
fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) ); fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
fill.setType( VFill::patt ); fill.setType( VFill::patt );
gp.setBrush( fill ); gp.setBrush( fill );
gp.drawRect( KoRect( 2, 2, w, gh ) ); gp.drawRect( KoRect( 2, 2, w, gh ) );

18
kchart/kchartDataEditor.cc
Unescape View File

@ -204,10 +204,10 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
// Buttons for Inserting / Removing rows & columns // Buttons for Inserting / Removing rows & columns
// The icon images are taken from the standard // The icon images are taken from the standard
m_insertRowButton = new TQPushButton( page); m_insertRowButton = new TQPushButton( page);
// In 2.0; this is supposed to be just KIcon("name").pixmap(32). // In 2.0; this is supposed to be just TDEIcon("name").pixmap(32).
m_insertRowButton->setPixmap( BarIcon( TQString("insert_table_row"), m_insertRowButton->setPixmap( BarIcon( TQString("insert_table_row"),
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DefaultState, TDEIcon::DefaultState,
KChartFactory::global() ) ); KChartFactory::global() ) );
//m_insertRowButton = new TQPushButton( i18n("Insert Row") , page); //m_insertRowButton = new TQPushButton( i18n("Insert Row") , page);
connect( m_insertRowButton, TQT_SIGNAL( clicked() ), connect( m_insertRowButton, TQT_SIGNAL( clicked() ),
@ -215,8 +215,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
m_removeRowButton = new TQPushButton( page ); m_removeRowButton = new TQPushButton( page );
m_removeRowButton->setPixmap( BarIcon( TQString("delete_table_row"), m_removeRowButton->setPixmap( BarIcon( TQString("delete_table_row"),
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DefaultState, TDEIcon::DefaultState,
KChartFactory::global() ) ); KChartFactory::global() ) );
//m_removeRowButton = new TQPushButton( i18n("Remove Row") , page); //m_removeRowButton = new TQPushButton( i18n("Remove Row") , page);
connect( m_removeRowButton, TQT_SIGNAL( clicked() ), connect( m_removeRowButton, TQT_SIGNAL( clicked() ),
@ -224,8 +224,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
m_insertColButton = new TQPushButton( page ); m_insertColButton = new TQPushButton( page );
m_insertColButton->setPixmap( BarIcon( TQString("insert_table_col"), m_insertColButton->setPixmap( BarIcon( TQString("insert_table_col"),
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DefaultState, TDEIcon::DefaultState,
KChartFactory::global() ) ); KChartFactory::global() ) );
//m_insertColButton = new TQPushButton( i18n("Insert Column") , page); //m_insertColButton = new TQPushButton( i18n("Insert Column") , page);
connect( m_insertColButton, TQT_SIGNAL( clicked() ), connect( m_insertColButton, TQT_SIGNAL( clicked() ),
@ -233,8 +233,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
m_removeColButton = new TQPushButton( page ); m_removeColButton = new TQPushButton( page );
m_removeColButton->setPixmap( BarIcon( TQString("delete_table_col"), m_removeColButton->setPixmap( BarIcon( TQString("delete_table_col"),
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DefaultState, TDEIcon::DefaultState,
KChartFactory::global() ) ); KChartFactory::global() ) );
//m_removeColButton = new TQPushButton( i18n("Remove Column") , page); //m_removeColButton = new TQPushButton( i18n("Remove Column") , page);
connect( m_removeColButton, TQT_SIGNAL( clicked() ), connect( m_removeColButton, TQT_SIGNAL( clicked() ),

4
kchart/kchartLegendConfigPage.cc
Unescape View File

@ -374,8 +374,8 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
TQPushButton* button = new TQPushButton( gb ); TQPushButton* button = new TQPushButton( gb );
button->setToggleButton( true ); button->setToggleButton( true );
button->setPixmap( BarIcon( icon, button->setPixmap( BarIcon( icon,
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DefaultState, TDEIcon::DefaultState,
KChartFactory::global() ) ); KChartFactory::global() ) );
TQToolTip::add( button, toolTipText ); TQToolTip::add( button, toolTipText );
layout->addWidget( button, posY, posX ); layout->addWidget( button, posY, posX );

4
kchart/kchartWizardSelectChartTypePage.cc
Unescape View File

@ -93,8 +93,8 @@ void KChartWizardSelectChartTypePage::addButton(const TQString &name,
{ {
KChartButton *button = new KChartButton( this, name, KChartButton *button = new KChartButton( this, name,
BarIcon( icon_name, BarIcon( icon_name,
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DefaultState, TDEIcon::DefaultState,
KChartFactory::global()) ); KChartFactory::global()) );
m_layout->addWidget(button, m_rowPos, m_colPos); m_layout->addWidget(button, m_rowPos, m_colPos);
m_typeBG->insert( button->button(), type ); m_typeBG->insert( button->button(), type );

4
kexi/doc/dev/CHANGELOG-Kexi-js
Unescape View File

@ -3504,7 +3504,7 @@ KexiBrowser
KexiTableView KexiTableView
- "start edit" action (for F2/Enter key) is now shared - "start edit" action (for F2/Enter key) is now shared
as "edit_edititem" action as "edit_edititem" action
- KexiKIconTableEdit introduced: Cell editor for displaying kde icon - KexiTDEIconTableEdit introduced: Cell editor for displaying kde icon
(using icon name provided as string). (using icon name provided as string).
- TableViewHeader (inherits QHeader) introduced: supports tooltips - TableViewHeader (inherits QHeader) introduced: supports tooltips
when needed (for column description of if column is not wide enough) when needed (for column description of if column is not wide enough)
@ -3515,7 +3515,7 @@ Table Designer
- "tablepart_toggle_pkey" shared action added for design view - "tablepart_toggle_pkey" shared action added for design view
- "Not empty" field's property is now called "Allow Zero Size" - "Not empty" field's property is now called "Allow Zero Size"
(and has opposite meaning) (and has opposite meaning)
- 1st column with "key" icon (for pkey) added (using KexiKIconTableEdit) - 1st column with "key" icon (for pkey) added (using KexiTDEIconTableEdit)
KexiDB KexiDB
- QString Field::subType() added - QString Field::subType() added
- QuerySchema::autoIncrementFields() fixed (caused crash sometimes) - QuerySchema::autoIncrementFields() fixed (caused crash sometimes)

4
kexi/formeditor/connectiondialog.cpp
Unescape View File

@ -59,7 +59,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
setDetails(true); setDetails(true);
m_pixmapLabel = new TQLabel(details); m_pixmapLabel = new TQLabel(details);
m_pixmapLabel->setFixedWidth( int(IconSize(KIcon::Desktop) * 1.5) ); m_pixmapLabel->setFixedWidth( int(IconSize(TDEIcon::Desktop) * 1.5) );
m_pixmapLabel->setAlignment(AlignHCenter | AlignTop); m_pixmapLabel->setAlignment(AlignHCenter | AlignTop);
m_textLabel = new TQLabel(details); m_textLabel = new TQLabel(details);
@ -102,7 +102,7 @@ void
ConnectionDialog::initTable() ConnectionDialog::initTable()
{ {
KexiTableViewColumn *col0 = new KexiTableViewColumn(i18n("OK?"), KexiDB::Field::Text); KexiTableViewColumn *col0 = new KexiTableViewColumn(i18n("OK?"), KexiDB::Field::Text);
col0->field()->setSubType("KIcon"); col0->field()->setSubType("TDEIcon");
col0->setReadOnly(true); col0->setReadOnly(true);
col0->field()->setDescription(i18n("Connection correctness")); col0->field()->setDescription(i18n("Connection correctness"));
m_data->addColumn(col0); m_data->addColumn(col0);

6
kexi/formeditor/objecttreeview.cpp
Unescape View File

@ -91,9 +91,9 @@ ObjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column,
{ {
TQString iconName TQString iconName
= ((ObjectTreeView*)listView())->iconNameForClass(m_item->widget()->className()); = ((ObjectTreeView*)listView())->iconNameForClass(m_item->widget()->className());
p->drawPixmap(margin, (height() - IconSize(KIcon::Small))/2 , SmallIcon(iconName)); p->drawPixmap(margin, (height() - IconSize(TDEIcon::Small))/2 , SmallIcon(iconName));
p->drawText( p->drawText(
TQRect(2*margin + IconSize(KIcon::Small),0,width, height()-1), TQRect(2*margin + IconSize(TDEIcon::Small),0,width, height()-1),
TQt::AlignVCenter, m_item->name()); TQt::AlignVCenter, m_item->name());
} }
else else
@ -136,7 +136,7 @@ ObjectTreeViewItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, i
TQString iconName TQString iconName
= ((ObjectTreeView*)listView())->iconNameForClass(item->m_item->widget()->className()); = ((ObjectTreeView*)listView())->iconNameForClass(item->m_item->widget()->className());
p->drawPixmap( p->drawPixmap(
(w - IconSize(KIcon::Small))/2, (item->height() - IconSize(KIcon::Small))/2 , (w - IconSize(TDEIcon::Small))/2, (item->height() - IconSize(TDEIcon::Small))/2 ,
SmallIcon(iconName)); SmallIcon(iconName));
p->translate(0, item->totalHeight()); p->translate(0, item->totalHeight());

4
kexi/kexiutils/utils.cpp
Unescape View File

@ -177,14 +177,14 @@ TQColor KexiUtils::bleachedColor(const TQColor& c, int factor)
TQIconSet KexiUtils::colorizeIconToTextColor(const TQPixmap& icon, const TQPalette& palette) TQIconSet KexiUtils::colorizeIconToTextColor(const TQPixmap& icon, const TQPalette& palette)
{ {
TQPixmap pm( TQPixmap pm(
KIconEffect().apply( icon, KIconEffect::Colorize, 1.0f, palette.active().buttonText(), false ) ); TDEIconEffect().apply( icon, TDEIconEffect::Colorize, 1.0f, palette.active().buttonText(), false ) );
KPixmap kpm(pm); KPixmap kpm(pm);
return TQIconSet( return TQIconSet(
KPixmapEffect::fade( kpm, 0.33, palette.active().button() ) ); KPixmapEffect::fade( kpm, 0.33, palette.active().button() ) );
} }
TQPixmap KexiUtils::emptyIcon(KIcon::Group iconGroup) TQPixmap KexiUtils::emptyIcon(TDEIcon::Group iconGroup)
{ {
TQPixmap noIcon( IconSize( iconGroup ), IconSize( iconGroup ) ); TQPixmap noIcon( IconSize( iconGroup ), IconSize( iconGroup ) );
TQBitmap bmpNoIcon(noIcon.size()); TQBitmap bmpNoIcon(noIcon.size());

2
kexi/kexiutils/utils.h
Unescape View File

@ -162,7 +162,7 @@ namespace KexiUtils
KEXIUTILS_EXPORT TQIconSet colorizeIconToTextColor(const TQPixmap& icon, const TQPalette& palette); KEXIUTILS_EXPORT TQIconSet colorizeIconToTextColor(const TQPixmap& icon, const TQPalette& palette);
/*! \return empty (fully transparent) pixmap that can be used as a place for icon of size \a iconGroup */ /*! \return empty (fully transparent) pixmap that can be used as a place for icon of size \a iconGroup */
KEXIUTILS_EXPORT TQPixmap emptyIcon(KIcon::Group iconGroup); KEXIUTILS_EXPORT TQPixmap emptyIcon(TDEIcon::Group iconGroup);
/*! Serializes \a map to \a array. /*! Serializes \a map to \a array.
KexiUtils::deserializeMap() can be used to deserialize this array back to map. */ KexiUtils::deserializeMap() can be used to deserialize this array back to map. */

2
kexi/main/keximainwindowimpl.cpp
Unescape View File

@ -3100,7 +3100,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
d->nameDialog->widget()->setCaptionText(partItem->caption()); d->nameDialog->widget()->setCaptionText(partItem->caption());
d->nameDialog->widget()->setNameText(partItem->name()); d->nameDialog->widget()->setNameText(partItem->name());
d->nameDialog->setCaption(i18n("Save Object As")); d->nameDialog->setCaption(i18n("Save Object As"));
d->nameDialog->setDialogIcon( DesktopIcon( info->itemIcon(), KIcon::SizeMedium ) ); d->nameDialog->setDialogIcon( DesktopIcon( info->itemIcon(), TDEIcon::SizeMedium ) );
allowOverwriting = false; allowOverwriting = false;
bool found; bool found;
do { do {

2
kexi/main/printing/kexisimpleprintingpagesetup.cpp
Unescape View File

@ -335,7 +335,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
// setFocusPolicy(WheelFocus); // setFocusPolicy(WheelFocus);
m_contents->setFocusProxy(m_contents->headerTitleLineEdit); m_contents->setFocusProxy(m_contents->headerTitleLineEdit);
m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(KIcon::Small) ); m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(TDEIcon::Small) );
m_contents->printButton->setText( KStdGuiItem::print().text() ); m_contents->printButton->setText( KStdGuiItem::print().text() );
connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print())); connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print()));

2
kexi/main/startup/KexiConnSelector.cpp
Unescape View File

@ -108,7 +108,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
d->conn_set = &conn_set; d->conn_set = &conn_set;
d->startDirOrVariable = startDirOrVariable; d->startDirOrVariable = startDirOrVariable;
TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
const TQPixmap &icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); const TQPixmap &icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
setIcon( icon ); setIcon( icon );
TQVBoxLayout* globalLyr = new TQVBoxLayout( this ); TQVBoxLayout* globalLyr = new TQVBoxLayout( this );

2
kexi/main/startup/KexiNewProjectWizard.cpp
Unescape View File

@ -108,7 +108,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
d->lvi_file = new TDEListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") ); d->lvi_file = new TDEListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") );
d->lvi_file->setPixmap(0, d->lvi_file->setPixmap(0,
TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType( TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), TDEIcon::Desktop
) )
); );
d->lvi_file->setMultiLinesEnabled( true ); d->lvi_file->setMultiLinesEnabled( true );

2
kexi/main/startup/KexiProjectSelector.cpp
Unescape View File

@ -105,7 +105,7 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget(
d->showProjectNameColumn = showProjectNameColumn; d->showProjectNameColumn = showProjectNameColumn;
d->showConnectionColumns = showConnectionColumns; d->showConnectionColumns = showConnectionColumns;
TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
setIcon( d->fileicon ); setIcon( d->fileicon );
d->dbicon = SmallIcon("database"); d->dbicon = SmallIcon("database");
// list->setHScrollBarMode( TQScrollView::AlwaysOn ); // list->setHScrollBarMode( TQScrollView::AlwaysOn );

8
kexi/main/startup/KexiStartupDialog.cpp
Unescape View File

@ -69,9 +69,9 @@ public:
result = 0; result = 0;
TQString none, iconname; TQString none, iconname;
iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
kexi_sqlite_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); kexi_sqlite_icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
iconname = KMimeType::mimeType("application/x-kexiproject-shortcut")->icon(none,0); iconname = KMimeType::mimeType("application/x-kexiproject-shortcut")->icon(none,0);
kexi_shortcut_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); kexi_shortcut_icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
prj_selector = 0; prj_selector = 0;
chkDoNotShow = 0; chkDoNotShow = 0;
openExistingConnWidget = 0; openExistingConnWidget = 0;
@ -398,7 +398,7 @@ void KexiStartupDialog::setupPageTemplates()
void KexiStartupDialog::slotPageShown(TQWidget *page) void KexiStartupDialog::slotPageShown(TQWidget *page)
{ {
int idx = d->templatesWidget->pageIndex(page); int idx = d->templatesWidget->pageIndex(page);
// KIconView *templ = 0; // TDEIconView *templ = 0;
if (idx==d->templatesSectionID_blank) {//blank if (idx==d->templatesSectionID_blank) {//blank
// kdDebug() << "blank" << endl; // kdDebug() << "blank" << endl;
} }
@ -408,7 +408,7 @@ void KexiStartupDialog::slotPageShown(TQWidget *page)
else if (idx==d->templatesSectionID_templates) { else if (idx==d->templatesSectionID_templates) {
d->viewTemplates->populate(); d->viewTemplates->populate();
} }
/*later? KIconView *templ = d->viewTemplates->templates; /*later? TDEIconView *templ = d->viewTemplates->templates;
if (templ->count()==0) { if (templ->count()==0) {
//add items (on demand): //add items (on demand):
d->viewTemplates->addItem("cd_catalog", i18n("CD Catalog"), d->viewTemplates->addItem("cd_catalog", i18n("CD Catalog"),

2
kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
Unescape View File

@ -98,7 +98,7 @@ void KexiStartupDialogTemplatesPage::populate()
if (firstChild()) if (firstChild())
setSelected(firstChild(), true); setSelected(firstChild(), true);
// templates = new KIconView(this, "templates"); // templates = new TDEIconView(this, "templates");
// templates->setItemsMovable(false); // templates->setItemsMovable(false);
// templates->setShowToolTips(false); // templates->setShowToolTips(false);
// info = new KTextBrowser(this,"info"); // info = new KTextBrowser(this,"info");

2
kexi/main/startup/KexiStartupDialogTemplatesPage.h
Unescape View File

@ -51,7 +51,7 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public TDEListView
private: private:
bool m_popuplated : 1; bool m_popuplated : 1;
// KIconView *templates; // TDEIconView *templates;
// KTextBrowser *info; // KTextBrowser *info;
}; };

12
kexi/main/startup/KexiStartupFileDialog_win.cpp
Unescape View File

@ -84,7 +84,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
//TODO d->keepLocation = false; //TODO d->keepLocation = false;
//TODO d->operationMode = Opening; //TODO d->operationMode = Opening;
setMode(KFile::File | KFile::ExistingOnly); //(js) default: open action setMode(KFile::File | KFile::ExistingOnly); //(js) default: open action
setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Desktop) ); setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::Desktop) );
setDir(TQDir(startDir)); setDir(TQDir(startDir));
//TODO d->hasDefaultFilter = false; //TODO d->hasDefaultFilter = false;
//TODO d->hasView = false; //TODO d->hasView = false;
@ -122,12 +122,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
u.setPath( TQDir::rootDirPath() ); u.setPath( TQDir::rootDirPath() );
TQString text = i18n("Root Directory: %1").arg( u.path() ); TQString text = i18n("Root Directory: %1").arg( u.path() );
d->pathCombo->addDefaultURL( u, d->pathCombo->addDefaultURL( u,
KMimeType::pixmapForURL( u, 0, KIcon::Small ), KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text ); text );
u.setPath( TQDir::homeDirPath() ); u.setPath( TQDir::homeDirPath() );
text = i18n("Home Directory: %1").arg( u.path( +1 ) ); text = i18n("Home Directory: %1").arg( u.path( +1 ) );
d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text ); text );
KURL docPath; KURL docPath;
@ -135,14 +135,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
if ( u.path(+1) != docPath.path(+1) ) { if ( u.path(+1) != docPath.path(+1) ) {
text = i18n("Documents: %1").arg( docPath.path( +1 ) ); text = i18n("Documents: %1").arg( docPath.path( +1 ) );
d->pathCombo->addDefaultURL( u, d->pathCombo->addDefaultURL( u,
KMimeType::pixmapForURL( u, 0, KIcon::Small ), KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text ); text );
} }
u.setPath( TDEGlobalSettings::desktopPath() ); u.setPath( TDEGlobalSettings::desktopPath() );
text = i18n("Desktop: %1").arg( u.path( +1 ) ); text = i18n("Desktop: %1").arg( u.path( +1 ) );
d->pathCombo->addDefaultURL( u, d->pathCombo->addDefaultURL( u,
KMimeType::pixmapForURL( u, 0, KIcon::Small ), KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text ); text );
u.setPath( "/tmp" ); u.setPath( "/tmp" );
@ -387,7 +387,7 @@ void KexiStartupFileDialogBase::setOperationMode( KFileDialog::OperationMode mod
// d->keepLocation = (mode == Saving); // d->keepLocation = (mode == Saving);
if (mode == KFileDialog::Saving) { if (mode == KFileDialog::Saving) {
setMode( KFile::File ); setMode( KFile::File );
setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", KIcon::Desktop) ); setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", TDEIcon::Desktop) );
} }
//(js) filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving ); //(js) filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving );
//(js) d->okButton->setGuiItem( (mode == Saving) ? KStdGuiItem::save() : KStdGuiItem::ok() ); //(js) d->okButton->setGuiItem( (mode == Saving) ? KStdGuiItem::save() : KStdGuiItem::ok() );

8
kexi/plugins/forms/kexiactionselectiondialog.cpp
Unescape View File

@ -126,7 +126,7 @@ TDEActionsListViewBase::~TDEActionsListViewBase() {}
void TDEActionsListViewBase::init() void TDEActionsListViewBase::init()
{ {
setSorting(0); setSorting(0);
const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) );
TDEActionPtrList sharedActions( m_mainWin->allActions() ); TDEActionPtrList sharedActions( m_mainWin->allActions() );
const Kexi::ActionCategories *acat = Kexi::actionCategories(); const Kexi::ActionCategories *acat = Kexi::actionCategories();
foreach (TDEActionPtrList::ConstIterator, it, sharedActions) { foreach (TDEActionPtrList::ConstIterator, it, sharedActions) {
@ -144,7 +144,7 @@ void TDEActionsListViewBase::init()
ActionSelectorDialogListItem *pitem = new ActionSelectorDialogListItem((*it)->name(), ActionSelectorDialogListItem *pitem = new ActionSelectorDialogListItem((*it)->name(),
this, (*it)->toolTip().isEmpty() ? (*it)->text().replace("&", "") : (*it)->toolTip() ); this, (*it)->toolTip().isEmpty() ? (*it)->text().replace("&", "") : (*it)->toolTip() );
pitem->fifoSorting = false; //alpha sort pitem->fifoSorting = false; //alpha sort
pitem->setPixmap( 0, (*it)->iconSet( KIcon::Small, 16 ).pixmap( TQIconSet::Small, TQIconSet::Active ) ); pitem->setPixmap( 0, (*it)->iconSet( TDEIcon::Small, 16 ).pixmap( TQIconSet::Small, TQIconSet::Active ) );
if (!pitem->pixmap(0) || pitem->pixmap(0)->isNull()) if (!pitem->pixmap(0) || pitem->pixmap(0)->isNull())
pitem->setPixmap( 0, noIcon ); pitem->setPixmap( 0, noIcon );
} }
@ -192,7 +192,7 @@ public:
: ActionsListViewBase(parent) : ActionsListViewBase(parent)
{ {
TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") ); TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") );
const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) );
item->setPixmap(0, noIcon); item->setPixmap(0, noIcon);
item = new ActionSelectorDialogListItem("tdeaction", this, i18n("Application actions") ); item = new ActionSelectorDialogListItem("tdeaction", this, i18n("Application actions") );
item->setPixmap(0, SmallIcon("form_action")); item->setPixmap(0, SmallIcon("form_action"));
@ -263,7 +263,7 @@ class ActionToExecuteListView : public ActionsListViewBase
return; return;
int supportedViewModes = part->supportedViewModes(); int supportedViewModes = part->supportedViewModes();
ActionSelectorDialogListItem *item; ActionSelectorDialogListItem *item;
const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) );
if (supportedViewModes & Kexi::DataViewMode) { if (supportedViewModes & Kexi::DataViewMode) {
item = new ActionSelectorDialogListItem("open", this, i18n("Open in Data View")); item = new ActionSelectorDialogListItem("open", this, i18n("Open in Data View"));
item->setPixmap(0, SmallIcon("fileopen")); item->setPixmap(0, SmallIcon("fileopen"));

6
kexi/plugins/forms/kexidatasourcepage.cpp
Unescape View File

@ -80,7 +80,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
#endif #endif
m_widgetDSLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_widgetDSLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
m_widgetDSLabel->setMargin(2); m_widgetDSLabel->setMargin(2);
m_widgetDSLabel->setMinimumHeight(IconSize(KIcon::Small)+4); m_widgetDSLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
m_widgetDSLabel->setAlignment(AlignLeft|AlignBottom); m_widgetDSLabel->setAlignment(AlignLeft|AlignBottom);
hlyr->addWidget(m_widgetDSLabel); hlyr->addWidget(m_widgetDSLabel);
@ -106,7 +106,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
m_dataSourceLabel = new TQLabel(i18n("Form's data source:"), contents); m_dataSourceLabel = new TQLabel(i18n("Form's data source:"), contents);
m_dataSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_dataSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
m_dataSourceLabel->setMargin(2); m_dataSourceLabel->setMargin(2);
m_dataSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4); m_dataSourceLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
m_dataSourceLabel->setAlignment(AlignLeft|AlignBottom); m_dataSourceLabel->setAlignment(AlignLeft|AlignBottom);
hlyr->addWidget(m_dataSourceLabel); hlyr->addWidget(m_dataSourceLabel);
@ -169,7 +169,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
m_availableFieldsLabel = new TQLabel(i18n("Available fields:"), contents); m_availableFieldsLabel = new TQLabel(i18n("Available fields:"), contents);
m_availableFieldsLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_availableFieldsLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
m_availableFieldsLabel->setMargin(2); m_availableFieldsLabel->setMargin(2);
m_availableFieldsLabel->setMinimumHeight(IconSize(KIcon::Small)); m_availableFieldsLabel->setMinimumHeight(IconSize(TDEIcon::Small));
hlyr->addWidget(m_availableFieldsLabel); hlyr->addWidget(m_availableFieldsLabel);
m_addField = new KexiSmallToolButton(contents, i18n("Insert selected field into form", "Insert"), m_addField = new KexiSmallToolButton(contents, i18n("Insert selected field into form", "Insert"),

2
kexi/plugins/importexport/csv/kexicsvwidgets.cpp
Unescape View File

@ -199,7 +199,7 @@ void KexiCSVInfoLabel::setFileName( const TQString& fileName )
m_fnameLbl->setText( TQDir::convertSeparators(fileName) ); m_fnameLbl->setText( TQDir::convertSeparators(fileName) );
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
m_iconLbl->setPixmap( m_iconLbl->setPixmap(
KMimeType::pixmapForURL(KURL::fromPathOrURL(fileName), 0, KIcon::Desktop) ); KMimeType::pixmapForURL(KURL::fromPathOrURL(fileName), 0, TDEIcon::Desktop) );
} }
} }

2
kexi/plugins/macros/kexipart/keximacroerror.cpp
Unescape View File

@ -52,7 +52,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co
KoMacro::Exception* exception = context->exception(); KoMacro::Exception* exception = context->exception();
iconlbl->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32)); iconlbl->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", TDEIcon::Small, 32));
errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() )); errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() ));
int i = 1; int i = 1;

6
kexi/plugins/tables/kexilookupcolumnpage.cpp
Unescape View File

@ -144,7 +144,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
d->rowSourceLabel = new TQLabel(i18n("Row source:"), contents); d->rowSourceLabel = new TQLabel(i18n("Row source:"), contents);
d->rowSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->rowSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
d->rowSourceLabel->setMargin(2); d->rowSourceLabel->setMargin(2);
d->rowSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4); d->rowSourceLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
d->rowSourceLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); d->rowSourceLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
hlyr->addWidget(d->rowSourceLabel); hlyr->addWidget(d->rowSourceLabel);
@ -172,7 +172,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
d->boundColumnLabel = new TQLabel(i18n("Bound column:"), contents); d->boundColumnLabel = new TQLabel(i18n("Bound column:"), contents);
d->boundColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->boundColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
d->boundColumnLabel->setMargin(2); d->boundColumnLabel->setMargin(2);
d->boundColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4); d->boundColumnLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
d->boundColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); d->boundColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
hlyr->addWidget(d->boundColumnLabel); hlyr->addWidget(d->boundColumnLabel);
@ -194,7 +194,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
d->visibleColumnLabel = new TQLabel(i18n("Visible column:"), contents); d->visibleColumnLabel = new TQLabel(i18n("Visible column:"), contents);
d->visibleColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->visibleColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
d->visibleColumnLabel->setMargin(2); d->visibleColumnLabel->setMargin(2);
d->visibleColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4); d->visibleColumnLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
d->visibleColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); d->visibleColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
hlyr->addWidget(d->visibleColumnLabel); hlyr->addWidget(d->visibleColumnLabel);

4
kexi/plugins/tables/kexitabledesignerview.cpp
Unescape View File

@ -124,7 +124,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
i18n("Additional information about the field")); i18n("Additional information about the field"));
col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("info"), d->view->palette() ) ); col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("info"), d->view->palette() ) );
col->setHeaderTextVisible(false); col->setHeaderTextVisible(false);
col->field()->setSubType("KIcon"); col->field()->setSubType("TDEIcon");
col->setReadOnly(true); col->setReadOnly(true);
d->data->addColumn( col ); d->data->addColumn( col );
@ -268,7 +268,7 @@ void KexiTableDesignerView::initData()
} }
//column widths //column widths
d->view->setColumnWidth(COLUMN_ID_ICON, IconSize( KIcon::Small ) + 10); d->view->setColumnWidth(COLUMN_ID_ICON, IconSize( TDEIcon::Small ) + 10);
d->view->adjustColumnWidthToContents(COLUMN_ID_CAPTION); //adjust column width d->view->adjustColumnWidthToContents(COLUMN_ID_CAPTION); //adjust column width
d->view->setColumnWidth(COLUMN_ID_TYPE, d->maxTypeNameTextWidth + 2 * d->view->rowHeight()); d->view->setColumnWidth(COLUMN_ID_TYPE, d->maxTypeNameTextWidth + 2 * d->view->rowHeight());
d->view->setColumnStretchEnabled( true, COLUMN_ID_DESC ); //last column occupies the rest of the area d->view->setColumnStretchEnabled( true, COLUMN_ID_DESC ); //last column occupies the rest of the area

2
kexi/widget/kexibrowser.h
Unescape View File

@ -26,7 +26,7 @@
#include <tqintdict.h> #include <tqintdict.h>
class TQListViewItem; class TQListViewItem;
class KIconLoader; class TDEIconLoader;
class TDEPopupMenu; class TDEPopupMenu;
class TDEAction; class TDEAction;
class TDEActionMenu; class TDEActionMenu;

2
kexi/widget/kexifieldcombobox.cpp
Unescape View File

@ -51,7 +51,7 @@ class KexiFieldComboBox::Private
Private() Private()
// : schema(0) // : schema(0)
: keyIcon( SmallIcon("key") ) : keyIcon( SmallIcon("key") )
, noIcon( KexiUtils::emptyIcon(KIcon::Small) ) , noIcon( KexiUtils::emptyIcon(TDEIcon::Small) )
, table(true) , table(true)
{ {
} }

2
kexi/widget/kexifieldlistview.cpp
Unescape View File

@ -46,7 +46,7 @@ KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int opt
: TDEListView(parent, name) : TDEListView(parent, name)
, m_schema(0) , m_schema(0)
, m_keyIcon(SmallIcon("key")) , m_keyIcon(SmallIcon("key"))
, m_noIcon(KexiUtils::emptyIcon(KIcon::Small)) , m_noIcon(KexiUtils::emptyIcon(TDEIcon::Small))
, m_options(options) , m_options(options)
, m_allColumnsItem(0) , m_allColumnsItem(0)
{ {

2
kexi/widget/kexiprjtypeselector.cpp
Unescape View File

@ -29,7 +29,7 @@ KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent )
TQString none; TQString none;
icon_file->setPixmap( icon_file->setPixmap(
TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType( TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop, 48 KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), TDEIcon::Desktop, 48
) )
); );
icon_file->setFixedSize(icon_file->pixmap()->size()/2); icon_file->setFixedSize(icon_file->pixmap()->size()/2);

6
kexi/widget/kexipropertyeditorview.cpp
Unescape View File

@ -36,7 +36,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
TQHBoxLayout *hlyr = new TQHBoxLayout(this); TQHBoxLayout *hlyr = new TQHBoxLayout(this);
m_objectIconLabel = new TQLabel(this); m_objectIconLabel = new TQLabel(this);
m_objectIconLabel->setMargin(2); m_objectIconLabel->setMargin(2);
setFixedHeight( IconSize(KIcon::Small) + 2 + 2 ); setFixedHeight( IconSize(TDEIcon::Small) + 2 + 2 );
hlyr->addWidget(m_objectIconLabel); hlyr->addWidget(m_objectIconLabel);
m_objectNameLabel = new TQLabel(this); m_objectNameLabel = new TQLabel(this);
m_objectNameLabel->setMargin(2); m_objectNameLabel->setMargin(2);
@ -54,7 +54,7 @@ void KexiObjectInfoLabel::setObjectClassIcon(const TQString& name)
if (m_classIcon.isEmpty()) if (m_classIcon.isEmpty())
m_objectIconLabel->setFixedWidth( 0 ); m_objectIconLabel->setFixedWidth( 0 );
else else
m_objectIconLabel->setFixedWidth( IconSize(KIcon::Small) + 2 + 2 ); m_objectIconLabel->setFixedWidth( IconSize(TDEIcon::Small) + 2 + 2 );
m_objectIconLabel->setPixmap( SmallIcon(name) ); m_objectIconLabel->setPixmap( SmallIcon(name) );
} }
@ -121,7 +121,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
TQHBoxLayout *vlyr = new TQHBoxLayout(lyr); TQHBoxLayout *vlyr = new TQHBoxLayout(lyr);
d->objectIcon = new TQLabel(this); d->objectIcon = new TQLabel(this);
d->objectIcon->setMargin(2); d->objectIcon->setMargin(2);
d->objectIcon->setFixedHeight( IconSize(KIcon::Small) + 2 + 2 ); d->objectIcon->setFixedHeight( IconSize(TDEIcon::Small) + 2 + 2 );
vlyr->addWidget(d->objectIcon); vlyr->addWidget(d->objectIcon);
d->objectClassName = new TQLabel(this); d->objectClassName = new TQLabel(this);
d->objectClassName->setMargin(2); d->objectClassName->setMargin(2);

4
kexi/widget/kexismalltoolbutton.cpp
Unescape View File

@ -62,7 +62,7 @@ void KexiSmallToolButton::updateAction()
{ {
if (!m_action) if (!m_action)
return; return;
update(m_action->text(), m_action->iconSet(KIcon::Small)); update(m_action->text(), m_action->iconSet(TDEIcon::Small));
setAccel(m_action->shortcut()); setAccel(m_action->shortcut());
TQToolTip::add(this, m_action->toolTip()); TQToolTip::add(this, m_action->toolTip());
TQWhatsThis::add(this, m_action->whatsThis()); TQWhatsThis::add(this, m_action->whatsThis());
@ -92,7 +92,7 @@ void KexiSmallToolButton::update(const TQString& text, const TQIconSet& iconSet,
TQToolButton::setTextLabel(text, tipToo); TQToolButton::setTextLabel(text, tipToo);
} }
if (!iconSet.isNull()) { if (!iconSet.isNull()) {
width += IconSize(KIcon::Small); width += IconSize(TDEIcon::Small);
TQToolButton::setIconSet(iconSet); TQToolButton::setIconSet(iconSet);
} }
setFixedWidth( width ); setFixedWidth( width );

26
kexi/widget/pixmapcollection.cpp
Unescape View File

@ -99,7 +99,7 @@ PixmapCollection::getPixmap(const TQString &name)
if(m_pixmaps[name].second != 0) if(m_pixmaps[name].second != 0)
{ {
return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, KIcon::NoGroup, m_pixmaps[name].second); return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, TDEIcon::NoGroup, m_pixmaps[name].second);
} }
else else
return TQPixmap(m_pixmaps[name].first); return TQPixmap(m_pixmaps[name].first);
@ -180,9 +180,9 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
// Icon chooser button // Icon chooser button
m_button = new KIconButton(frame); m_button = new TDEIconButton(frame);
m_button->setIcon("kexi"); m_button->setIcon("kexi");
m_button->setIconSize(KIcon::SizeMedium); m_button->setIconSize(TDEIcon::SizeMedium);
l->addMultiCellWidget(m_button, 0, 1, 2, 2); l->addMultiCellWidget(m_button, 0, 1, 2, 2);
connect(m_button, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(updateIconName(TQString))); connect(m_button, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(updateIconName(TQString)));
connect(m_nameInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setIcon(const TQString &))); connect(m_nameInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setIcon(const TQString &)));
@ -203,15 +203,15 @@ LoadIconDialog::setIcon(const TQString &icon)
void void
LoadIconDialog::changeIconSize(int index) LoadIconDialog::changeIconSize(int index)
{ {
int size = KIcon::SizeMedium; int size = TDEIcon::SizeMedium;
switch(index) switch(index)
{ {
case 0: size = KIcon::SizeSmall; break; case 0: size = TDEIcon::SizeSmall; break;
//case 1: size = KIcon::SizeSmallMedium; break; //case 1: size = TDEIcon::SizeSmallMedium; break;
case 1: size = KIcon::SizeMedium; break; case 1: size = TDEIcon::SizeMedium; break;
case 2: size = KIcon::SizeLarge; break; case 2: size = TDEIcon::SizeLarge; break;
#if !defined(TQ_WS_WIN) && KDE_IS_VERSION(3,1,9) #if !defined(TQ_WS_WIN) && KDE_IS_VERSION(3,1,9)
case 3: size = KIcon::SizeHuge; break; case 3: size = TDEIcon::SizeHuge; break;
#endif #endif
default:; default:;
} }
@ -264,11 +264,11 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
vlayout->addStretch(); vlayout->addStretch();
// Setup the iconView // Setup the iconView
m_iconView = new KIconView(frame, "pixcollection_iconView"); m_iconView = new TDEIconView(frame, "pixcollection_iconView");
m_iconView->resize(100,100); m_iconView->resize(100,100);
m_iconView->setArrangement(TQIconView::LeftToRight); m_iconView->setArrangement(TQIconView::LeftToRight);
m_iconView->setAutoArrange(true); m_iconView->setAutoArrange(true);
m_iconView->setMode(KIconView::Select); m_iconView->setMode(TDEIconView::Select);
l->addWidget(m_iconView); l->addWidget(m_iconView);
connect(m_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(displayMenu(TQIconViewItem*, const TQPoint&))); connect(m_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(displayMenu(TQIconViewItem*, const TQPoint&)));
connect(m_iconView, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQT_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&))); connect(m_iconView, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQT_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&)));
@ -379,11 +379,11 @@ PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, c
m_collection = collection; m_collection = collection;
setInitialSize(TQSize(400, 200), true); setInitialSize(TQSize(400, 200), true);
m_iconView = new KIconView(this, "pixchooser_iconView"); m_iconView = new TDEIconView(this, "pixchooser_iconView");
setMainWidget(m_iconView); setMainWidget(m_iconView);
m_iconView->setArrangement(TQIconView::LeftToRight); m_iconView->setArrangement(TQIconView::LeftToRight);
m_iconView->setAutoArrange(true); m_iconView->setAutoArrange(true);
m_iconView->setMode(KIconView::Select); m_iconView->setMode(TDEIconView::Select);
PixmapMap::ConstIterator it; PixmapMap::ConstIterator it;
PixmapMap::ConstIterator endIt = collection->m_pixmaps.constEnd(); PixmapMap::ConstIterator endIt = collection->m_pixmaps.constEnd();

20
kexi/widget/pixmapcollection.h
Unescape View File

@ -32,8 +32,8 @@
#include <kurl.h> #include <kurl.h>
class TQPixmap; class TQPixmap;
class KIconView; class TDEIconView;
class KIconButton; class TDEIconButton;
class KLineEdit; class KLineEdit;
class TQDomNode; class TQDomNode;
@ -50,7 +50,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject
~PixmapCollection() {;} ~PixmapCollection() {;}
TQString addPixmapPath(const KURL &url); TQString addPixmapPath(const KURL &url);
TQString addPixmapName(const TQString &name, int size = KIcon::SizeMedium); TQString addPixmapName(const TQString &name, int size = TDEIcon::SizeMedium);
void removePixmap(const TQString &name); void removePixmap(const TQString &name);
bool contains(const TQString &name); bool contains(const TQString &name);
@ -97,7 +97,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionEditor : public KDialogBase
private: private:
enum { BNewItemPath = 101, BNewItemName, BDelItem}; enum { BNewItemPath = 101, BNewItemName, BDelItem};
KIconView *m_iconView; TDEIconView *m_iconView;
TQIntDict<TQToolButton> m_buttons; TQIntDict<TQToolButton> m_buttons;
PixmapCollection *m_collection; PixmapCollection *m_collection;
}; };
@ -122,7 +122,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionChooser : public KDialogBase
private: private:
PixmapCollection *m_collection; PixmapCollection *m_collection;
KIconView *m_iconView; TDEIconView *m_iconView;
}; };
//! A simple dialog to choose a KDE icon //! A simple dialog to choose a KDE icon
@ -145,15 +145,15 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase
private: private:
KLineEdit *m_nameInput; KLineEdit *m_nameInput;
KIconButton *m_button; TDEIconButton *m_button;
}; };
//! A Special KIconViewItem that holds the name of its associated pixmap (to allow renaming) //! A Special TDEIconViewItem that holds the name of its associated pixmap (to allow renaming)
class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public KIconViewItem class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public TDEIconViewItem
{ {
public: public:
PixmapIconViewItem(KIconView *parent, const TQString &text, const TQPixmap &icon) PixmapIconViewItem(TDEIconView *parent, const TQString &text, const TQPixmap &icon)
: KIconViewItem(parent, text, icon) { m_name = text; } : TDEIconViewItem(parent, text, icon) { m_name = text; }
~PixmapIconViewItem() {;} ~PixmapIconViewItem() {;}
void setName(const TQString &name) { m_name = name; } void setName(const TQString &name) { m_name = name; }

2
kexi/widget/relations/kexirelationviewtable.cpp
Unescape View File

@ -315,7 +315,7 @@ TQSize KexiRelationViewTable::sizeHint() const
// << ", " << fm.width(schema()->name()+" ") << endl; // << ", " << fm.width(schema()->name()+" ") << endl;
int maxWidth = -1; int maxWidth = -1;
const int iconWidth = IconSize(KIcon::Small) + fm.width("i")+20; const int iconWidth = IconSize(TDEIcon::Small) + fm.width("i")+20;
for (TQListViewItem *item = firstChild(); item; item = item->nextSibling()) for (TQListViewItem *item = firstChild(); item; item = item->nextSibling())
maxWidth = TQMAX(maxWidth, iconWidth + fm.width(item->text(0))); maxWidth = TQMAX(maxWidth, iconWidth + fm.width(item->text(0)));

36
kexi/widget/tableview/kexiblobtableedit.cpp
Unescape View File

@ -474,10 +474,10 @@ bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e )
KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiBlobEditorFactoryItem, KexiBlobTableEdit) KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiBlobEditorFactoryItem, KexiBlobTableEdit)
//======================= //=======================
// KexiKIconTableEdit class is temporarily here: // KexiTDEIconTableEdit class is temporarily here:
//! @internal //! @internal
class KexiKIconTableEdit::Private class KexiTDEIconTableEdit::Private
{ {
public: public:
Private() Private()
@ -490,61 +490,61 @@ public:
TQCache<TQPixmap> pixmapCache; TQCache<TQPixmap> pixmapCache;
}; };
KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent) KexiTDEIconTableEdit::KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
: KexiTableEdit(column, parent) : KexiTableEdit(column, parent)
, d( new Private() ) , d( new Private() )
{ {
setName("KexiKIconTableEdit"); setName("KexiTDEIconTableEdit");
init(); init();
} }
KexiKIconTableEdit::~KexiKIconTableEdit() KexiTDEIconTableEdit::~KexiTDEIconTableEdit()
{ {
delete d; delete d;
} }
void KexiKIconTableEdit::init() void KexiTDEIconTableEdit::init()
{ {
m_hasFocusableWidget = false; m_hasFocusableWidget = false;
d->pixmapCache.setAutoDelete(true); d->pixmapCache.setAutoDelete(true);
} }
void KexiKIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/) void KexiTDEIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/)
{ {
d->currentValue = m_origValue; d->currentValue = m_origValue;
} }
bool KexiKIconTableEdit::valueIsNull() bool KexiTDEIconTableEdit::valueIsNull()
{ {
return d->currentValue.isNull(); return d->currentValue.isNull();
} }
bool KexiKIconTableEdit::valueIsEmpty() bool KexiTDEIconTableEdit::valueIsEmpty()
{ {
return d->currentValue.isNull(); return d->currentValue.isNull();
} }
TQVariant KexiKIconTableEdit::value() TQVariant KexiTDEIconTableEdit::value()
{ {
return d->currentValue; return d->currentValue;
} }
void KexiKIconTableEdit::clear() void KexiTDEIconTableEdit::clear()
{ {
d->currentValue = TQVariant(); d->currentValue = TQVariant();
} }
bool KexiKIconTableEdit::cursorAtStart() bool KexiTDEIconTableEdit::cursorAtStart()
{ {
return true; return true;
} }
bool KexiKIconTableEdit::cursorAtEnd() bool KexiTDEIconTableEdit::cursorAtEnd()
{ {
return true; return true;
} }
void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val, void KexiTDEIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val,
TQString &/*txt*/, int &/*align*/, int &/*x*/, int &y_offset, int &w, int &h ) TQString &/*txt*/, int &/*align*/, int &/*x*/, int &y_offset, int &w, int &h )
{ {
Q_UNUSED( y_offset ); Q_UNUSED( y_offset );
@ -571,8 +571,8 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
TQPixmap *pix = 0; TQPixmap *pix = 0;
if (!key.isEmpty() && !(pix = d->pixmapCache[ key ])) { if (!key.isEmpty() && !(pix = d->pixmapCache[ key ])) {
//cache pixmap //cache pixmap
TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, KIcon::Small, TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, TDEIcon::Small,
0, KIcon::DefaultState, 0L, true/*canReturnNull*/ ); 0, TDEIcon::DefaultState, 0L, true/*canReturnNull*/ );
if (!pm.isNull()) { if (!pm.isNull()) {
pix = new TQPixmap(pm); pix = new TQPixmap(pm);
d->pixmapCache.insert(key, pix); d->pixmapCache.insert(key, pix);
@ -584,12 +584,12 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
} }
} }
void KexiKIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue) void KexiTDEIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue)
{ {
Q_UNUSED(value); Q_UNUSED(value);
Q_UNUSED(visibleValue); Q_UNUSED(visibleValue);
} }
KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiKIconTableEditorFactoryItem, KexiKIconTableEdit) KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiTDEIconTableEditorFactoryItem, KexiTDEIconTableEdit)
#include "kexiblobtableedit.moc" #include "kexiblobtableedit.moc"

8
kexi/widget/tableview/kexiblobtableedit.h
Unescape View File

@ -126,12 +126,12 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
/*! @short Cell editor for displaying kde icon (using icon name provided as string). /*! @short Cell editor for displaying kde icon (using icon name provided as string).
Read only. Read only.
*/ */
class KexiKIconTableEdit : public KexiTableEdit class KexiTDEIconTableEdit : public KexiTableEdit
{ {
public: public:
KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
virtual ~KexiKIconTableEdit(); virtual ~KexiTDEIconTableEdit();
//! \return true if editor's value is null (not empty) //! \return true if editor's value is null (not empty)
virtual bool valueIsNull(); virtual bool valueIsNull();
@ -166,6 +166,6 @@ class KexiKIconTableEdit : public KexiTableEdit
Private *d; Private *d;
}; };
KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiKIconTableEditorFactoryItem) KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiTDEIconTableEditorFactoryItem)
#endif #endif

2
kexi/widget/tableview/kexicelleditorfactory.cpp
Unescape View File

@ -119,7 +119,7 @@ void KexiCellEditorFactory::init()
KexiCellEditorFactory_static->registerItem( *new KexiDateTimeEditorFactoryItem(), KexiDB::Field::DateTime ); KexiCellEditorFactory_static->registerItem( *new KexiDateTimeEditorFactoryItem(), KexiDB::Field::DateTime );
KexiCellEditorFactory_static->registerItem( *new KexiComboBoxEditorFactoryItem(), KexiDB::Field::Enum ); KexiCellEditorFactory_static->registerItem( *new KexiComboBoxEditorFactoryItem(), KexiDB::Field::Enum );
KexiCellEditorFactory_static->registerItem( *new KexiBoolEditorFactoryItem(), KexiDB::Field::Boolean ); KexiCellEditorFactory_static->registerItem( *new KexiBoolEditorFactoryItem(), KexiDB::Field::Boolean );
KexiCellEditorFactory_static->registerItem( *new KexiKIconTableEditorFactoryItem(), KexiDB::Field::Text, "KIcon" ); KexiCellEditorFactory_static->registerItem( *new KexiTDEIconTableEditorFactoryItem(), KexiDB::Field::Text, "TDEIcon" );
//default type //default type
KexiCellEditorFactory_static->registerItem( *new KexiInputEditorFactoryItem(), KexiDB::Field::InvalidType ); KexiCellEditorFactory_static->registerItem( *new KexiInputEditorFactoryItem(), KexiDB::Field::InvalidType );
} }

2
kexi/widget/tableview/kexitableview.cpp
Unescape View File

@ -221,7 +221,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
#if 0 //moved to mainwindow's actions #if 0 //moved to mainwindow's actions
d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert); d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
d->menu_id_removeRecord = m_popupMenu->insertItem( d->menu_id_removeRecord = m_popupMenu->insertItem(
kapp->iconLoader()->loadIcon("button_cancel", KIcon::Small), kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete); i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
#endif #endif

4
kformula/kfconfig.cc
Unescape View File

@ -36,12 +36,12 @@ KFConfig::KFConfig( KFormulaPartView* parent )
{ {
//kdDebug( 40000 ) << "KFConfig::KFConfig" << endl; //kdDebug( 40000 ) << "KFConfig::KFConfig" << endl;
TQVBox* page1 = addVBoxPage( i18n( "Formula" ), i18n( "Formula Settings" ), TQVBox* page1 = addVBoxPage( i18n( "Formula" ), i18n( "Formula Settings" ),
BarIcon( "kformula", KIcon::SizeMedium ) ); BarIcon( "kformula", TDEIcon::SizeMedium ) );
_page = new KFormula::ConfigurePage( parent->document()->getDocument(), this, _page = new KFormula::ConfigurePage( parent->document()->getDocument(), this,
KFormulaFactory::global()->config(), KFormulaFactory::global()->config(),
page1 ); page1 );
// TQVBox* page2 = addVBoxPage( i18n( "Math Fonts" ), i18n( "Math Fonts Settings" ), // TQVBox* page2 = addVBoxPage( i18n( "Math Fonts" ), i18n( "Math Fonts Settings" ),
// BarIcon( "kformula", KIcon::SizeMedium ) ); // BarIcon( "kformula", TDEIcon::SizeMedium ) );
// _mathFontPage = new KFormula::MathFontsConfigurePage( parent->document()->getDocument(), this, // _mathFontPage = new KFormula::MathFontsConfigurePage( parent->document()->getDocument(), this,
// KFormulaFactory::global()->config(), // KFormulaFactory::global()->config(),
// page2 ); // page2 );

2
kivio/kiviopart/kivioarrowheadaction.cpp
Unescape View File

@ -93,7 +93,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
if ( hasIconSet() ) if ( hasIconSet() )
id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index ); id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
else else
id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), KIcon::Small), id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
text(), popupMenu(), -1, index ); text(), popupMenu(), -1, index );
if ( !isEnabled() ) if ( !isEnabled() )

2
kivio/kiviopart/kiviostencilsetaction.cpp
Unescape View File

@ -106,7 +106,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
if ( hasIconSet() ) if ( hasIconSet() )
id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index ); id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
else else
id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), KIcon::Small), id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
text(), popupMenu(), -1, index ); text(), popupMenu(), -1, index );
if ( !isEnabled() ) if ( !isEnabled() )

4
kivio/kiviopart/ui/kiviooptionsdialog.cpp
Unescape View File

@ -98,7 +98,7 @@ KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
void KivioOptionsDialog::initPage() void KivioOptionsDialog::initPage()
{ {
TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"), TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
kapp->iconLoader()->loadIcon("empty", KIcon::Toolbar, 32)); kapp->iconLoader()->loadIcon("empty", TDEIcon::Toolbar, 32));
m_pageIndex = pageIndex(page); m_pageIndex = pageIndex(page);
KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent())); KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
@ -155,7 +155,7 @@ void KivioOptionsDialog::initPage()
void KivioOptionsDialog::initGrid() void KivioOptionsDialog::initGrid()
{ {
TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium )); TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", TDEIcon::SizeMedium ));
m_gridIndex = pageIndex(page); m_gridIndex = pageIndex(page);
KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->unit(); KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->unit();

2
koshell/iconsidepane.cpp
Unescape View File

@ -69,7 +69,7 @@ void EntryItem::reloadPixmap()
{ {
int size = (int)navigator()->viewMode(); int size = (int)navigator()->viewMode();
if ( size != 0 ) if ( size != 0 )
mPixmap = TDEGlobal::iconLoader()->loadIcon( mPixmapName, KIcon::Desktop, size ); mPixmap = TDEGlobal::iconLoader()->loadIcon( mPixmapName, TDEIcon::Desktop, size );
else else
mPixmap = TQPixmap(); mPixmap = TQPixmap();
} }

8
koshell/koshell_shell.cc
Unescape View File

@ -345,7 +345,7 @@ void KoShellWindow::setRootDocument( KoDocument * doc )
v->setGeometry( 0, 0, m_pFrame->width(), m_pFrame->height() ); v->setGeometry( 0, 0, m_pFrame->width(), m_pFrame->height() );
v->setPartManager( partManager() ); v->setPartManager( partManager() );
m_pFrame->addTab( v, TDEGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), KIcon::Small ), i18n("Untitled") ); m_pFrame->addTab( v, TDEGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), TDEIcon::Small ), i18n("Untitled") );
// Create a new page for this doc // Create a new page for this doc
Page page; Page page;
@ -670,9 +670,9 @@ TQString KoShellWindow::configFile() const
void KoShellWindow::tab_contextMenu(TQWidget * w,const TQPoint &p) void KoShellWindow::tab_contextMenu(TQWidget * w,const TQPoint &p)
{ {
TDEPopupMenu menu; TDEPopupMenu menu;
KIconLoader il; TDEIconLoader il;
int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", KIcon::Small ), i18n("Save") ); int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", TDEIcon::Small ), i18n("Save") );
int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", KIcon::Small ), i18n("Close") ); int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", TDEIcon::Small ), i18n("Close") );
int tabnr = m_pFrame->indexOf( w ); int tabnr = m_pFrame->indexOf( w );
Page page = m_lstPages[tabnr]; Page page = m_lstPages[tabnr];

2
kplato/kptconfigdialog.cc
Unescape View File

@ -41,7 +41,7 @@ namespace KPlato
// little helper stolen from kmail/kword // little helper stolen from kmail/kword
static inline TQPixmap loadIcon( const char * name ) { static inline TQPixmap loadIcon( const char * name ) {
return TDEGlobal::instance()->iconLoader() return TDEGlobal::instance()->iconLoader()
->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); ->loadIcon( TQString::fromLatin1(name), TDEIcon::NoGroup, TDEIcon::SizeMedium );
} }

14
kpresenter/KPrConfig.cpp
Unescape View File

@ -87,27 +87,27 @@ KPrConfig::KPrConfig( KPrView* parent )
{ {
m_doc = parent->kPresenterDoc(); m_doc = parent->kPresenterDoc();
TQVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"), TQVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"),
BarIcon("misc", KIcon::SizeMedium) ); BarIcon("misc", TDEIcon::SizeMedium) );
_interfacePage=new KPrConfigureInterfacePage( parent, page ); _interfacePage=new KPrConfigureInterfacePage( parent, page );
page = addVBoxPage( i18n("Color"), i18n("Color"), page = addVBoxPage( i18n("Color"), i18n("Color"),
BarIcon("colorize", KIcon::SizeMedium) ); BarIcon("colorize", TDEIcon::SizeMedium) );
_colorBackground = new KPrConfigureColorBackground( parent, page ); _colorBackground = new KPrConfigureColorBackground( parent, page );
page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"), page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"),
BarIcon("spellcheck", KIcon::SizeMedium) ); BarIcon("spellcheck", TDEIcon::SizeMedium) );
_spellPage=new KPrConfigureSpellPage(parent, page); _spellPage=new KPrConfigureSpellPage(parent, page);
page = addVBoxPage( i18n("Misc"), i18n("Misc"), page = addVBoxPage( i18n("Misc"), i18n("Misc"),
BarIcon("misc", KIcon::SizeMedium) ); BarIcon("misc", TDEIcon::SizeMedium) );
_miscPage=new KPrConfigureMiscPage(parent, page); _miscPage=new KPrConfigureMiscPage(parent, page);
page = addVBoxPage( i18n("Document"), i18n("Document Settings"), page = addVBoxPage( i18n("Document"), i18n("Document Settings"),
BarIcon("kpresenter_kpr", KIcon::SizeMedium) ); BarIcon("kpresenter_kpr", TDEIcon::SizeMedium) );
_defaultDocPage=new KPrConfigureDefaultDocPage(parent, page); _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page);
page = addVBoxPage( i18n("Tools"), i18n("Default Tools Settings"), page = addVBoxPage( i18n("Tools"), i18n("Default Tools Settings"),
BarIcon("configure", KIcon::SizeMedium) ); BarIcon("configure", TDEIcon::SizeMedium) );
_toolsPage=new KPrConfigureToolsPage(parent, page); _toolsPage=new KPrConfigureToolsPage(parent, page);
@ -118,7 +118,7 @@ KPrConfig::KPrConfig( KPrView* parent )
if (KoSpeaker::isKttsdInstalled()) { if (KoSpeaker::isKttsdInstalled()) {
page = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"), page = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"),
BarIcon("access", KIcon::SizeMedium) ); BarIcon("access", TDEIcon::SizeMedium) );
m_ttsPage=new KPrConfigureTTSPage(parent, page); m_ttsPage=new KPrConfigureTTSPage(parent, page);
} else m_ttsPage = 0; } else m_ttsPage = 0;

6
kpresenter/KPrRotationDialogImpl.cpp
Unescape View File

@ -117,9 +117,9 @@ void KPrRotationDialogImpl::angleMode( int angle )
KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int id ) KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int id )
: TQLabel( parent ) : TQLabel( parent )
{ {
KIconLoader il("kpresenter"); TDEIconLoader il("kpresenter");
m_off = il.loadIcon("rotate/" + image, KIcon::NoGroup, 28); m_off = il.loadIcon("rotate/" + image, TDEIcon::NoGroup, 28);
m_on = il.loadIcon("rotate/" + image + "dn", KIcon::NoGroup, 28); m_on = il.loadIcon("rotate/" + image + "dn", TDEIcon::NoGroup, 28);
m_selected = false; m_selected = false;
m_id = id; m_id = id;

2
kpresenter/KPrSideBar.cpp
Unescape View File

@ -234,7 +234,7 @@ void KPrSideBarBase::setViewMasterPage( bool _b )
} }
KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v) KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v)
:KIconView(parent), KPrSideBarBase( d,v) :TDEIconView(parent), KPrSideBarBase( d,v)
{ {
uptodate = false; uptodate = false;
m_offsetX = 0; m_offsetX = 0;

2
kpresenter/KPrSideBar.h
Unescape View File

@ -63,7 +63,7 @@ protected:
bool m_viewMasterPage; bool m_viewMasterPage;
}; };
class KPrThumbBar : public KIconView, public KPrSideBarBase class KPrThumbBar : public TDEIconView, public KPrSideBarBase
{ {
Q_OBJECT Q_OBJECT

4
kpresenter/KPrTransEffectDia.cpp
Unescape View File

@ -290,13 +290,13 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) );
buttonTestPlaySoundEffect = new TQPushButton( soundgrp ); buttonTestPlaySoundEffect = new TQPushButton( soundgrp );
buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", KIcon::SizeSmall) ); buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", TDEIcon::SizeSmall) );
TQToolTip::add( buttonTestPlaySoundEffect, i18n("Play") ); TQToolTip::add( buttonTestPlaySoundEffect, i18n("Play") );
connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) );
buttonTestStopSoundEffect = new TQPushButton( soundgrp ); buttonTestStopSoundEffect = new TQPushButton( soundgrp );
buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", KIcon::SizeSmall) ); buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", TDEIcon::SizeSmall) );
TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") ); TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") );
connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) );

2
kpresenter/KPrView.cpp
Unescape View File

@ -6463,7 +6463,7 @@ void KPrView::documentModified( bool b )
return; return;
if ( b ) if ( b )
m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) ); m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", TDEIcon::Small ) );
else else
m_sbModifiedLabel->setText( " " ); m_sbModifiedLabel->setText( " " );
} }

6
kpresenter/autoformEdit/AFChoose.cpp
Unescape View File

@ -87,8 +87,8 @@ void AFChoose::setupTabs()
{ {
grpPtr->tab = new TQVBox(this); grpPtr->tab = new TQVBox(this);
TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) ); TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) );
grpPtr->loadWid = new KIconCanvas(grpPtr->tab); grpPtr->loadWid = new TDEIconCanvas(grpPtr->tab);
// Changes for the new KIconCanvas (Werner) // Changes for the new TDEIconCanvas (Werner)
TQDir d( grpPtr->dir.absFilePath() ); TQDir d( grpPtr->dir.absFilePath() );
d.setNameFilter( "*.desktop" ); d.setNameFilter( "*.desktop" );
if( d.exists() ) { if( d.exists() ) {
@ -111,7 +111,7 @@ void AFChoose::setupTabs()
} }
grpPtr->entries.insert(text, filename); grpPtr->entries.insert(text, filename);
// now load the icon and create the item // now load the icon and create the item
// This code is shamelessly borrowed from KIconCanvas::slotLoadFiles // This code is shamelessly borrowed from TDEIconCanvas::slotLoadFiles
TQImage img; TQImage img;
img.load(icon); img.load(icon);
if (img.isNull()) { if (img.isNull()) {

4
kpresenter/autoformEdit/AFChoose.h
Unescape View File

@ -27,7 +27,7 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
class TQLabel; class TQLabel;
class KIconCanvas; class TDEIconCanvas;
class AFChoose : public TQTabDialog class AFChoose : public TQTabDialog
{ {
@ -48,7 +48,7 @@ private:
TQFileInfo dir; TQFileInfo dir;
TQString name; TQString name;
TQWidget *tab; TQWidget *tab;
KIconCanvas *loadWid; TDEIconCanvas *loadWid;
TQLabel *label; TQLabel *label;
TQMap<TQString, TQString> entries; TQMap<TQString, TQString> entries;
}; };

2
kspread/dialogs/kspread_dlg_formula.cc
Unescape View File

@ -104,7 +104,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
selectFunction = new TQPushButton( page ); selectFunction = new TQPushButton( page );
TQToolTip::add(selectFunction, i18n("Insert function") ); TQToolTip::add(selectFunction, i18n("Insert function") );
selectFunction->setPixmap( BarIcon( "down", KIcon::SizeSmall ) ); selectFunction->setPixmap( BarIcon( "down", TDEIcon::SizeSmall ) );
grid1->addWidget( selectFunction, 3, 0 ); grid1->addWidget( selectFunction, 3, 0 );
result = new TQLineEdit( page ); result = new TQLineEdit( page );

14
kspread/dialogs/kspread_dlg_preference.cc
Unescape View File

@ -65,28 +65,28 @@ PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/)
connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply()));
TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("gohome",KIcon::SizeMedium)); TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("gohome",TDEIcon::SizeMedium));
_localePage=new parameterLocale(parent,page2 ); _localePage=new parameterLocale(parent,page2 );
TQVBox *page3=addVBoxPage(i18n("Interface"), TQString(),BarIcon("signature", KIcon::SizeMedium) ); TQVBox *page3=addVBoxPage(i18n("Interface"), TQString(),BarIcon("signature", TDEIcon::SizeMedium) );
_configure = new configure(parent,page3 ); _configure = new configure(parent,page3 );
TQVBox * page4=addVBoxPage(i18n("Misc"), TQString(),BarIcon("misc",KIcon::SizeMedium) ); TQVBox * page4=addVBoxPage(i18n("Misc"), TQString(),BarIcon("misc",TDEIcon::SizeMedium) );
_miscParameter = new miscParameters(parent,page4 ); _miscParameter = new miscParameters(parent,page4 );
TQVBox *page5=addVBoxPage(i18n("Color"), TQString(),BarIcon("colorize",KIcon::SizeMedium) ); TQVBox *page5=addVBoxPage(i18n("Color"), TQString(),BarIcon("colorize",TDEIcon::SizeMedium) );
_colorParameter=new colorParameters(parent,page5 ); _colorParameter=new colorParameters(parent,page5 );
TQVBox *page6=addVBoxPage(i18n("Page Layout"), TQString(),BarIcon("edit",KIcon::SizeMedium) ); TQVBox *page6=addVBoxPage(i18n("Page Layout"), TQString(),BarIcon("edit",TDEIcon::SizeMedium) );
_layoutPage=new configureLayoutPage(parent,page6 ); _layoutPage=new configureLayoutPage(parent,page6 );
TQVBox *page7 = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"), TQVBox *page7 = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"),
BarIcon("spellcheck", KIcon::SizeMedium) ); BarIcon("spellcheck", TDEIcon::SizeMedium) );
_spellPage=new configureSpellPage(parent,page7); _spellPage=new configureSpellPage(parent,page7);
if (KoSpeaker::isKttsdInstalled()) { if (KoSpeaker::isKttsdInstalled()) {
TQVBox *page8 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), TQVBox *page8 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"),
i18n("Text-to-Speech Settings"), BarIcon("access", KIcon::SizeMedium) ); i18n("Text-to-Speech Settings"), BarIcon("access", TDEIcon::SizeMedium) );
_ttsPage=new configureTTSPage(parent, page8); _ttsPage=new configureTTSPage(parent, page8);
} else _ttsPage = 0; } else _ttsPage = 0;

8
kspread/dialogs/link.cc
Unescape View File

@ -67,7 +67,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
// link for web or ftp // link for web or ftp
d->internetPage = addPage( i18n( "Internet" ), TQString(), d->internetPage = addPage( i18n( "Internet" ), TQString(),
BarIcon( "html",KIcon::SizeMedium ) ); BarIcon( "html",TDEIcon::SizeMedium ) );
TQVBoxLayout* iLayout = new TQVBoxLayout( d->internetPage, marginHint(), spacingHint() ); TQVBoxLayout* iLayout = new TQVBoxLayout( d->internetPage, marginHint(), spacingHint() );
iLayout->add( new TQLabel( i18n("Text to display:" ), d->internetPage ) ); iLayout->add( new TQLabel( i18n("Text to display:" ), d->internetPage ) );
d->internetText = new KLineEdit( d->internetPage ); d->internetText = new KLineEdit( d->internetPage );
@ -81,7 +81,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
// link for e-mail // link for e-mail
d->mailPage = addPage( i18n( "Mail" ), TQString(), d->mailPage = addPage( i18n( "Mail" ), TQString(),
BarIcon( "mail_generic",KIcon::SizeMedium ) ); BarIcon( "mail_generic",TDEIcon::SizeMedium ) );
TQVBoxLayout* mLayout = new TQVBoxLayout( d->mailPage, marginHint(), spacingHint() ); TQVBoxLayout* mLayout = new TQVBoxLayout( d->mailPage, marginHint(), spacingHint() );
mLayout->add( new TQLabel( i18n("Text to display:" ), d->mailPage ) ); mLayout->add( new TQLabel( i18n("Text to display:" ), d->mailPage ) );
d->mailText = new KLineEdit( d->mailPage ); d->mailText = new KLineEdit( d->mailPage );
@ -95,7 +95,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
// link for external file // link for external file
d->filePage = addPage( i18n( "File" ), TQString(), d->filePage = addPage( i18n( "File" ), TQString(),
BarIcon( "filenew",KIcon::SizeMedium ) ); BarIcon( "filenew",TDEIcon::SizeMedium ) );
TQVBoxLayout* fLayout = new TQVBoxLayout( d->filePage, marginHint(), spacingHint() ); TQVBoxLayout* fLayout = new TQVBoxLayout( d->filePage, marginHint(), spacingHint() );
fLayout->add( new TQLabel( i18n("Text to display:" ), d->filePage ) ); fLayout->add( new TQLabel( i18n("Text to display:" ), d->filePage ) );
d->fileText = new KLineEdit( d->filePage ); d->fileText = new KLineEdit( d->filePage );
@ -130,7 +130,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
// link to another cell // link to another cell
d->cellPage = addPage( i18n( "Cell" ), TQString(), d->cellPage = addPage( i18n( "Cell" ), TQString(),
BarIcon( "misc",KIcon::SizeMedium ) ); BarIcon( "misc",TDEIcon::SizeMedium ) );
TQVBoxLayout* cLayout = new TQVBoxLayout( d->cellPage, marginHint(), spacingHint() ); TQVBoxLayout* cLayout = new TQVBoxLayout( d->cellPage, marginHint(), spacingHint() );
cLayout->add( new TQLabel( i18n("Text to display:" ), d->cellPage ) ); cLayout->add( new TQLabel( i18n("Text to display:" ), d->cellPage ) );
d->cellText = new KLineEdit( d->cellPage ); d->cellText = new KLineEdit( d->cellPage );

2
kword/KWConfig.cpp
Unescape View File

@ -75,7 +75,7 @@ using namespace KSpell2;
// (Note: KDialogBase should have version of the methods that take a TQString for the icon name) // (Note: KDialogBase should have version of the methods that take a TQString for the icon name)
static inline TQPixmap loadIcon( const char * name ) { static inline TQPixmap loadIcon( const char * name ) {
return TDEGlobal::instance()->iconLoader() return TDEGlobal::instance()->iconLoader()
->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); ->loadIcon( TQString::fromLatin1(name), TDEIcon::NoGroup, TDEIcon::SizeMedium );
} }
KWConfig::KWConfig( KWView* parent ) KWConfig::KWConfig( KWView* parent )

12
kword/KWDocStruct.cpp
Unescape View File

@ -721,22 +721,22 @@ KWDocStructRootItem::KWDocStructRootItem(TQListView* parent, const TQString& tex
{ {
switch ( type ) { switch ( type ) {
case Arrangement: { case Arrangement: {
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tree_arrange", KIcon::Small ) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tree_arrange", TDEIcon::Small ) );
} break; } break;
case TextFrames: { case TextFrames: {
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_text", KIcon::Small ) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_text", TDEIcon::Small ) );
} break; } break;
case FormulaFrames: { case FormulaFrames: {
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_formula", KIcon::Small ) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_formula", TDEIcon::Small ) );
}break; }break;
case Tables: { case Tables: {
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "inline_table", KIcon::Small ) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "inline_table", TDEIcon::Small ) );
} break; } break;
case Pictures: { case Pictures: {
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_image", KIcon::Small ) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_image", TDEIcon::Small ) );
} break; } break;
case Embedded: { case Embedded: {
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_query", KIcon::Small ) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_query", TDEIcon::Small ) );
} break; } break;
} }
} }

2
kword/KWView.cpp
Unescape View File

@ -6006,7 +6006,7 @@ void KWView::documentModified( bool b )
return; return;
if ( b ) if ( b )
m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) ); m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", TDEIcon::Small ) );
else else
m_sbModifiedLabel->setText( " " ); m_sbModifiedLabel->setText( " " );
} }

12
lib/kofficecore/KoDocumentInfoDlg.cpp
Unescape View File

@ -202,9 +202,9 @@ void KoDocumentInfoDlg::addAuthorPage( KoDocumentInfoAuthor *authorInfo )
{ {
TQVBox *page = d->m_dialog->addVBoxPage( i18n( "Author" ) ); TQVBox *page = d->m_dialog->addVBoxPage( i18n( "Author" ) );
d->m_authorWidget = new KoDocumentInfoAuthorWidget( page ); d->m_authorWidget = new KoDocumentInfoAuthorWidget( page );
d->m_authorWidget->labelAuthor->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 48 ) ); d->m_authorWidget->labelAuthor->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop, 48 ) );
d->m_authorWidget->pbLoadKABC->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ) ) ); d->m_authorWidget->pbLoadKABC->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", TDEIcon::Small ) ) );
d->m_authorWidget->pbDelete->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "eraser", KIcon::Small ) ) ); d->m_authorWidget->pbDelete->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "eraser", TDEIcon::Small ) ) );
d->m_authorWidget->leFullName->setText( authorInfo->fullName() ); d->m_authorWidget->leFullName->setText( authorInfo->fullName() );
d->m_authorWidget->leInitial->setText( authorInfo->initial() ); d->m_authorWidget->leInitial->setText( authorInfo->initial() );
@ -256,13 +256,13 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo )
{ {
TQVBox *page = d->m_dialog->addVBoxPage( i18n( "General" ) ); TQVBox *page = d->m_dialog->addVBoxPage( i18n( "General" ) );
d->m_aboutWidget = new KoDocumentInfoAboutWidget( page ); d->m_aboutWidget = new KoDocumentInfoAboutWidget( page );
d->m_aboutWidget->pbReset->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ) ); d->m_aboutWidget->pbReset->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "reload", TDEIcon::Small ) ) );
KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->parent() ); KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->parent() );
if ( doc ) if ( doc )
{ {
d->m_aboutWidget->leDocFile->setText( doc->file() ); d->m_aboutWidget->leDocFile->setText( doc->file() );
d->m_aboutWidget->labelType->setText( KMimeType::mimeType( doc->mimeType() )->comment() ); d->m_aboutWidget->labelType->setText( KMimeType::mimeType( doc->mimeType() )->comment() );
d->m_aboutWidget->pixmapLabel->setPixmap( KMimeType::mimeType( doc->mimeType() )->pixmap( KIcon::Desktop, 48 ) ); d->m_aboutWidget->pixmapLabel->setPixmap( KMimeType::mimeType( doc->mimeType() )->pixmap( TDEIcon::Desktop, 48 ) );
} }
if ( aboutInfo->creationDate() != TQString() ) if ( aboutInfo->creationDate() != TQString() )
d->m_aboutWidget->labelCreated->setText( aboutInfo->creationDate() + ", " + aboutInfo->initialCreator() ); d->m_aboutWidget->labelCreated->setText( aboutInfo->creationDate() + ", " + aboutInfo->initialCreator() );
@ -302,7 +302,7 @@ void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMet
TQString name = it.key(); TQString name = it.key();
TQString value = it.data(); TQString value = it.data();
TDEListViewItem* it = new TDEListViewItem( d->m_metaWidget->metaListView, name, value ); TDEListViewItem* it = new TDEListViewItem( d->m_metaWidget->metaListView, name, value );
it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ) ); it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", TDEIcon::Small ) );
} }
} }

2
lib/kofficecore/KoOpenPane.cpp
Unescape View File

@ -258,7 +258,7 @@ void KoOpenPane::setCustomDocumentWidget(TQWidget *widget) {
TQListViewItem* KoOpenPane::addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight) TQListViewItem* KoOpenPane::addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight)
{ {
return addPane(title, SmallIcon(icon, KIcon::SizeLarge, KIcon::DefaultState, d->m_instance), return addPane(title, SmallIcon(icon, TDEIcon::SizeLarge, TDEIcon::DefaultState, d->m_instance),
widget, sortWeight); widget, sortWeight);
} }

2
lib/kofficecore/KoTemplates.cpp
Unescape View File

@ -66,7 +66,7 @@ const TQPixmap &KoTemplate::loadPicture( TDEInstance* instance ) {
m_pixmap.convertFromImage(img); m_pixmap.convertFromImage(img);
return m_pixmap; return m_pixmap;
} else { // relative path } else { // relative path
m_pixmap = instance->iconLoader()->loadIcon( m_picture, KIcon::Desktop, 128 ); m_pixmap = instance->iconLoader()->loadIcon( m_picture, TDEIcon::Desktop, 128 );
return m_pixmap; return m_pixmap;
} }
} }

8
lib/kofficeui/KoInsertLink.cpp
Unescape View File

@ -42,21 +42,21 @@ KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displ
KDialogBase::Ok, parent, name ) KDialogBase::Ok, parent, name )
{ {
bookmarkLink = 0L; bookmarkLink = 0L;
TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",KIcon::SizeMedium)); TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",TDEIcon::SizeMedium));
internetLink = new internetLinkPage(page ); internetLink = new internetLinkPage(page );
connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ( ))); connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ( )));
page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",KIcon::SizeMedium)); page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",TDEIcon::SizeMedium));
mailLink = new mailLinkPage(page ); mailLink = new mailLinkPage(page );
connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
page=addVBoxPage(i18n("File"), TQString(),BarIcon("filenew",KIcon::SizeMedium)); page=addVBoxPage(i18n("File"), TQString(),BarIcon("filenew",TDEIcon::SizeMedium));
fileLink = new fileLinkPage(page ); fileLink = new fileLinkPage(page );
connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
if ( displayBookmarkLink) if ( displayBookmarkLink)
{ {
page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",KIcon::SizeMedium)); page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",TDEIcon::SizeMedium));
bookmarkLink = new bookmarkLinkPage(page ); bookmarkLink = new bookmarkLinkPage(page );
connect(bookmarkLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); connect(bookmarkLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
} }

2
lib/kofficeui/KoSelectAction.cpp
Unescape View File

@ -98,7 +98,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
if ( hasIconSet() ) if ( hasIconSet() )
id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index ); id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
else else
id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), KIcon::Small), id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
text(), popupMenu(), -1, index ); text(), popupMenu(), -1, index );
if ( !isEnabled() ) if ( !isEnabled() )

14
lib/kofficeui/KoTemplateChooseDia.h
Unescape View File

@ -37,16 +37,16 @@ class KoTemplateGroup;
class TQGridLayout; class TQGridLayout;
/** /**
* Our reimplementation of KIconCanvas used within the template-chooser dialog. * Our reimplementation of TDEIconCanvas used within the template-chooser dialog.
* @internal * @internal
*/ */
class KoTCDIconCanvas : public KIconCanvas class KoTCDIconCanvas : public TDEIconCanvas
{ {
Q_OBJECT Q_OBJECT
public: public:
KoTCDIconCanvas( TQWidget *parent = 0, const char *name = 0L ) KoTCDIconCanvas( TQWidget *parent = 0, const char *name = 0L )
: KIconCanvas( parent, name ) {} : TDEIconCanvas( parent, name ) {}
bool isCurrentValid() { return currentItem(); } bool isCurrentValid() { return currentItem(); }
TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, TDEInstance* instance); TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, TDEInstance* instance);
@ -56,21 +56,21 @@ class KoTCDIconCanvas : public KIconCanvas
if ( e->key() == Key_Return || e->key() == Key_Enter ) if ( e->key() == Key_Return || e->key() == Key_Enter )
e->ignore(); e->ignore();
else else
KIconCanvas::keyPressEvent( e ); TDEIconCanvas::keyPressEvent( e );
} }
}; };
/// @internal /// @internal
class KoTCDIconViewItem : public KIconViewItem class KoTCDIconViewItem : public TDEIconViewItem
{ {
public: public:
KoTCDIconViewItem(TQIconView *parent=0) KoTCDIconViewItem(TQIconView *parent=0)
: KIconViewItem ( parent ) : TDEIconViewItem ( parent )
{} {}
KoTCDIconViewItem(TQIconView *parent=0, const TQString &text=0, const TQPixmap &icon=0, KoTCDIconViewItem(TQIconView *parent=0, const TQString &text=0, const TQPixmap &icon=0,
const TQString &descr=0, const TQString &fullname=0) const TQString &descr=0, const TQString &fullname=0)
: KIconViewItem(parent, text, icon) : TDEIconViewItem(parent, text, icon)
{ {
m_descr = descr; m_descr = descr;
m_full = fullname; m_full = fullname;

4
lib/kofficeui/KoTemplateCreateDia.cpp
Unescape View File

@ -367,7 +367,7 @@ void KoTemplateCreateDia::slotSelect() {
d->m_default->setChecked(false); d->m_default->setChecked(false);
d->m_custom->setChecked(true); d->m_custom->setChecked(true);
TQString name = KIconDialog::getIcon(); TQString name = TDEIconDialog::getIcon();
if( name.isEmpty() ) { if( name.isEmpty() ) {
if(d->m_customFile.isEmpty()) { if(d->m_customFile.isEmpty()) {
d->m_default->setChecked(true); d->m_default->setChecked(true);
@ -376,7 +376,7 @@ void KoTemplateCreateDia::slotSelect() {
return; return;
} }
// ### TODO: do a better remote loading without having to have d->m_tempFile // ### TODO: do a better remote loading without having to have d->m_tempFile
TQString path = TDEGlobal::iconLoader()->iconPath(name, KIcon::Desktop); TQString path = TDEGlobal::iconLoader()->iconPath(name, TDEIcon::Desktop);
d->m_customFile = path; d->m_customFile = path;
d->m_customPixmap=TQPixmap(); d->m_customPixmap=TQPixmap();
updatePixmap(); updatePixmap();

4
lib/kofficeui/kcoloractions.cpp
Unescape View File

@ -251,7 +251,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
else else
instance = TDEGlobal::instance(); instance = TDEGlobal::instance();
*/ */
id = menu->insertItem( iconSet( KIcon::Small, 0 ), text(), this,//dsweet id = menu->insertItem( iconSet( TDEIcon::Small, 0 ), text(), this,//dsweet
TQT_SLOT( slotActivated() ), 0, -1, index ); TQT_SLOT( slotActivated() ), 0, -1, index );
} }
else else
@ -289,7 +289,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
if ( icon().isEmpty() ) // old code using TQIconSet directly if ( icon().isEmpty() ) // old code using TQIconSet directly
{ {
bar->insertButton( iconSet( KIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this, bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this,
TQT_SLOT( slotActivated() ), TQT_SLOT( slotActivated() ),
isEnabled(), plainText(), index ); isEnabled(), plainText(), index );
} }

2
lib/kofficeui/tkcoloractions.cpp
Unescape View File

@ -166,7 +166,7 @@ void TTDESelectColorAction::updatePixmap()
} }
} }
else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) {
TQPixmap pix =iconSet(KIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active); TQPixmap pix =iconSet(TDEIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
if ( pix.isNull() ) if ( pix.isNull() )
return; return;
TQPainter p(&pix); TQPainter p(&pix);

2
lib/kofficeui/ttdeaction.cpp
Unescape View File

@ -155,7 +155,7 @@ void TTDEAction::updateLayout(TQWidget* base)
TQPixmap pix; TQPixmap pix;
if (hasIcon()) if (hasIcon())
pix = iconSet(KIcon::Small).pixmap(); pix = iconSet(TDEIcon::Small).pixmap();
if (!icon().isEmpty()) if (!icon().isEmpty())
pix = BarIcon(icon()); pix = BarIcon(icon());

18
lib/kofficeui/ttdetoolbarbutton.cpp
Unescape View File

@ -190,23 +190,23 @@ void TTDEToolBarButton::setIcon( const TQString& icon )
d->m_iconName = icon; d->m_iconName = icon;
int iconSize = 16; int iconSize = 16;
setPixmap( BarIcon(icon, iconSize, KIcon::ActiveState, d->m_instance), false ); setPixmap( BarIcon(icon, iconSize, TDEIcon::ActiveState, d->m_instance), false );
setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) ); setDisabledPixmap( BarIcon(icon, iconSize, TDEIcon::DisabledState, d->m_instance) );
setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) ); setDefaultPixmap( BarIcon(icon, iconSize, TDEIcon::DefaultState, d->m_instance) );
} }
void TTDEToolBarButton::setDisabledIcon( const TQString &icon ) void TTDEToolBarButton::setDisabledIcon( const TQString &icon )
{ {
d->m_disabledIconName = icon; d->m_disabledIconName = icon;
int iconSize = 16; int iconSize = 16;
setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) ); setDisabledPixmap( BarIcon(icon, iconSize, TDEIcon::DisabledState, d->m_instance) );
} }
void TTDEToolBarButton::setDefaultIcon( const TQString &icon ) void TTDEToolBarButton::setDefaultIcon( const TQString &icon )
{ {
d->m_defaultIconName = icon; d->m_defaultIconName = icon;
int iconSize = 16; int iconSize = 16;
setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) ); setDefaultPixmap( BarIcon(icon, iconSize, TDEIcon::DefaultState, d->m_instance) );
} }
TQPixmap TTDEToolBarButton::getActivePixmap() const TQPixmap TTDEToolBarButton::getActivePixmap() const
@ -417,8 +417,8 @@ void TTDEToolBarButton::makeDefaultPixmap()
if (activePixmap.isNull()) if (activePixmap.isNull())
return; return;
KIconEffect effect; TDEIconEffect effect;
defaultPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DefaultState); defaultPixmap = effect.apply(activePixmap, TDEIcon::Toolbar, TDEIcon::DefaultState);
} }
void TTDEToolBarButton::makeDisabledPixmap() void TTDEToolBarButton::makeDisabledPixmap()
@ -426,8 +426,8 @@ void TTDEToolBarButton::makeDisabledPixmap()
if (activePixmap.isNull()) if (activePixmap.isNull())
return; return;
KIconEffect effect; TDEIconEffect effect;
disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState); disabledPixmap = effect.apply(activePixmap, TDEIcon::Toolbar, TDEIcon::DisabledState);
} }
TQSize TTDEToolBarButton::sizeHint() const TQSize TTDEToolBarButton::sizeHint() const

6
lib/koproperty/editors/booledit.cpp
Unescape View File

@ -86,17 +86,17 @@ static void drawViewerInternal(TQPainter *p, const TQRect &r, const TQVariant &v
{ {
p->eraseRect(r); p->eraseRect(r);
TQRect r2(r); TQRect r2(r);
r2.moveLeft(KIcon::SizeSmall + 6); r2.moveLeft(TDEIcon::SizeSmall + 6);
if(value.isNull() && !nullText.isEmpty()) { if(value.isNull() && !nullText.isEmpty()) {
p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, nullText); p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, nullText);
} }
else if(value.toBool()) { else if(value.toBool()) {
p->drawPixmap(3, (r.height()-1-KIcon::SizeSmall)/2, yesIcon); p->drawPixmap(3, (r.height()-1-TDEIcon::SizeSmall)/2, yesIcon);
p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, i18n("Yes")); p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, i18n("Yes"));
} }
else { else {
p->drawPixmap(3, (r.height()-1-KIcon::SizeSmall)/2, noIcon); p->drawPixmap(3, (r.height()-1-TDEIcon::SizeSmall)/2, noIcon);
p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, i18n("No")); p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, i18n("No"));
} }
} }

18
lib/kross/main/wdgscriptsmanager.cpp
Unescape View File

@ -137,18 +137,18 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
slotSelectionChanged(0); slotSelectionChanged(0);
connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "exec", KIcon::MainToolbar, 16 )); btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "exec", TDEIcon::MainToolbar, 16 ));
connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript()));
btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileopen", KIcon::MainToolbar, 16 )); btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileopen", TDEIcon::MainToolbar, 16 ));
connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript()));
btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 )); btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 ));
connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript()));
btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", KIcon::MainToolbar, 16 )); btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", TDEIcon::MainToolbar, 16 ));
connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript()));
btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 )); btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 ));
connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
#ifdef KROSS_SUPPORT_NEWSTUFF #ifdef KROSS_SUPPORT_NEWSTUFF
btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", KIcon::MainToolbar, 16 )); btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 ));
connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
#endif #endif
/* /*
@ -218,11 +218,11 @@ TQListViewItem* WdgScriptsManager::addItem(ScriptAction::Ptr action, TQListViewI
TQPixmap pm; TQPixmap pm;
if(action->hasIcon()) { if(action->hasIcon()) {
KIconLoader* icons = TDEGlobal::iconLoader(); TDEIconLoader* icons = TDEGlobal::iconLoader();
pm = icons->loadIconSet(action->icon(), KIcon::Small).pixmap(TQIconSet::Small, TQIconSet::Active); pm = icons->loadIconSet(action->icon(), TDEIcon::Small).pixmap(TQIconSet::Small, TQIconSet::Active);
} }
else { else {
pm = action->iconSet(KIcon::Small, 16).pixmap(TQIconSet::Small, TQIconSet::Active); pm = action->iconSet(TDEIcon::Small, 16).pixmap(TQIconSet::Small, TQIconSet::Active);
} }
if(! pm.isNull()) if(! pm.isNull())
i->setPixmap(0, pm); // display the icon i->setPixmap(0, pm); // display the icon

Write Preview
Loading…
Cancel
Save