Rename KStandard for enhanced compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent cea06eaaae
commit 9ec556b0dd

@ -57,7 +57,7 @@ void showSplash() {
bool show = true; bool show = true;
if ( show ) { if ( show ) {
KStandardDirs std_dir; TDEStandardDirs std_dir;
TQString dir = std_dir.findResource( "data", "kmyfirewall/pics/splash.png" ); TQString dir = std_dir.findResource( "data", "kmyfirewall/pics/splash.png" );
kdDebug() << "\nFound Splashscreen at: " << dir << endl; kdDebug() << "\nFound Splashscreen at: " << dir << endl;

@ -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/" ); TQString tmp_dir = std_dir.findResourceDir( "data", "kmyfirewall/templates/" );
TQDir dir( tmp_dir + "/kmyfirewall/templates/" ); TQDir dir( tmp_dir + "/kmyfirewall/templates/" );

@ -458,7 +458,7 @@ void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) {
void KMFIPTDoc::registerRuleOptions() { void KMFIPTDoc::registerRuleOptions() {
kdDebug() << "KMFIPTDoc::registerRuleOptions()" << endl; kdDebug() << "KMFIPTDoc::registerRuleOptions()" << endl;
KStandardDirs std_dir; TDEStandardDirs std_dir;
TQStringList files = std_dir.findAllResources( TQStringList files = std_dir.findAllResources(
"data", "kmyfirewall/ruleoptions/kmfruleoption*.xml", false, true ); "data", "kmyfirewall/ruleoptions/kmfruleoption*.xml", false, true );

@ -95,7 +95,7 @@ void KMFProtocolLibrary::forceProtocolLibraryReload() {
KMFError *err = new KMFError(); KMFError *err = new KMFError();
KMFErrorHandler *errH = new KMFErrorHandler( "KMFErrorHandler" ); KMFErrorHandler *errH = new KMFErrorHandler( "KMFErrorHandler" );
KStandardDirs std_dir; TDEStandardDirs std_dir;
TQString file = std_dir.findResource( "data", "kmyfirewall/protocols/kmfprotocollibrary.xml" ); TQString file = std_dir.findResource( "data", "kmyfirewall/protocols/kmfprotocollibrary.xml" );
KURL url; KURL url;
url.setPath( file ); url.setPath( file );
@ -228,7 +228,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr
KMFError* KMFProtocolLibrary::saveProtocolLibrary() { KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
kdDebug() << "KMFProtocolLibrary::saveProtocolLibrary()" << endl; kdDebug() << "KMFProtocolLibrary::saveProtocolLibrary()" << endl;
KMFError *err = new KMFError(); KMFError *err = new KMFError();
KStandardDirs std_dir; TDEStandardDirs std_dir;
TQString saveFile = std_dir.saveLocation( "data", "kmyfirewall" ); TQString saveFile = std_dir.saveLocation( "data", "kmyfirewall" );

@ -32,7 +32,7 @@
#include "kdebug.h" #include "kdebug.h"
namespace KMF { namespace KMF {
KMFNewDocDlg::KMFNewDocDlg( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallNewDocument( parent, name, fl ) { 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" ); TQString dir = std_dir.findResource( "data", "kmyfirewall/pics/splash_cut.png" );
kdDebug() << "Found Splashscreen at: " << dir << endl; kdDebug() << "Found Splashscreen at: " << dir << endl;

@ -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_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") ); m_cob_interface->insertItem( i18n("IPTables Interface") );
KStandardDirs dir; TDEStandardDirs dir;
TQString filename = dir.findResource( "data", "kmyfirewall/pics/kmf_snapshot_generic_interface.png" ); TQString filename = dir.findResource( "data", "kmyfirewall/pics/kmf_snapshot_generic_interface.png" );
TQPixmap *p = new TQPixmap( filename ); TQPixmap *p = new TQPixmap( filename );
m_pic_screenshot->setPixmap( *p ); m_pic_screenshot->setPixmap( *p );
@ -66,7 +66,7 @@ void KMFSelectInterface::slotInterfaceChanged( int index ) {
kdDebug() << "KMFSelectInterface::slotInterfaceChanged( int index )" << endl; kdDebug() << "KMFSelectInterface::slotInterfaceChanged( int index )" << endl;
m_lbl_descripton->setText( *m_descs.at( index ) ); m_lbl_descripton->setText( *m_descs.at( index ) );
KStandardDirs dir; TDEStandardDirs dir;
TQString filename = ""; TQString filename = "";
switch ( index ) { switch ( index ) {
case 0: case 0:

@ -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.") ); 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/" ); TQString tmp_dir = std_dir.findResourceDir( "data", "kmyfirewall/templates/" );
TQDir dir( tmp_dir + "/kmyfirewall/templates/" ); TQDir dir( tmp_dir + "/kmyfirewall/templates/" );

Loading…
Cancel
Save