Rename KIcon to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent c46f36d008
commit 1c53bf78a7

@ -213,7 +213,7 @@ derive from QLabel, and use this in the constructor:
<screen> <screen>
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
{ {
setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", TDEIcon::NoGroup, TDEIcon::SizeMedium));
setFrameStyle(QFrame::Box | QFrame::Plain); setFrameStyle(QFrame::Box | QFrame::Plain);
setLineWidth(1); setLineWidth(1);
setFixedSize(pixmap()->size()); setFixedSize(pixmap()->size());
@ -297,7 +297,7 @@ This class simply has a constructor and an overridden create method.
<screen> <screen>
MyKomPlugin::MyKomPlugin() MyKomPlugin::MyKomPlugin()
{ {
addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
//add my other widgets here //add my other widgets here
} }
</screen> </screen>
@ -427,7 +427,7 @@ To register to the executor (actually to the plugin system), add this to
KomStdPlugin::KomStdPlugin() KomStdPlugin::KomStdPlugin()
{ {
... ...
addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
... ...
} }
</screen> </screen>

@ -84,11 +84,11 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
d->layout->addWidget(statusLabel); d->layout->addWidget(statusLabel);
d->searchCombo = new KComboBox(this, "searchcombo"); d->searchCombo = new KComboBox(this, "searchcombo");
TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small); TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", TDEIcon::Small);
TQPixmap iconGood = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); TQPixmap iconGood = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
TQPixmap iconBroken = TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small); TQPixmap iconBroken = TDEGlobal::iconLoader()->loadIcon("no", TDEIcon::Small);
TQPixmap iconMalformed = TDEGlobal::iconLoader()->loadIcon("bug", KIcon::Small); TQPixmap iconMalformed = TDEGlobal::iconLoader()->loadIcon("bug", TDEIcon::Small);
TQPixmap iconUndetermined = TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small); TQPixmap iconUndetermined = TDEGlobal::iconLoader()->loadIcon("help", TDEIcon::Small);
d->searchCombo->insertItem(iconAll, i18n("All Links")); d->searchCombo->insertItem(iconAll, i18n("All Links"));
d->searchCombo->insertItem(iconGood, i18n("Good Links")); d->searchCombo->insertItem(iconGood, i18n("Good Links"));

@ -104,8 +104,8 @@ void SessionWidget::init()
toolButton_clear_combo->setIconSet(SmallIconSet("locationbar_erase")); toolButton_clear_combo->setIconSet(SmallIconSet("locationbar_erase"));
pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small)); pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", TDEIcon::Small));
TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small); TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::Small);
pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8); pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8);
connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog())); connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog()));

@ -73,7 +73,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
associatedTextEdit->setTextFormat(TQt::PlainText);*/ associatedTextEdit->setTextFormat(TQt::PlainText);*/
// icon for non-empty scripts // icon for non-empty scripts
scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", KIcon::Small); scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", TDEIcon::Small);
// signals and slots connections // signals and slots connections
m_formWindow = a_form; m_formWindow = a_form;

@ -45,8 +45,8 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict<TQWidget>& a_w
bool a_modal) bool a_modal)
: FunctionsDialogBase(a_parent, a_name, a_modal), m_widgetList(a_widgetList), m_useInternalParser(useInternalParser) : FunctionsDialogBase(a_parent, a_name, a_modal), m_widgetList(a_widgetList), m_useInternalParser(useInternalParser)
{ {
clearButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("locationbar_erase", KIcon::Toolbar)); clearButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("locationbar_erase", TDEIcon::Toolbar));
copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", KIcon::Toolbar)); copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", TDEIcon::Toolbar));
groupComboBox->insertStringList(SpecialInformation::groups()); groupComboBox->insertStringList(SpecialInformation::groups());
connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int)));

@ -45,7 +45,7 @@ AboutDialog::AboutDialog(TQWidget *parent, const char *name)
setDisplayStates(states); setDisplayStates(states);
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
{ {
setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)); setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", TDEIcon::NoGroup, TDEIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain); setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1); setLineWidth(1);
setFixedSize(pixmap()->size()); setFixedSize(pixmap()->size());
@ -122,7 +122,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
m_aboutData = new TDEAboutData(m_appName, m_appName, m_version); m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
m_aboutData->setCopyrightStatement(m_copyright); m_aboutData->setCopyrightStatement(m_copyright);
if (!m_icon.isEmpty()) if (!m_icon.isEmpty())
m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage()); m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage());
} }
void AboutDialog::addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress) void AboutDialog::addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress)

@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name)
setDisplayStates(states); setDisplayStates(states);
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
{ {
setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium)); setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", TDEIcon::NoGroup, TDEIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain); setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1); setLineWidth(1);
setFixedSize(pixmap()->size()); setFixedSize(pixmap()->size());

@ -177,7 +177,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
} }
case DCOP::setPixmap: case DCOP::setPixmap:
{ {
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], TDEIcon::Small);
if (pixmap.isNull()) if (pixmap.isNull())
pixmap.load(args[0]); pixmap.load(args[0]);
int index = args[1].toInt(); int index = args[1].toInt();

@ -38,7 +38,7 @@ PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name)
setStates(states); setStates(states);
setDisplayStates(states); setDisplayStates(states);
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", KIcon::NoGroup, 128)); setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", TDEIcon::NoGroup, 128));
setAutoResize(false); setAutoResize(false);
} }

@ -80,7 +80,7 @@ KomStdPlugin::KomStdPlugin()
addWidget("SpinBoxInt", group, "", 0); addWidget("SpinBoxInt", group, "", 0);
// addWidget("Wizard", group, ""); // addWidget("Wizard", group, "");
addWidget("TabWidget", group, "", 0); addWidget("TabWidget", group, "", 0);
addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true); addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", TDEIcon::NoGroup, TDEIcon::SizeMedium)), "", true);
// addWidget("SubDialog", group, ""); // addWidget("SubDialog", group, "");
addWidget("ListBox", group, "", 0); addWidget("ListBox", group, "", 0);
addWidget("Timer", group, "", 0); addWidget("Timer", group, "", 0);
@ -92,9 +92,9 @@ KomStdPlugin::KomStdPlugin()
addWidget("Slider", group, "", 0); addWidget("Slider", group, "", 0);
addWidget("Table", group, "", 0); addWidget("Table", group, "", 0);
addWidget("DatePicker", group, "", 0); addWidget("DatePicker", group, "", 0);
addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium))); addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium))); addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium))); addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
} }
TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name ) TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name )

@ -41,7 +41,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name)
setDisplayStates(states); setDisplayStates(states);
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
{ {
setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)); setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::NoGroup, TDEIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain); setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1); setLineWidth(1);
setFixedSize(pixmap()->size()); setFixedSize(pixmap()->size());
@ -130,7 +130,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid
if (icon.isEmpty()) if (icon.isEmpty())
return TQString::number(m_menu->insertItem(title, dynamic_cast<PopupMenu*>(w)->menu(), index)); return TQString::number(m_menu->insertItem(title, dynamic_cast<PopupMenu*>(w)->menu(), index));
else else
return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index)); return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::NoGroup, TDEIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index));
} }
return TQString(); return TQString();
} }
@ -159,7 +159,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
if (args[3].isEmpty()) if (args[3].isEmpty())
id = m_menu->insertItem(args[0], index); id = m_menu->insertItem(args[0], index);
else else
id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index); id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], TDEIcon::NoGroup, TDEIcon::SizeMedium), args[0], index);
m_associations[id] = args[1]; m_associations[id] = args[1];
return TQString::number(id); return TQString::number(id);
break; break;
@ -175,7 +175,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
if (args[3].isEmpty()) if (args[3].isEmpty())
m_menu->changeItem(id, args[1]); m_menu->changeItem(id, args[1]);
else else
m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[1]); m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], TDEIcon::NoGroup, TDEIcon::SizeMedium), args[1]);
m_associations[id] = args[2]; m_associations[id] = args[2];
break; break;
} }

@ -38,7 +38,7 @@ ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name)
setDisplayStates(states); setDisplayStates(states);
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
{ {
setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium)); setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", TDEIcon::NoGroup, TDEIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain); setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1); setLineWidth(1);
setFixedSize(pixmap()->size()); setFixedSize(pixmap()->size());

@ -137,7 +137,7 @@ TQString TabWidget::handleDCOP(int function, const TQStringList& args)
case TAB_setTabIcon: case TAB_setTabIcon:
{ {
TQWidget *w = page(args[0].toInt()); TQWidget *w = page(args[0].toInt());
setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium)); setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], TDEIcon::NoGroup, TDEIcon::SizeMedium));
break; break;
} }
case TAB_isTabEnabled: case TAB_isTabEnabled:

@ -46,7 +46,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name)
setDisplayStates(states); setDisplayStates(states);
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
{ {
setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium)); setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", TDEIcon::NoGroup, TDEIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain); setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1); setLineWidth(1);
setFixedSize(pixmap()->size()); setFixedSize(pixmap()->size());

@ -431,7 +431,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
} }
case DCOP::setPixmap: case DCOP::setPixmap:
{ {
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], TDEIcon::Small);
if (args[1].toInt() == -1) if (args[1].toInt() == -1)
for (TQListViewItemIterator it(this); it.current(); ++it) for (TQListViewItemIterator it(this); it.current(); ++it)
it.current()->setPixmap(0, pixmap); it.current()->setPixmap(0, pixmap);

@ -16,7 +16,7 @@ public:
%{APPNAME}Plugin::%{APPNAME}Plugin() %{APPNAME}Plugin::%{APPNAME}Plugin()
{ {
addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) ); addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", TDEIcon::NoGroup, TDEIcon::SizeMedium)) );
} }
TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name) TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name)

@ -28,7 +28,7 @@ enum Functions {
/* /*
if (KommanderWidget::inEditor) if (KommanderWidget::inEditor)
{ {
setPixmap(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)); setPixmap(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", TDEIcon::NoGroup, TDEIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain); setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1); setLineWidth(1);
setAlignment(TQt::AlignCenter); setAlignment(TQt::AlignCenter);

@ -197,7 +197,7 @@ void DownloadDialog::addProvider(Provider *p)
if(!p->icon().isValid()) ret = false; if(!p->icon().isValid()) ret = false;
else ret = TDEIO::NetAccess::download(p->icon(), tmp, this); else ret = TDEIO::NetAccess::download(p->icon(), tmp, this);
if(ret) pix = TQPixmap(tmp); if(ret) pix = TQPixmap(tmp);
else pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); else pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", TDEIcon::Panel);
frame = addPage(p->name(), p->name(), pix); frame = addPage(p->name(), p->name(), pix);
m_frame = frame; m_frame = frame;
@ -359,8 +359,8 @@ void DownloadDialog::addEntry(Entry *entry)
}*/ }*/
installed = installStatus(entry); installed = installStatus(entry);
if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small); else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", TDEIcon::Small);
else pix = TQPixmap(); else pix = TQPixmap();
TDEListViewItem *tmp_r = new TDEListViewItem(lv_r, TDEListViewItem *tmp_r = new TDEListViewItem(lv_r,
@ -457,7 +457,7 @@ void DownloadDialog::install(Entry *e)
kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate)); kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate));
kapp->config()->sync(); kapp->config()->sync();
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
m_entryitem = lv_r->findItem(m_entryname, 0); m_entryitem = lv_r->findItem(m_entryname, 0);
if(m_entryitem) m_entryitem->setPixmap(0, pix); if(m_entryitem) m_entryitem->setPixmap(0, pix);
m_entryitem = lv_d->findItem(m_entryname, 0); m_entryitem = lv_d->findItem(m_entryname, 0);

@ -190,7 +190,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
} }
mHoverCloseButton = new TQPushButton( this ); mHoverCloseButton = new TQPushButton( this );
mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) );
mHoverCloseButton->setGeometry( rect ); mHoverCloseButton->setGeometry( rect );
TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); TQToolTip::add(mHoverCloseButton,i18n("Close this tab"));
mHoverCloseButton->setFlat(true); mHoverCloseButton->setFlat(true);

@ -299,7 +299,7 @@
<cstring>lineText</cstring> <cstring>lineText</cstring>
</property> </property>
</widget> </widget>
<widget class="KIconButton" row="1" column="4"> <widget class="TDEIconButton" row="1" column="4">
<property name="name"> <property name="name">
<cstring>actionIcon</cstring> <cstring>actionIcon</cstring>
</property> </property>

@ -64,7 +64,7 @@
<cstring>iconButton</cstring> <cstring>iconButton</cstring>
</property> </property>
</widget> </widget>
<widget class="KIconButton" row="0" column="5" rowspan="2" colspan="1"> <widget class="TDEIconButton" row="0" column="5" rowspan="2" colspan="1">
<property name="name"> <property name="name">
<cstring>iconButton</cstring> <cstring>iconButton</cstring>
</property> </property>

@ -105,7 +105,7 @@
<string>The plugin name as it appears in the Plugins menu.</string> <string>The plugin name as it appears in the Plugins menu.</string>
</property> </property>
</widget> </widget>
<widget class="KIconButton" row="0" column="3"> <widget class="TDEIconButton" row="0" column="3">
<property name="name"> <property name="name">
<cstring>iconButton</cstring> <cstring>iconButton</cstring>
</property> </property>

@ -1161,7 +1161,7 @@ void QuantaApp::slotOptions()
KDialogBase::Ok, this, "tabdialog"); KDialogBase::Ok, this, "tabdialog");
// Tag Style options // Tag Style options
TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString(), BarIcon("kwrite", KIcon::SizeMedium)); TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString(), BarIcon("kwrite", TDEIcon::SizeMedium));
StyleOptionsS *styleOptionsS = new StyleOptionsS( (TQWidget *)page); StyleOptionsS *styleOptionsS = new StyleOptionsS( (TQWidget *)page);
styleOptionsS->tagCase->setCurrentItem( qConfig.tagCase); styleOptionsS->tagCase->setCurrentItem( qConfig.tagCase);
@ -1175,7 +1175,7 @@ void QuantaApp::slotOptions()
// Environment options // Environment options
//TODO FileMasks name is not good anymore //TODO FileMasks name is not good anymore
page=kd->addVBoxPage(i18n("Environment"), TQString(), UserIcon("files", KIcon::SizeMedium ) ); page=kd->addVBoxPage(i18n("Environment"), TQString(), UserIcon("files", TDEIcon::SizeMedium ) );
FileMasks *fileMasks = new FileMasks((TQWidget *)page); FileMasks *fileMasks = new FileMasks((TQWidget *)page);
fileMasks->lineMarkup->setText( qConfig.markupMimeTypes ); fileMasks->lineMarkup->setText( qConfig.markupMimeTypes );
@ -1215,7 +1215,7 @@ void QuantaApp::slotOptions()
fileMasks->defaultDTDCombo->setCurrentItem(pos); fileMasks->defaultDTDCombo->setCurrentItem(pos);
// Preview options // Preview options
page=kd->addVBoxPage(i18n("User Interface"), TQString(), BarIcon("view_choose", KIcon::SizeMedium ) ); page=kd->addVBoxPage(i18n("User Interface"), TQString(), BarIcon("view_choose", TDEIcon::SizeMedium ) );
PreviewOptions *uiOptions = new PreviewOptions( (TQWidget *)page ); PreviewOptions *uiOptions = new PreviewOptions( (TQWidget *)page );
uiOptions->setPosition(qConfig.previewPosition); uiOptions->setPosition(qConfig.previewPosition);
@ -1238,10 +1238,10 @@ void QuantaApp::slotOptions()
uiOptions->warnEventActions->setChecked(true); uiOptions->warnEventActions->setChecked(true);
} }
//kafka options //kafka options
page = kd->addVBoxPage(i18n("VPL View"), TQString(), UserIcon("vpl_text", KIcon::SizeMedium)); page = kd->addVBoxPage(i18n("VPL View"), TQString(), UserIcon("vpl_text", TDEIcon::SizeMedium));
KafkaSyncOptions *kafkaOptions = new KafkaSyncOptions( m_config, (TQWidget *)page ); KafkaSyncOptions *kafkaOptions = new KafkaSyncOptions( m_config, (TQWidget *)page );
page=kd->addVBoxPage(i18n("Parser"), TQString(), BarIcon("kcmsystem", KIcon::SizeMedium ) ); page=kd->addVBoxPage(i18n("Parser"), TQString(), BarIcon("kcmsystem", TDEIcon::SizeMedium ) );
ParserOptions *parserOptions = new ParserOptions( m_config, (TQWidget *)page ); ParserOptions *parserOptions = new ParserOptions( m_config, (TQWidget *)page );
parserOptions->refreshFrequency->setValue(qConfig.refreshFrequency); parserOptions->refreshFrequency->setValue(qConfig.refreshFrequency);
@ -1250,7 +1250,7 @@ void QuantaApp::slotOptions()
parserOptions->showClosingTags->setChecked(qConfig.showClosingTags); parserOptions->showClosingTags->setChecked(qConfig.showClosingTags);
parserOptions->spinExpand->setValue(qConfig.expandLevel); parserOptions->spinExpand->setValue(qConfig.expandLevel);
page = kd->addVBoxPage(i18n("Abbreviations"), TQString(), BarIcon("fontsizeup", KIcon::SizeMedium)); page = kd->addVBoxPage(i18n("Abbreviations"), TQString(), BarIcon("fontsizeup", TDEIcon::SizeMedium));
AbbreviationDlg *abbreviationOptions = new AbbreviationDlg((TQWidget*)(page)); AbbreviationDlg *abbreviationOptions = new AbbreviationDlg((TQWidget*)(page));
bool reloadTrees = false; bool reloadTrees = false;
@ -3306,7 +3306,7 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name)
FourButtonMessageBox dlg(this, 0, true); FourButtonMessageBox dlg(this, 0, true);
dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name)); dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name));
dlg.setCaption(i18n("Save Toolbar")); dlg.setCaption(i18n("Save Toolbar"));
dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", KIcon::SizeMedium)); dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", TDEIcon::SizeMedium));
dlg.exec(); dlg.exec();
result = dlg.status(); result = dlg.status();
switch (result) switch (result)

@ -287,7 +287,7 @@ void QuantaView::updateTab()
if (m_document) if (m_document)
{ {
// try to set the icon from mimetype // try to set the icon from mimetype
TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, KIcon::Small)); TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, TDEIcon::Small));
if (mimeIcon.isNull()) if (mimeIcon.isNull())
mimeIcon = TQIconSet(SmallIcon("document")); mimeIcon = TQIconSet(SmallIcon("document"));
TQString urlStr = QExtFileInfo::shortName(m_document->url().path()); TQString urlStr = QExtFileInfo::shortName(m_document->url().path());

@ -618,7 +618,7 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position)
TQDictIterator<QuantaPlugin> it2(plugins); TQDictIterator<QuantaPlugin> it2(plugins);
for(;it2.current();++it2) for(;it2.current();++it2)
{ {
int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),KIcon::Small), it2.current()->name()); int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),TDEIcon::Small), it2.current()->name());
m_pluginIds[id] = it2.current(); m_pluginIds[id] = it2.current();
} }
connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int))); connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int)));

Loading…
Cancel
Save