From f51496578b660aa81bd58812968d674bf940199c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:04:14 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- src/knowitlink.cpp | 2 +- src/knowitpref.cpp | 14 +++++++------- src/notes.cpp | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/knowitlink.cpp b/src/knowitlink.cpp index fc0e871..3c6b775 100644 --- a/src/knowitlink.cpp +++ b/src/knowitlink.cpp @@ -49,7 +49,7 @@ KnowitLinkDialog::KnowitLinkDialog() linkValue->setMinimumWidth(300); browse = new TQToolButton(editBox, "Browse"); browse->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("fileopen", - KIcon::Toolbar, KIcon::SizeSmall))); + TDEIcon::Toolbar, TDEIcon::SizeSmall))); layout->addItem(new TQSpacerItem(0, 5)); layout->addWidget(new TQLabel(i18n("Link description:"), plainPage())); diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp index 7b35eb4..bafec7b 100644 --- a/src/knowitpref.cpp +++ b/src/knowitpref.cpp @@ -136,7 +136,7 @@ KnowitPreferences::KnowitPreferences() /* first page: General */ page = addPage(i18n("General"), i18n("General options"), - TDEGlobal::iconLoader()->loadIcon(TQString("configure"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("configure"), TDEIcon::Toolbar, TDEIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); layout->addWidget(docked = new TQCheckBox(i18n("&Dock in System tray"), page, "Dock")); layout->addWidget(reopen = new TQCheckBox(i18n("Open &last file on startup"), page, "Reopen")); @@ -168,7 +168,7 @@ KnowitPreferences::KnowitPreferences() /* second page: Interface */ page = addPage(i18n("Interface"), i18n("Interface options"), - TDEGlobal::iconLoader()->loadIcon(TQString("misc"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("misc"), TDEIcon::Toolbar, TDEIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); layout->addWidget(horizontalSplit = new TQCheckBox(i18n("Split window &horizontally"), page, "Split")); TQWhatsThis::add(horizontalSplit, i18n("If this option is set, notes tree will " @@ -205,7 +205,7 @@ KnowitPreferences::KnowitPreferences() /* third page: Editor */ page = addPage(i18n("Editor"), i18n("Editor options"), - TDEGlobal::iconLoader()->loadIcon(TQString("edit"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("edit"), TDEIcon::Toolbar, TDEIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); layout->addWidget(wordwrap = new TQCheckBox(i18n("Use &word wrap"), page, "WordWrap")); @@ -240,7 +240,7 @@ KnowitPreferences::KnowitPreferences() /* fourth page: Templates */ page = addPage(i18n("Templates"), i18n("Templates configuration"), - TDEGlobal::iconLoader()->loadIcon(TQString("wizard"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("wizard"), TDEIcon::Toolbar, TDEIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); TQWhatsThis::add(page, i18n("\n" "

These expressions may be used:

\n" @@ -276,13 +276,13 @@ KnowitPreferences::KnowitPreferences() insertDateColorButton = new KColorButton(TQColor("Blue"), tmpBox, "InsertDateColorButton"); insertDateFormatEdit = new KLineEdit(tmpBox, "InsertDateFormatEdit"); insertDateItalicButton = new TQToolButton(tmpBox,"InsertDateItalicButton"); - insertDateItalicButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_italic", KIcon::Toolbar))); + insertDateItalicButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_italic", TDEIcon::Toolbar))); insertDateItalicButton->setToggleButton(true); insertDateBoldButton = new TQToolButton(tmpBox,"InsertDateBoldButton"); - insertDateBoldButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_bold", KIcon::Toolbar))); + insertDateBoldButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_bold", TDEIcon::Toolbar))); insertDateBoldButton->setToggleButton(true); insertDateUnderlineButton = new TQToolButton(tmpBox, "InsertDateUnderlineButton"); - insertDateUnderlineButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_under", KIcon::Toolbar))); + insertDateUnderlineButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_under", TDEIcon::Toolbar))); insertDateUnderlineButton->setToggleButton(true); insertDateColorButton->setFixedSize(insertDateBoldButton->sizeHint()); insertDateFormatEdit->setMinimumWidth(6*insertDateBoldButton->sizeHint().width()); diff --git a/src/notes.cpp b/src/notes.cpp index 0b80afc..3a6d012 100644 --- a/src/notes.cpp +++ b/src/notes.cpp @@ -58,7 +58,7 @@ TQString TNoteLink::text(int fmt) const TQPixmap TNoteLink::icon() const { return TDEGlobal::iconLoader()->loadIcon(KMimeType::iconForURL(KURL(link)), - KIcon::Small); + TDEIcon::Small); } void TNoteLink::open() const @@ -85,10 +85,10 @@ bool TNoteLink::isLocalReference() const TNotesCollection::TNotesCollection() { - Pixmaps[0] = TDEGlobal::iconLoader()->loadIcon("ascii", KIcon::Small); - Pixmaps[1] = TDEGlobal::iconLoader()->loadIcon("txt", KIcon::Small); - Pixmaps[2] = TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small); - Pixmaps[3] = TDEGlobal::iconLoader()->loadIcon("folder_txt", KIcon::Small); + Pixmaps[0] = TDEGlobal::iconLoader()->loadIcon("ascii", TDEIcon::Small); + Pixmaps[1] = TDEGlobal::iconLoader()->loadIcon("txt", TDEIcon::Small); + Pixmaps[2] = TDEGlobal::iconLoader()->loadIcon("folder", TDEIcon::Small); + Pixmaps[3] = TDEGlobal::iconLoader()->loadIcon("folder_txt", TDEIcon::Small); modified = false; autoUpdate = true; } -- cgit v1.2.3