summaryrefslogtreecommitdiffstats
path: root/khotkeys/shared/khotkeysglobal.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /khotkeys/shared/khotkeysglobal.cpp
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz
tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khotkeys/shared/khotkeysglobal.cpp')
-rw-r--r--khotkeys/shared/khotkeysglobal.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp
index 2b430fc8c..4c6b8360c 100644
--- a/khotkeys/shared/khotkeysglobal.cpp
+++ b/khotkeys/shared/khotkeysglobal.cpp
@@ -35,7 +35,7 @@ Kbd* keyboard_handler;
Windows* windows_handler;
static bool _khotkeys_active = false;
-void init_global_data( bool active_P, QObject* owner_P )
+void init_global_data( bool active_P, TQObject* owner_P )
{
assert( keyboard_handler == NULL );
assert( windows_handler == NULL );
@@ -59,15 +59,15 @@ bool khotkeys_active()
// does the opposite of KStandardDirs::findResource() i.e. e.g.
// "/opt/kde2/share/applnk/System/konsole.desktop" -> "System/konsole.desktop"
-QString get_menu_entry_from_path( const QString& path_P )
+TQString get_menu_entry_from_path( const TQString& path_P )
{
- QStringList dirs = KGlobal::dirs()->resourceDirs( "apps" );
- for( QStringList::ConstIterator it = dirs.begin();
+ TQStringList dirs = KGlobal::dirs()->resourceDirs( "apps" );
+ for( TQStringList::ConstIterator it = dirs.begin();
it != dirs.end();
++it )
if( path_P.find( *it ) == 0 )
{
- QString ret = path_P;
+ TQString ret = path_P;
ret.remove( 0, (*it).length());
if( ret[ 0 ] == '/' )
ret.remove( 0, 1 );