summaryrefslogtreecommitdiffstats
path: root/kmail/snippetdlg.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 /kmail/snippetdlg.cpp
parentb440a9c608596cd88efdb3bfa4661c5e37efbe4b (diff)
downloadtdepim-fd5d099065a748cac49e20a13481f85666c53c71.tar.gz
tdepim-fd5d099065a748cac49e20a13481f85666c53c71.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kmail/snippetdlg.cpp')
-rw-r--r--kmail/snippetdlg.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index d2b5c19d3..1c3e40c87 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -32,7 +32,7 @@
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl )
+SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl )
: SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac )
{
if ( !name )
@@ -40,8 +40,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam
textLabel3 = new TQLabel( this, "textLabel3" );
keyButton = new KKeyButton( this );
- connect( keyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ),
- this, TQT_SLOT( slotCapturedShortcut( const KShortcut& ) ) );
+ connect( keyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+ this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) );
btnAdd->setEnabled( false );
connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)),
@@ -78,23 +78,23 @@ void SnippetDlg::languageChange()
textLabel3->setText( i18n( "Sh&ortcut:" ) );
}
-static bool shortcutIsValid( const KActionCollection* actionCollection, const KShortcut &sc )
+static bool shortcutIsValid( const TDEActionCollection* actionCollection, const TDEShortcut &sc )
{
- KActionPtrList actions = actionCollection->actions();
- KActionPtrList::Iterator it( actions.begin() );
+ TDEActionPtrList actions = actionCollection->actions();
+ TDEActionPtrList::Iterator it( actions.begin() );
for ( ; it != actions.end(); it++ ) {
if ( (*it)->shortcut() == sc ) return false;
}
return true;
}
-void SnippetDlg::slotCapturedShortcut( const KShortcut& sc )
+void SnippetDlg::slotCapturedShortcut( const TDEShortcut& sc )
{
if ( sc == keyButton->shortcut() ) return;
if ( sc.toString().isNull() ) {
// null is fine, that's reset, but sc.Ń–sNull() will be false :/
- keyButton->setShortcut( KShortcut::null(), false );
+ keyButton->setShortcut( TDEShortcut::null(), false );
} else {
if( !shortcutIsValid( actionCollection, sc ) ) {
TQString msg( i18n( "The selected shortcut is already used, "