diff options
Diffstat (limited to 'knotes')
| -rw-r--r-- | knotes/knote.cpp | 12 | ||||
| -rw-r--r-- | knotes/knoteconfigdlg.cpp | 2 | ||||
| -rw-r--r-- | knotes/knotesapp.cpp | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 3485be00d..118836bf5 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -292,7 +292,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // let KWin do the placement if the position is illegal--at least 10 pixels // of a note need to be visible const TQPoint& position = m_config->position(); - TQRect desk = kapp->desktop()->rect(); + TQRect desk = tdeApp->desktop()->rect(); desk.addCoords( 10, 10, -10, -10 ); if ( desk.intersects( TQRect( position, TQSize( width, height ) ) ) ) move( position ); // do before calling show() to avoid flicker @@ -360,8 +360,8 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // HACK: update the icon color - again after showing the note, to make kicker aware of the new colors 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 ); + TQPixmap icon = effect.apply( tdeApp->icon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); + TQPixmap miniIcon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false ); KWin::setIcons( winId(), icon, miniIcon ); } @@ -576,8 +576,8 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg ) // update the icon color TDEIconEffect effect; - TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, bg, false ); - TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false ); + TQPixmap icon = effect.apply( tdeApp->icon(), TDEIconEffect::Colorize, 1, bg, false ); + TQPixmap miniIcon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false ); KWin::setIcons( winId(), icon, miniIcon ); // set the color for the selection used to highlight the find stuff @@ -1285,7 +1285,7 @@ void KNote::resizeEvent( TQResizeEvent *qre ) void KNote::closeEvent( TQCloseEvent *event ) { - if(kapp->sessionSaving()) + if(tdeApp->sessionSaving()) return; event->ignore(); //We don't want to close (and delete the widget). Just hide it slotClose(); diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index 60f7a539c..2f16a378b 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -47,7 +47,7 @@ KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title, config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok ) { setCaption( title ); - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); setIconListAllVisible( true ); enableButtonSeparator( true ); diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 1f7e9b99a..9484598aa 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -96,7 +96,7 @@ KNotesApp::KNotesApp() : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ), m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 ) { - connect( kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()) ); + connect( tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit()) ); m_noteList.setAutoDelete( true ); m_noteActions.setAutoDelete( true ); @@ -119,7 +119,7 @@ KNotesApp::KNotesApp() this, TQ_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); new TDEAction( i18n("Hide All Notes"), "window-close", 0, this, TQ_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); - new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); + new KHelpMenu( this, tdeApp->aboutData(), false, actionCollection() ); m_findAction = KStdAction::find( this, TQ_SLOT(slotOpenFindDialog()), actionCollection() ); KStdAction::preferences( this, TQ_SLOT(slotPreferences()), actionCollection() ); @@ -204,7 +204,7 @@ KNotesApp::KNotesApp() connect( m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(acceptConnection()) ); updateNetworkListener(); - if ( m_noteList.count() == 0 && !kapp->isRestored() ) + if ( m_noteList.count() == 0 && !tdeApp->isRestored() ) newNote(); updateNoteActions(); @@ -629,7 +629,7 @@ void KNotesApp::slotQuit() (*it)->saveData(false); saveConfigs(); - kapp->quit(); + tdeApp->quit(); } @@ -729,7 +729,7 @@ void KNotesApp::updateNoteActions() (TQObject *)0, it.current()->noteId().utf8() ); TDEIconEffect effect; - TQPixmap icon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, + TQPixmap icon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, it.current()->paletteBackgroundColor(), false ); action->setIconSet( icon ); m_noteActions.append( action ); |