diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:21:10 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:21:10 -0600 |
commit | 3b543760cb2e819773dcefb8f94987092d80cdbc (patch) | |
tree | 398815bc6877ba5e86bd5582b36cd244b74b976f /KMFSysTray | |
parent | 8f312b3a8d21ec85e012d5f75e85b905267d147e (diff) | |
download | kmyfirewall-3b543760cb2e819773dcefb8f94987092d80cdbc.tar.gz kmyfirewall-3b543760cb2e819773dcefb8f94987092d80cdbc.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'KMFSysTray')
-rw-r--r-- | KMFSysTray/kmfsystray.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp index 416bcf5..17cded0 100644 --- a/KMFSysTray/kmfsystray.cpp +++ b/KMFSysTray/kmfsystray.cpp @@ -82,7 +82,7 @@ KMFSysTray::~KMFSysTray() {} void KMFSysTray::initMenu() { KPopupMenu* menu = contextMenu (); - menu->insertItem( KGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K ); + menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K ); } @@ -98,10 +98,10 @@ void KMFSysTray::slotSetRunningStatus( bool on ) { void KMFSysTray::slotLaunchKMF () { - KProcess *childproc = new KProcess(); + TDEProcess *childproc = new TDEProcess(); *childproc << "tdesu"; *childproc << "kmyfirewall"; - childproc->start( KProcess:: DontCare, KProcess::NoCommunication ); + childproc->start( TDEProcess:: DontCare, TDEProcess::NoCommunication ); } void KMFSysTray::slotShowDetails() { @@ -156,7 +156,7 @@ void KMFSysTray::resizeEvent( TQResizeEvent *e ) {} // extern "C" { // KPanelApplet * init( TQWidget * parent, const TQString & configFile ) { -// KGlobal::locale() ->insertCatalogue( "kmfsystray" ); +// TDEGlobal::locale() ->insertCatalogue( "kmfsystray" ); // return new KMFSysTray( configFile, KPanelApplet::Normal, // KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, // parent, "kmfsystray" ); |