summaryrefslogtreecommitdiffstats
path: root/twin/useractions.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
commitf537c21b68e08f649b1b297bce8f3904603137e0 (patch)
treefb33065387509dea898c90022ddec9c3f8ede86d /twin/useractions.cpp
parentdc5f267664506a312203c26bfe9001a448b0bb0f (diff)
downloadtdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz
tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'twin/useractions.cpp')
-rw-r--r--twin/useractions.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 1b5769f8d..f3bf3ed18 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -320,7 +320,7 @@ void Workspace::setupWindowShortcutDone( bool ok )
client_keys->suspend( false );
if( ok )
{
- client_keys_client->setShortcut( KShortcut( client_keys_dialog->shortcut()).toString());
+ client_keys_client->setShortcut( TDEShortcut( client_keys_dialog->shortcut()).toString());
}
closeActivePopup();
delete client_keys_dialog;
@@ -1053,7 +1053,7 @@ void Workspace::slotWindowOperations()
void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
{
- if (!kapp->authorizeKAction("twin_rmb"))
+ if (!kapp->authorizeTDEAction("twin_rmb"))
return;
if( !cl )
return;
@@ -1120,19 +1120,19 @@ void Client::setShortcut( const TQString& _cut )
{
TQString cut = rules()->checkShortcut( _cut );
if( cut.isEmpty())
- return setShortcutInternal( KShortcut());
+ return setShortcutInternal( TDEShortcut());
// Format:
// base+(abcdef)<space>base+(abcdef)
// E.g. Alt+Ctrl+(ABCDEF) Win+X,Win+(ABCDEF)
if( !cut.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' ))
{
- if( workspace()->shortcutAvailable( KShortcut( cut ), this ))
- setShortcutInternal( KShortcut( cut ));
+ if( workspace()->shortcutAvailable( TDEShortcut( cut ), this ))
+ setShortcutInternal( TDEShortcut( cut ));
else
- setShortcutInternal( KShortcut());
+ setShortcutInternal( TDEShortcut());
return;
}
- TQValueList< KShortcut > keys;
+ TQValueList< TDEShortcut > keys;
TQStringList groups = TQStringList::split( ' ', cut );
for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
@@ -1147,20 +1147,20 @@ void Client::setShortcut( const TQString& _cut )
i < list.length();
++i )
{
- KShortcut c( base + list[ i ] );
+ TDEShortcut c( base + list[ i ] );
if( !c.isNull())
keys.append( c );
}
}
}
- for( TQValueList< KShortcut >::ConstIterator it = keys.begin();
+ for( TQValueList< TDEShortcut >::ConstIterator it = keys.begin();
it != keys.end();
++it )
{
if( _shortcut == *it ) // current one is in the list
return;
}
- for( TQValueList< KShortcut >::ConstIterator it = keys.begin();
+ for( TQValueList< TDEShortcut >::ConstIterator it = keys.begin();
it != keys.end();
++it )
{
@@ -1170,10 +1170,10 @@ void Client::setShortcut( const TQString& _cut )
return;
}
}
- setShortcutInternal( KShortcut());
+ setShortcutInternal( TDEShortcut());
}
-void Client::setShortcutInternal( const KShortcut& cut )
+void Client::setShortcutInternal( const TDEShortcut& cut )
{
if( _shortcut == cut )
return;
@@ -1182,7 +1182,7 @@ void Client::setShortcutInternal( const KShortcut& cut )
workspace()->clientShortcutUpdated( this );
}
-bool Workspace::shortcutAvailable( const KShortcut& cut, Client* ignore ) const
+bool Workspace::shortcutAvailable( const TDEShortcut& cut, Client* ignore ) const
{
// TODO check global shortcuts etc.
for( ClientList::ConstIterator it = clients.begin();