From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- khotkeys/shared/khotkeysglobal.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'khotkeys/shared/khotkeysglobal.cpp') 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 ); -- cgit v1.2.1