TDE
/
tdeaddons
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons
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 cca546ea62
commit f7b7b822a7
22 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File

2
kate/filetemplates/plugin/filetemplates.cpp
Unescape View File

@ -561,7 +561,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *
TQWhatsThis::add( leTemplate, i18n("<p>This string is used as the template's name "
"and is displayed, for example, in the Template menu. It should describe the "
"meaning of the template, for example 'HTML Document'.</p>") );
ibIcon = new KIconButton( hb );
ibIcon = new TDEIconButton( hb );
TQWhatsThis::add( ibIcon, i18n(
"Press to select or change the icon for this template") );

2
kate/filetemplates/plugin/filetemplates.h
Unescape View File

@ -169,7 +169,7 @@ class KateTemplateInfoWidget : public TQWidget
class TQLineEdit *leTemplate, *leDocumentName, *leDescription, *leAuthor;
class TQComboBox *cmbGroup;
class TQPushButton *btnHighlight;
class KIconButton *ibIcon;
class TDEIconButton *ibIcon;
private slots:
void slotHlSet( int id );

2
kate/insertcommand/plugin_kateinsertcommand.h
Unescape View File

@ -75,7 +75,7 @@ class PluginKateInsertCommand : public Kate::Plugin,
TQString configPageFullName(uint) const {
return i18n("Configure Insert Command Plugin"); }
TQPixmap configPagePixmap (uint /*number = 0*/,
int /*size = KIcon::SizeSmall*/) const
int /*size = TDEIcon::SizeSmall*/) const
{ return 0L; }
private:

2
kate/kjswrapper/plugin_katekjswrapper.cpp
Unescape View File

@ -167,7 +167,7 @@ TQString PluginKateKJSWrapper::configPageFullName(uint id) const {
}
TQPixmap PluginKateKJSWrapper::configPagePixmap (uint /*number = 0*/,
int /*size = KIcon::SizeSmall*/) const {
int /*size = TDEIcon::SizeSmall*/) const {
return 0;
}

2
kate/kjswrapper/plugin_katekjswrapper.h
Unescape View File

@ -91,7 +91,7 @@ class PluginKateKJSWrapper : public Kate::Plugin,
TQString configPageName(uint) const;
TQString configPageFullName(uint) const;
TQPixmap configPagePixmap (uint /*number = 0*/,
int /*size = KIcon::SizeSmall*/) const;
int /*size = TDEIcon::SizeSmall*/) const;
PluginKateKJSWrapperView *getViewObject(Kate::MainWindow *win);
public slots:

2
kate/tabbarextension/plugin_katetabbarextension.h
Unescape View File

@ -311,7 +311,7 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface
Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0);
TQString configPageName(uint) const { return i18n("Tab Bar Extension"); }
TQString configPageFullName(uint) const { return i18n("Configure Tab Bar Extension"); }
TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; }
TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const { return 0L; }
public slots:
void applyConfig( KateTabBarExtensionConfigPage* );

2
kate/xmltools/kde-docbook.dtd.xml
Unescape View File

@ -1869,7 +1869,7 @@
</entity>
<entity name="kiconedit" type="gen">
<text-expanded>
<application>KIconEdit</application>
<application>TDEIconEdit</application>
</text-expanded>
</entity>
<entity name="lrarr2" type="gen">

10
kicker-applets/kolourpicker/simplebutton.cpp
Unescape View File

@ -131,11 +131,11 @@ void SimpleButton::generateIcons()
}
TQImage image = pixmap()->convertToImage();
KIconEffect effect;
TDEIconEffect effect;
m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
m_disabledIcon = effect.apply(image, KIcon::Panel, KIcon::DisabledState);
m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
m_disabledIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DisabledState);
updateGeometry();
}
@ -161,7 +161,7 @@ void SimpleButton::slotSettingsChanged(int category)
void SimpleButton::slotIconChanged( int group )
{
if (group != KIcon::Panel)
if (group != TDEIcon::Panel)
{
return;
}

10
kicker-applets/mediacontrol/simplebutton.cpp
Unescape View File

@ -131,11 +131,11 @@ void SimpleButton::generateIcons()
}
TQImage image = pixmap()->convertToImage();
KIconEffect effect;
TDEIconEffect effect;
m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
m_disabledIcon = effect.apply(image, KIcon::Panel, KIcon::DisabledState);
m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
m_disabledIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DisabledState);
updateGeometry();
}
@ -161,7 +161,7 @@ void SimpleButton::slotSettingsChanged(int category)
void SimpleButton::slotIconChanged( int group )
{
if (group != KIcon::Panel)
if (group != TDEIcon::Panel)
{
return;
}

6
konq-plugins/adblock/adblock.cpp
Unescape View File

@ -92,12 +92,12 @@ void AdBlock::initLabel()
m_label = new KURLLabel(statusBarEx->statusBar());
KIconLoader *loader = instance()->iconLoader();
TDEIconLoader *loader = instance()->iconLoader();
m_label->setFixedHeight(loader->currentSize(KIcon::Small));
m_label->setFixedHeight(loader->currentSize(TDEIcon::Small));
m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_label->setUseCursor(false);
m_label->setPixmap(loader->loadIcon("filter", KIcon::Small));
m_label->setPixmap(loader->loadIcon("filter", TDEIcon::Small));
statusBarEx->addStatusBarItem(m_label, 0, false);

2
konq-plugins/akregator/konqfeedicon.cpp
Unescape View File

@ -155,7 +155,7 @@ void KonqFeedIcon::addFeedIcon()
m_feedIcon = new KURLLabel(m_statusBarEx->statusBar());
// from tdehtmlpart's ualabel
m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small));
m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_feedIcon->setUseCursor(false);
//FIXME hackish

10
konq-plugins/dirfilter/dirfilterplugin.cpp
Unescape View File

@ -186,8 +186,8 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
}
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{
m_searchWidget = new KIconViewSearchLine(hbox);
static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget()));
m_searchWidget = new TDEIconViewSearchLine(hbox);
static_cast<TDEIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget()));
}
@ -422,7 +422,7 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list)
}
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{
static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();
static_cast<TDEIconViewSearchLine*>(m_searchWidget)->updateSearch();
}
// Make sure the filter menu is enabled once a named
@ -469,7 +469,7 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item)
// HACK around it here...
if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
static_cast<KIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name());
static_cast<TDEIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name());
}
TQString mimeType = item->mimetype().stripWhiteSpace();
@ -510,7 +510,7 @@ void DirFilterPlugin::activateSearch()
static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch();
}
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();
static_cast<TDEIconViewSearchLine*>(m_searchWidget)->updateSearch();
}
}

2
konq-plugins/fsview/inode.cpp
Unescape View File

@ -377,7 +377,7 @@ TQPixmap Inode::pixmap(int i) const
if (!_mimePixmapSet) {
KURL u;
u.setPath(path());
_mimePixmap = mimeType()->pixmap(u, KIcon::Small);
_mimePixmap = mimeType()->pixmap(u, TDEIcon::Small);
_mimePixmapSet = true;
}

6
konq-plugins/kimgalleryplugin/imgallerydialog.cpp
Unescape View File

@ -86,7 +86,7 @@ void KIGPDialog::slotDefault()
void KIGPDialog::setupLookPage(const TQString& path) {
TQFrame *page = addPage( i18n("Look"), i18n("Page Look"),
BarIcon("colorize", KIcon::SizeMedium ) );
BarIcon("colorize", TDEIcon::SizeMedium ) );
m_config->setGroup("Look");
TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() );
@ -176,7 +176,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
void KIGPDialog::setupDirectoryPage(const TQString& path) {
TQFrame *page = addPage( i18n("Folders"), i18n("Folders"),
BarIcon("folder", KIcon::SizeMedium ) );
BarIcon("folder", TDEIcon::SizeMedium ) );
m_config->setGroup("Directory");
TQVBoxLayout *dvlay = new TQVBoxLayout( page, 0, spacingHint() );
@ -272,7 +272,7 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) {
void KIGPDialog::setupThumbnailPage(const TQString& path) {
TQFrame *page = addPage( i18n("Thumbnails"), i18n("Thumbnails"),
BarIcon("thumbnail", KIcon::SizeMedium ) );
BarIcon("thumbnail", TDEIcon::SizeMedium ) );
m_config->setGroup("Thumbnails");
TQLabel *label;

4
konq-plugins/kuick/kdirmenu.cpp
Unescape View File

@ -72,8 +72,8 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
iconPath = _path + '/' + iconPath.mid(2);
TQPixmap icon;
icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
TDEIcon::Small, TDEIcon::SizeSmall,
TDEIcon::DefaultState, 0, true);
if(icon.isNull())
icon = CICON("folder");
insertItem( icon, escapedPath.replace( "&", "&&" ), submenu );

2
konq-plugins/microformat/konqmficon.cpp
Unescape View File

@ -274,7 +274,7 @@ void KonqMFIcon::addMFIcon() {
}
m_mfIcon = new KURLLabel(m_statusBarEx->statusBar());
m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small));
m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_mfIcon->setUseCursor(false);
//FIXME hackish

12
konq-plugins/sidebar/delicious/mainWidget.cpp
Unescape View File

@ -47,11 +47,11 @@ MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
{
loadTags();
KIconLoader * il = TDEGlobal::iconLoader();
TDEIconLoader * il = TDEGlobal::iconLoader();
btnRefreshTags->setIconSet( il->loadIconSet( "reload", KIcon::Small ) );
btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) );
btnNew->setIconSet( il->loadIconSet( "bookmark_add", KIcon::Small ) );
btnRefreshTags->setIconSet( il->loadIconSet( "reload", TDEIcon::Small ) );
btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", TDEIcon::Small ) );
btnNew->setIconSet( il->loadIconSet( "bookmark_add", TDEIcon::Small ) );
connect( ( TQWidget * ) btnRefreshTags, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( slotGetTags() ) );
@ -234,7 +234,7 @@ void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int
tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) );
tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) );
tagMenu->insertSeparator();
tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ),
tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", TDEIcon::Small ),
i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) );
tagMenu->exec( pos );
@ -323,7 +323,7 @@ void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos
TQPopupMenu * menu = new TQPopupMenu( this );
TQ_CHECK_PTR( menu );
menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ),
menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", TDEIcon::Small ),
i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) );
menu->exec( pos );

12
konq-plugins/sidebar/metabar/src/configdialog.cpp
Unescape View File

@ -319,9 +319,9 @@ void ConfigDialog::createLink()
TQLineEdit *name = new TQLineEdit(i18n("New link"), main);
TQLineEdit *url = new TQLineEdit("file:/", main);
KIconButton *icon = new KIconButton(main);
TDEIconButton *icon = new TDEIconButton(main);
icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
icon->setIconType(KIcon::Small, KIcon::Any);
icon->setIconType(TDEIcon::Small, TDEIcon::Any);
icon->setStrictIconSize(true);
icon->setIcon("folder");
@ -351,7 +351,7 @@ void ConfigDialog::createLink()
if(!name_str.isEmpty() && !url_str.isEmpty()){
if(icon_str.isEmpty()){
icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small);
icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small);
}
TQPixmap icon(icon_str);
@ -402,9 +402,9 @@ void ConfigDialog::editLink(TQListViewItem *item)
TQLineEdit *name = new TQLineEdit(linkList[item]->name, main);
TQLineEdit *url = new TQLineEdit(linkList[item]->url, main);
KIconButton *icon = new KIconButton(main);
TDEIconButton *icon = new TDEIconButton(main);
icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
icon->setIconType(KIcon::Small, KIcon::Any);
icon->setIconType(TDEIcon::Small, TDEIcon::Any);
icon->setStrictIconSize(true);
icon->setIcon(linkList[item]->icon);
@ -434,7 +434,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
if(!name_str.isEmpty() && !url_str.isEmpty()){
if(icon_str.isEmpty()){
icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small);
icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small);
}
TQPixmap icon(icon_str);

4
konq-plugins/sidebar/metabar/src/protocolplugin.cpp
Unescape View File

@ -61,10 +61,10 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
if(!icon.isNull()){
TQPixmap pix;
if(m_items.count() == 1){
pix = m_items.getFirst()->pixmap(KIcon::SizeLarge);
pix = m_items.getFirst()->pixmap(TDEIcon::SizeLarge);
}
else{
pix = DesktopIcon("tdemultiple", KIcon::SizeLarge);
pix = DesktopIcon("tdemultiple", TDEIcon::SizeLarge);
}
TQByteArray data;

4
konq-plugins/sidebar/newsticker/sidebar_news.cpp
Unescape View File

@ -57,8 +57,8 @@ namespace KSB_News {
// access the already present TQPixmap
KDesktopFile desktopFile(desktopName, true);
TQString iconName = desktopFile.readIcon();
KIconLoader iconLoader;
m_appIcon = iconLoader.loadIcon(iconName, KIcon::Small);
TDEIconLoader iconLoader;
m_appIcon = iconLoader.loadIcon(iconName, TDEIcon::Small);
// create all sidebar widgets
widgets = new TQWidgetStack(widgetParent, "main_widgetstack");

2
noatun-plugins/alarm/wakeup.cpp
Unescape View File

@ -208,7 +208,7 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
grid->addWidget (choosemin,0,2,TQt::AlignLeft);
applyall = new TQPushButton (this,"applyall");
applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) );
applyall->setPixmap( BarIcon("down", TDEIcon::SizeSmall) );
applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
TQSizePolicy::Fixed,
applyall->sizePolicy().hasHeightForWidth()) );

10
noatun-plugins/oblique/cmodule.cpp
Unescape View File

@ -94,17 +94,17 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
TQVBox *buttons = new TQVBox(middle);
mAddSibling = new TQPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons);
mAddSibling = new TQPushButton(BarIconSet("1rightarrow", TDEIcon::SizeSmall), "",buttons);
mAddSibling->setFixedWidth(mAddSibling->height());
connect(mAddSibling, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling()));
TQToolTip::add(mAddSibling, i18n("Create a new item after the selected one"));
mAddChild = new TQPushButton(BarIconSet("2rightarrow", KIcon::SizeSmall), "", buttons);
mAddChild = new TQPushButton(BarIconSet("2rightarrow", TDEIcon::SizeSmall), "", buttons);
mAddChild->setFixedWidth(mAddChild->height());
connect(mAddChild, TQT_SIGNAL(clicked()), TQT_SLOT(addChild()));
TQToolTip::add(mAddChild, i18n("Create a new child item under the selected one"));
mRemoveSelf = new TQPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons);
mRemoveSelf = new TQPushButton(BarIconSet("filenew", TDEIcon::SizeSmall), "", buttons);
mRemoveSelf->setFixedWidth(mRemoveSelf->height());
connect(mRemoveSelf, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf()));
TQToolTip::add(mRemoveSelf, i18n("Remove the selected item"));
@ -520,12 +520,12 @@ SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique)
TQVBox *buttons = new TQVBox(middle);
mAdd = new TQPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons);
mAdd = new TQPushButton(BarIconSet("1rightarrow", TDEIcon::SizeSmall), "",buttons);
mAdd->setFixedWidth(mAdd->height());
connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling()));
TQToolTip::add(mAdd, i18n("Create a new item"));
mRemove = new TQPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons);
mRemove = new TQPushButton(BarIconSet("filenew", TDEIcon::SizeSmall), "", buttons);
mRemove->setFixedWidth(mRemove->height());
connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf()));
TQToolTip::add(mRemove, i18n("Remove the selected item"));

Write Preview
Loading…
Cancel
Save