summaryrefslogtreecommitdiffstats
path: root/knotes/knotesapp.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:12 -0600
commitfd5d099065a748cac49e20a13481f85666c53c71 (patch)
treea0f1672cd88eb0e69b9ddc2ed9b08ecd98538bd3 /knotes/knotesapp.cpp
parentb440a9c608596cd88efdb3bfa4661c5e37efbe4b (diff)
downloadtdepim-fd5d099065a748cac49e20a13481f85666c53c71.tar.gz
tdepim-fd5d099065a748cac49e20a13481f85666c53c71.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'knotes/knotesapp.cpp')
-rw-r--r--knotes/knotesapp.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 718a35004..069bf9da8 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -68,7 +68,7 @@ public:
connect( this, TQT_SIGNAL(defaultClicked()), m_keyChooser, TQT_SLOT(allDefault()) );
}
- void insert( KActionCollection *actions )
+ void insert( TDEActionCollection *actions )
{
m_keyChooser->insert( actions, i18n("Note Actions") );
}
@@ -86,9 +86,9 @@ private:
int KNotesApp::KNoteActionList::compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 )
{
- if ( ((KAction*)s1)->text() == ((KAction*)s2)->text() )
+ if ( ((TDEAction*)s1)->text() == ((TDEAction*)s2)->text() )
return 0;
- return ( ((KAction*)s1)->text() < ((KAction*)s2)->text() ? -1 : 1 );
+ return ( ((TDEAction*)s1)->text() < ((TDEAction*)s2)->text() ? -1 : 1 );
}
@@ -111,13 +111,13 @@ KNotesApp::KNotesApp()
KNote::setStyle( KNotesGlobalConfig::style() );
// create the GUI...
- new KAction( i18n("New Note"), "filenew", 0,
+ new TDEAction( i18n("New Note"), "filenew", 0,
TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" );
- new KAction( i18n("New Note From Clipboard"), "editpaste", 0,
+ new TDEAction( i18n("New Note From Clipboard"), "editpaste", 0,
TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" );
- new KAction( i18n("Show All Notes"), "knotes", 0,
+ new TDEAction( i18n("Show All Notes"), "knotes", 0,
TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
- new KAction( i18n("Hide All Notes"), "fileclose", 0,
+ new TDEAction( i18n("Hide All Notes"), "fileclose", 0,
TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
@@ -133,8 +133,8 @@ KNotesApp::KNotesApp()
m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) );
m_guiFactory->addClient( this );
- m_context_menu = static_cast<KPopupMenu*>(m_guiFactory->container( "knotes_context", this ));
- m_note_menu = static_cast<KPopupMenu*>(m_guiFactory->container( "notes_menu", this ));
+ m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this ));
+ m_note_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "notes_menu", this ));
// get the most recent XML UI file
TQString xmlFileName = instance()->instanceName() + "ui.rc";
@@ -579,13 +579,13 @@ void KNotesApp::slotConfigureAccels()
return;
notes.toFirst();
- TQValueList<KAction *> list = (*notes)->actionCollection()->actions();
- for ( TQValueList<KAction *>::iterator it = list.begin(); it != list.end(); ++it )
+ TQValueList<TDEAction *> list = (*notes)->actionCollection()->actions();
+ for ( TQValueList<TDEAction *>::iterator it = list.begin(); it != list.end(); ++it )
{
notes.toFirst();
for ( ++notes; *notes; ++notes )
{
- KAction *toChange = (*notes)->actionCollection()->action( (*it)->name() );
+ TDEAction *toChange = (*notes)->actionCollection()->action( (*it)->name() );
if ( toChange->shortcut() != (*it)->shortcut() )
toChange->setShortcut( (*it)->shortcut() );
}
@@ -703,8 +703,8 @@ void KNotesApp::updateNoteActions()
for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it )
{
- KAction *action = new KAction( it.current()->name().replace("&", "&&"),
- KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
+ TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"),
+ TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
(TQObject *)0,
it.current()->noteId().utf8() );
KIconEffect effect;
@@ -719,7 +719,7 @@ void KNotesApp::updateNoteActions()
actionCollection()->action( "hide_all_notes" )->setEnabled( false );
actionCollection()->action( "show_all_notes" )->setEnabled( false );
m_findAction->setEnabled( false );
- KAction *action = new KAction( i18n("No Notes") );
+ TDEAction *action = new TDEAction( i18n("No Notes") );
m_noteActions.append( action );
}
else
@@ -736,7 +736,7 @@ void KNotesApp::updateGlobalAccels()
{
if ( m_globalAccel->isEnabled() )
{
- KAction *action = actionCollection()->action( "new_note" );
+ TDEAction *action = actionCollection()->action( "new_note" );
if ( action )
action->setShortcut( m_globalAccel->shortcut( "global_new_note" ) );
action = actionCollection()->action( "new_note_clipboard" );
@@ -753,7 +753,7 @@ void KNotesApp::updateGlobalAccels()
}
else
{
- KAction *action = actionCollection()->action( "new_note" );
+ TDEAction *action = actionCollection()->action( "new_note" );
if ( action )
action->setShortcut( 0 );
action = actionCollection()->action( "new_note_clipboard" );