diff options
| author | Timothy Pearson <[email protected]> | 2013-02-04 14:18:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-04 14:18:14 -0600 |
| commit | b97ee238f88e9578da228388210cd8cab5360778 (patch) | |
| tree | 8bf3ab88929af70826ebe3b84434c3403dc71c7d /knotes | |
| parent | 656055dae6f13ee65d66fabf9041b288d81710af (diff) | |
| download | tdepim-b97ee238f88e9578da228388210cd8cab5360778.tar.gz tdepim-b97ee238f88e9578da228388210cd8cab5360778.zip | |
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'knotes')
| -rw-r--r-- | knotes/ChangeLog | 2 | ||||
| -rw-r--r-- | knotes/knote.cpp | 12 | ||||
| -rw-r--r-- | knotes/knotebutton.cpp | 2 | ||||
| -rw-r--r-- | knotes/knotesapp.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/knotes/ChangeLog b/knotes/ChangeLog index dfe1fc951..1ad18cac9 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -486,7 +486,7 @@ ChangeLog for KNotes outdated config files * fixed some bugs I found while rewriting the config stuff * newNote and newNoteFromClipboard now take a "const QString& name" - * new subdirectory "icons" to make KIconLoader apply its effects to all + * new subdirectory "icons" to make TDEIconLoader apply its effects to all KNotes icons 2002/10/17 Michael Brade <[email protected]> diff --git a/knotes/knote.cpp b/knotes/knote.cpp index c19b1ec10..07ab136fd 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -359,9 +359,9 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * slotUpdateKeepAboveBelow(); // HACK: update the icon color - again after showing the note, to make kicker aware of the new colors - KIconEffect effect; - TQPixmap icon = effect.apply( kapp->icon(), KIconEffect::Colorize, 1, m_config->bgColor(), false ); - TQPixmap miniIcon = effect.apply( kapp->miniIcon(), KIconEffect::Colorize, 1, m_config->bgColor(), false ); + TDEIconEffect effect; + TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); + TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); KWin::setIcons( winId(), icon, miniIcon ); } @@ -552,9 +552,9 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg ) m_button->setPalette( darker ); // update the icon color - KIconEffect effect; - TQPixmap icon = effect.apply( kapp->icon(), KIconEffect::Colorize, 1, bg, false ); - TQPixmap miniIcon = effect.apply( kapp->miniIcon(), KIconEffect::Colorize, 1, bg, false ); + TDEIconEffect effect; + TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, bg, false ); + TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false ); KWin::setIcons( winId(), icon, miniIcon ); // set the color for the selection used to highlight the find stuff diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index d3e571c02..006b1e9c5 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -39,7 +39,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na m_flat = true; if ( !icon.isEmpty() ) - setIconSet( TDEGlobal::iconLoader()->loadIconSet( icon, KIcon::Small, 10 ) ); + setIconSet( TDEGlobal::iconLoader()->loadIconSet( icon, TDEIcon::Small, 10 ) ); } KNoteButton::~KNoteButton() diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index c31be4803..f3b2ae158 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -707,8 +707,8 @@ void KNotesApp::updateNoteActions() TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()), (TQObject *)0, it.current()->noteId().utf8() ); - KIconEffect effect; - TQPixmap icon = effect.apply( kapp->miniIcon(), KIconEffect::Colorize, 1, + TDEIconEffect effect; + TQPixmap icon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, it.current()->paletteBackgroundColor(), false ); action->setIconSet( icon ); m_noteActions.append( action ); |