summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-31 13:17:51 -0600
committerTimothy Pearson <[email protected]>2013-01-31 13:17:51 -0600
commit9ec556b0dd24fc18fb28a2a686bffbf80d24e685 (patch)
tree0b9097fea393543080281bbd3eca7b6f81bbbdec
parentcea06eaaaeebe97345f15cbe137205172a74e193 (diff)
downloadkmyfirewall-9ec556b0dd24fc18fb28a2a686bffbf80d24e685.tar.gz
kmyfirewall-9ec556b0dd24fc18fb28a2a686bffbf80d24e685.zip
Rename KStandard for enhanced compatibility with KDE4
-rw-r--r--kmyfirewall/core/kmfapp.cpp2
-rw-r--r--kmyfirewall/core/kmfdoc.cpp2
-rw-r--r--kmyfirewall/core/kmfiptdoc.cpp2
-rw-r--r--kmyfirewall/core/kmfprotocollibrary.cpp4
-rw-r--r--kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfselectinterface.cpp4
-rw-r--r--kmyfirewall/kmfwidgets/kmftemplatechooser.cpp2
7 files changed, 9 insertions, 9 deletions
diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp
index b32b9e3..81fd357 100644
--- a/kmyfirewall/core/kmfapp.cpp
+++ b/kmyfirewall/core/kmfapp.cpp
@@ -57,7 +57,7 @@ void showSplash() {
bool show = true;
if ( show ) {
- KStandardDirs std_dir;
+ TDEStandardDirs std_dir;
TQString dir = std_dir.findResource( "data", "kmyfirewall/pics/splash.png" );
kdDebug() << "\nFound Splashscreen at: " << dir << endl;
diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp
index 0c73267..89a4851 100644
--- a/kmyfirewall/core/kmfdoc.cpp
+++ b/kmyfirewall/core/kmfdoc.cpp
@@ -128,7 +128,7 @@ KMFError* KMFDoc::exportXMLRuleset( bool promptFile, bool asTemplate ) {
- KStandardDirs std_dir;
+ TDEStandardDirs std_dir;
TQString tmp_dir = std_dir.findResourceDir( "data", "kmyfirewall/templates/" );
TQDir dir( tmp_dir + "/kmyfirewall/templates/" );
diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp
index 50d7bb2..7c9a3cb 100644
--- a/kmyfirewall/core/kmfiptdoc.cpp
+++ b/kmyfirewall/core/kmfiptdoc.cpp
@@ -458,7 +458,7 @@ void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) {
void KMFIPTDoc::registerRuleOptions() {
kdDebug() << "KMFIPTDoc::registerRuleOptions()" << endl;
- KStandardDirs std_dir;
+ TDEStandardDirs std_dir;
TQStringList files = std_dir.findAllResources(
"data", "kmyfirewall/ruleoptions/kmfruleoption*.xml", false, true );
diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp
index 3aa45c4..a39ee46 100644
--- a/kmyfirewall/core/kmfprotocollibrary.cpp
+++ b/kmyfirewall/core/kmfprotocollibrary.cpp
@@ -95,7 +95,7 @@ void KMFProtocolLibrary::forceProtocolLibraryReload() {
KMFError *err = new KMFError();
KMFErrorHandler *errH = new KMFErrorHandler( "KMFErrorHandler" );
- KStandardDirs std_dir;
+ TDEStandardDirs std_dir;
TQString file = std_dir.findResource( "data", "kmyfirewall/protocols/kmfprotocollibrary.xml" );
KURL url;
url.setPath( file );
@@ -228,7 +228,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr
KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
kdDebug() << "KMFProtocolLibrary::saveProtocolLibrary()" << endl;
KMFError *err = new KMFError();
- KStandardDirs std_dir;
+ TDEStandardDirs std_dir;
TQString saveFile = std_dir.saveLocation( "data", "kmyfirewall" );
diff --git a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
index f3b8cae..1386bd0 100644
--- a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
@@ -32,7 +32,7 @@
#include "kdebug.h"
namespace KMF {
KMFNewDocDlg::KMFNewDocDlg( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallNewDocument( parent, name, fl ) {
- KStandardDirs std_dir;
+ TDEStandardDirs std_dir;
TQString dir = std_dir.findResource( "data", "kmyfirewall/pics/splash_cut.png" );
kdDebug() << "Found Splashscreen at: " << dir << endl;
diff --git a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
index f2517f6..5d65d79 100644
--- a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
+++ b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
@@ -41,7 +41,7 @@ KMFSelectInterface::KMFSelectInterface( TQWidget *parent, const char *name, bool
m_descs << i18n("<qt><p>The IPTable interface is meant to be used by advanced users who like to have full control over the rules generated; as such, the IPTables interface provides an almost 1-1 view on your iptables configuration.</p></qt>");
m_cob_interface->insertItem( i18n("IPTables Interface") );
- KStandardDirs dir;
+ TDEStandardDirs dir;
TQString filename = dir.findResource( "data", "kmyfirewall/pics/kmf_snapshot_generic_interface.png" );
TQPixmap *p = new TQPixmap( filename );
m_pic_screenshot->setPixmap( *p );
@@ -66,7 +66,7 @@ void KMFSelectInterface::slotInterfaceChanged( int index ) {
kdDebug() << "KMFSelectInterface::slotInterfaceChanged( int index )" << endl;
m_lbl_descripton->setText( *m_descs.at( index ) );
- KStandardDirs dir;
+ TDEStandardDirs dir;
TQString filename = "";
switch ( index ) {
case 0:
diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
index d82ba5c..0f1d1cc 100644
--- a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
+++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
@@ -97,7 +97,7 @@ void KMFTemplateChooser::parseTemplates(){
m_templateDescriptions.append( i18n("Clean Ruleset that does not do anything. Use this if you like to setup your firewall from scratch.") );
}
- KStandardDirs std_dir;
+ TDEStandardDirs std_dir;
TQString tmp_dir = std_dir.findResourceDir( "data", "kmyfirewall/templates/" );
TQDir dir( tmp_dir + "/kmyfirewall/templates/" );