Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 3bae8aff20
commit 6b118991a5

@ -81,7 +81,7 @@ KMFSysTray::KMFSysTray( TQWidget* w ) : KSystemTray ( w ) , DCOPObject( "KMFSys
KMFSysTray::~KMFSysTray() {}
void KMFSysTray::initMenu() {
KPopupMenu* menu = contextMenu ();
TDEPopupMenu* menu = contextMenu ();
menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K );
}

@ -51,11 +51,11 @@ KMFIPTablesCompiler::KMFIPTablesCompiler( TQObject* parent, const char* name ) :
m_errorHandler = new KMFErrorHandler( "KMFIPTablesCompiler" );
m_iptWidget = 0;
new KAction( i18n( "&Export as IPTables (Linux) Script" ), "fileexport",
new TDEAction( i18n( "&Export as IPTables (Linux) Script" ), "fileexport",
0, this, TQT_SLOT( slotExportIPT() ), actionCollection(), "compile_iptables" );
if ( genericDoc() ) {
new KAction( i18n( "&Convert to IPTables Document and View" ), "fileexport",
new TDEAction( i18n( "&Convert to IPTables Document and View" ), "fileexport",
0, this, TQT_SLOT( slotConvertToIPTDoc() ), actionCollection(), "convert_to_iptdoc" );
setXMLFile( "kmfiptablescompiler.rc" );

@ -44,7 +44,7 @@ KMFPFCompiler::KMFPFCompiler( TQObject* parent, const char* name ) : KMFPlugin(
if ( genericDoc() ) {
new KAction( i18n( "Export as &PF (OpenBSD) Script" ), "fileexport",
new TDEAction( i18n( "Export as &PF (OpenBSD) Script" ), "fileexport",
0, this, TQT_SLOT( slotExportPF() ), actionCollection(), "compile_pf" );
setXMLFile( "kmfpfcompiler.rc" );

@ -62,25 +62,25 @@ KMFGenericInterfacePart::KMFGenericInterfacePart( TQWidget *parentWidget, const
this, TQT_SLOT( slotEnableActions( bool ) ) );
m_actionGoMyNetwork = new KAction( i18n( "&My Network" ), TQIconSet( BarIcon( "network", KMFGenericInterfacePartFactory::instance() ) ),
m_actionGoMyNetwork = new TDEAction( i18n( "&My Network" ), TQIconSet( BarIcon( "network", KMFGenericInterfacePartFactory::instance() ) ),
0 , this, TQT_SLOT( slotGoMyNetwork() ), actionCollection(), "my_network" );
m_actionGoAccessControl = new KAction( i18n( "&Access Control" ), TQIconSet( BarIcon( "services", KMFGenericInterfacePartFactory::instance() ) ),
m_actionGoAccessControl = new TDEAction( i18n( "&Access Control" ), TQIconSet( BarIcon( "services", KMFGenericInterfacePartFactory::instance() ) ),
0 , this, TQT_SLOT( slotGoAccessControl() ), actionCollection(), "access_control" );
m_actionGoSpecialHosts = new KAction( i18n( "&Special Hosts Control" ), TQIconSet( BarIcon( "network_local", KMFGenericInterfacePartFactory::instance() ) ),
m_actionGoSpecialHosts = new TDEAction( i18n( "&Special Hosts Control" ), TQIconSet( BarIcon( "network_local", KMFGenericInterfacePartFactory::instance() ) ),
0 , this, TQT_SLOT( slotGoSpecialHosts() ), actionCollection(), "special_hosts" );
m_actionGoICMPOptions = new KAction( i18n( "&ICMP Options" ), TQIconSet( BarIcon( "pipe", KMFGenericInterfacePartFactory::instance() ) ),
m_actionGoICMPOptions = new TDEAction( i18n( "&ICMP Options" ), TQIconSet( BarIcon( "pipe", KMFGenericInterfacePartFactory::instance() ) ),
0 , this, TQT_SLOT( slotGoICMPOptions() ), actionCollection(), "icmp_options" );
m_actionGoNATConfiguration = new KAction( i18n( "&NAT Configuration" ), TQIconSet( BarIcon( "filesaveas", KMFGenericInterfacePartFactory::instance() ) ),
m_actionGoNATConfiguration = new TDEAction( i18n( "&NAT Configuration" ), TQIconSet( BarIcon( "filesaveas", KMFGenericInterfacePartFactory::instance() ) ),
0 , this, TQT_SLOT( slotGoNATConfiguration() ), actionCollection(), "nat_configuration" );
m_actionGoLogging = new KAction( i18n( "&Logging" ), TQIconSet( BarIcon( "log", KMFGenericInterfacePartFactory::instance() ) ),
m_actionGoLogging = new TDEAction( i18n( "&Logging" ), TQIconSet( BarIcon( "log", KMFGenericInterfacePartFactory::instance() ) ),
0 , this, TQT_SLOT( slotGoLogging() ), actionCollection(), "logging_options" );
@ -140,7 +140,7 @@ void KMFGenericInterfacePart::slotGoLogging() {
void KMFGenericInterfacePart::setModified( bool modified ) {
// get a handle on our Save action and make sure it is valid
// KAction * save = actionCollection() ->action( KStdAction::stdName( KStdAction::Save ) );
// TDEAction * save = actionCollection() ->action( KStdAction::stdName( KStdAction::Save ) );
// if ( !save )
// return ;
//

@ -21,8 +21,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
class TDEInstance;
class TDEAboutData;
class TQLabel;
class KAction;
class KActionMenu;
class TDEAction;
class TDEActionMenu;
namespace KMF {
class KMFMainWindow;
@ -78,12 +78,12 @@ private:
KMFMainWindow *m_app;
KMFGenericInterface *m_genericinterface;
KAction* m_actionGoMyNetwork;
KAction* m_actionGoAccessControl;
KAction* m_actionGoSpecialHosts;
KAction* m_actionGoICMPOptions;
KAction* m_actionGoNATConfiguration;
KAction* m_actionGoLogging;
TDEAction* m_actionGoMyNetwork;
TDEAction* m_actionGoAccessControl;
TDEAction* m_actionGoSpecialHosts;
TDEAction* m_actionGoICMPOptions;
TDEAction* m_actionGoNATConfiguration;
TDEAction* m_actionGoLogging;
/*signals:
void sigUpdateView();*/

@ -52,7 +52,7 @@ namespace KMF {
KMFGenericInterfaceHost::KMFGenericInterfaceHost( TQWidget *parent, const char *name, WFlags f )
: KMyFirewallGenericInterfaceHostWidget( parent, name, f ) {
m_lv_zones->setFullWidth( true );
m_contextMenu = new KPopupMenu( this, "Popup" );
m_contextMenu = new TDEPopupMenu( this, "Popup" );
m_contextMenu->hide();
loadIcons();
connect( m_lv_zones, TQT_SIGNAL( pressed( TQListViewItem* ) ) ,

@ -40,7 +40,7 @@ class TQListViewItem;
// KDE includes
class KPopupMenu;
class TDEPopupMenu;
namespace KMF {
// Project Includes
@ -86,7 +86,7 @@ private:
TQGuardedPtr<KMFNetZone> m_zone;
TQGuardedPtr<KMFNetHost> m_host;
TQGuardedPtr<KMFNetwork> m_doc;
KPopupMenu* m_contextMenu;
TDEPopupMenu* m_contextMenu;
KMFListViewItem *itemTrustedHosts;
KMFListViewItem *itemMaliciousHosts;

@ -64,7 +64,7 @@
namespace KMF {
KMFGenericInterfaceProtocol::KMFGenericInterfaceProtocol( TQWidget *parent, const char *name, WFlags f ) : KMyFirewallGenericInterfaceProtocolWidget( parent, name, f ) {
loadIcons();
m_contextMenu = new KPopupMenu( this, "m_contextMenu" );
m_contextMenu = new TDEPopupMenu( this, "m_contextMenu" );
// m_lv_protocols->setFullWidth( true );
// Network Widget

@ -36,7 +36,7 @@ class TQListViewItem;
#include <tquuid.h>
// KDE includes
class KPopupMenu;
class TDEPopupMenu;
// Project includes
#include "../core/kmfprotocol.h"
@ -100,7 +100,7 @@ private:
private:
TQGuardedPtr<KMFNetwork> m_doc;
KPopupMenu* m_contextMenu;
TDEPopupMenu* m_contextMenu;
KMFNetworkWidget *m_network_widget;
KMFNetHostPropertiesWidget *m_nethostProperties_widget;

@ -256,7 +256,7 @@
</widget>
</grid>
</widget>
<widget class="KListView" row="0" column="0">
<widget class="TDEListView" row="0" column="0">
<column>
<property name="text">
<string>Host</string>

@ -114,7 +114,7 @@
<property name="orientation">
<enum>Horizontal</enum>
</property>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Object</string>

@ -73,31 +73,31 @@ KMFInstallerPlugin::KMFInstallerPlugin( TQObject *parent, const char *name )
// m_installerPlugin = 0;
m_execWidget = 0;
m_actionStopFw = new KAction( i18n( "&Reset IPTables" ), "decrypted",
m_actionStopFw = new TDEAction( i18n( "&Reset IPTables" ), "decrypted",
0, this, TQT_SLOT( slotStopFirewall() ), actionCollection(), "reset_iptables" );
m_actionRunFw = new KAction( i18n( "Run Fir&ewall" ), "encrypted",
m_actionRunFw = new TDEAction( i18n( "Run Fir&ewall" ), "encrypted",
0, this, TQT_SLOT( slotStartFirewall() ), actionCollection(), "run_firewall" );
m_actionPreviewScript = new KAction( i18n( "&Preview Script" ), "mime_txt",
m_actionPreviewScript = new TDEAction( i18n( "&Preview Script" ), "mime_txt",
0 , this, TQT_SLOT( slotShowScript() ), actionCollection(), "preview_script" );
m_generateInstallPackage = new KAction( i18n( "&Generate Linux Installation Package" ), "fileexport",
m_generateInstallPackage = new TDEAction( i18n( "&Generate Linux Installation Package" ), "fileexport",
0 , this, TQT_SLOT( slotGenerateInstallerPackage() ), actionCollection(), "generate_install_package" );
m_actionShowConfig = new KAction( i18n( "Show &All Tables" ), "messagebox_info",
m_actionShowConfig = new TDEAction( i18n( "Show &All Tables" ), "messagebox_info",
0 , this, TQT_SLOT( slotShowConfig() ), actionCollection(), "show_ipt_config" );
m_actionShowFilter = new KAction( i18n( "Show &Filter Table" ), "messagebox_info",
m_actionShowFilter = new TDEAction( i18n( "Show &Filter Table" ), "messagebox_info",
0 , this, TQT_SLOT( slotShowFilter() ), actionCollection(), "show_filter" );
m_actionShowNat = new KAction( i18n( "Show &Nat Table" ), "messagebox_info",
m_actionShowNat = new TDEAction( i18n( "Show &Nat Table" ), "messagebox_info",
0 , this, TQT_SLOT( slotShowNat() ), actionCollection(), "show_nat" );
m_actionShowMangle = new KAction( i18n( "Show &Mangle Table" ), "messagebox_info",
m_actionShowMangle = new TDEAction( i18n( "Show &Mangle Table" ), "messagebox_info",
0 , this, TQT_SLOT( slotShowMangle() ), actionCollection(), "show_mangle" );
m_actionMenu = new KActionMenu( i18n( "Show IPTables Configuration" ), "messagebox_info", this , "show_menu" );
m_actionMenu = new TDEActionMenu( i18n( "Show IPTables Configuration" ), "messagebox_info", this , "show_menu" );
m_actionMenu->insert( m_actionShowConfig );
m_actionMenu->insert( m_actionShowFilter );
@ -107,10 +107,10 @@ KMFInstallerPlugin::KMFInstallerPlugin( TQObject *parent, const char *name )
m_actionMenu->setStickyMenu( true );
actionCollection() ->insert( m_actionMenu );
m_actionInstallFW = new KAction( i18n( "&Install Firewall" ), "down",
m_actionInstallFW = new TDEAction( i18n( "&Install Firewall" ), "down",
0 , this, TQT_SLOT( slotInstallFW() ), actionCollection(), "install_firewall" );
m_actionUninstallFW = new KAction( i18n( "&Uninstall Firewall" ), "up",
m_actionUninstallFW = new TDEAction( i18n( "&Uninstall Firewall" ), "up",
0 , this, TQT_SLOT( slotUninstallFW() ), actionCollection(), "uninstall_firewall" );
setXMLFile( "kmfinstallerpluginui.rc" );

@ -26,8 +26,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
class TQWidget;
class TQPainter;
class KURL;
class KAction;
class KActionMenu;
class TDEAction;
class TDEActionMenu;
class TDEInstance;
namespace KMF {
@ -84,17 +84,17 @@ private:
private:
KMFDoc* m_doc;
KAction* m_actionStopFw;
KAction* m_actionRunFw;
KAction* m_actionPreviewScript;
KAction* m_actionShowConfig;
KAction* m_actionShowFilter;
KAction* m_actionShowNat;
KAction* m_actionShowMangle;
KActionMenu* m_actionMenu;
KAction* m_actionInstallFW;
KAction* m_actionUninstallFW;
KAction* m_generateInstallPackage;
TDEAction* m_actionStopFw;
TDEAction* m_actionRunFw;
TDEAction* m_actionPreviewScript;
TDEAction* m_actionShowConfig;
TDEAction* m_actionShowFilter;
TDEAction* m_actionShowNat;
TDEAction* m_actionShowMangle;
TDEActionMenu* m_actionMenu;
TDEAction* m_actionInstallFW;
TDEAction* m_actionUninstallFW;
TDEAction* m_generateInstallPackage;
enum { IPT, GENERIC };
int m_docType;
KMFProcOut *m_execWidget;

@ -80,29 +80,29 @@ KMFIPTEditorPart::KMFIPTEditorPart( TQWidget *parentWidget, const char *widgetNa
// notify the part that this is our internal widget
setWidget( m_ruleedit );
m_actionEditChain = new KAction( i18n( "&Edit Chain" ), TQIconSet( BarIcon( "configure_toolbars", KMFIPTEditorPartFactory::instance() ) ),
m_actionEditChain = new TDEAction( i18n( "&Edit Chain" ), TQIconSet( BarIcon( "configure_toolbars", KMFIPTEditorPartFactory::instance() ) ),
0 , this, TQT_SLOT( slotEditChain() ), actionCollection(), "edit_chain" );
m_actionNewChain = new KAction( i18n( "Add New Chain..." ), TQIconSet( BarIcon( "view_tree", KMFIPTEditorPartFactory::instance() ) ),
m_actionNewChain = new TDEAction( i18n( "Add New Chain..." ), TQIconSet( BarIcon( "view_tree", KMFIPTEditorPartFactory::instance() ) ),
0 , this, TQT_SLOT( slotNewChain() ), actionCollection(), "new_chain" );
m_actionDelChain = new KAction( i18n( "Delete Chain" ), TQIconSet( BarIcon( "editdelete", KMFIPTEditorPartFactory::instance() ) ),
m_actionDelChain = new TDEAction( i18n( "Delete Chain" ), TQIconSet( BarIcon( "editdelete", KMFIPTEditorPartFactory::instance() ) ),
0 , this, TQT_SLOT( slotDelChain() ), actionCollection(), "del_chain" );
m_actionNewRule = new KAction( i18n( "Add New Rule..." ), TQIconSet( TDEGlobal:: iconLoader()->loadIcon( "rule", KIcon::Toolbar ) ) ,
KStdAccel::shortcut(KStdAccel::New) , this, TQT_SLOT( slotNewRule() ), actionCollection(), "new_rule" );
m_actionNewRule = new TDEAction( i18n( "Add New Rule..." ), TQIconSet( TDEGlobal:: iconLoader()->loadIcon( "rule", KIcon::Toolbar ) ) ,
TDEStdAccel::shortcut(TDEStdAccel::New) , this, TQT_SLOT( slotNewRule() ), actionCollection(), "new_rule" );
// m_actionNewRule->setIconSet( TQIconSet( loader->loadIcon( "rule-22", KIcon::User ) ) );
m_actionDelRule = new KAction( i18n( "Delete Rule" ), TQIconSet( BarIcon( "editdelete", KMFIPTEditorPartFactory::instance() ) ),
KStdAccel::shortcut(KStdAccel::DeleteWordBack), this, TQT_SLOT( slotDelRule() ), actionCollection(), "del_rule" );
m_actionDelRule = new TDEAction( i18n( "Delete Rule" ), TQIconSet( BarIcon( "editdelete", KMFIPTEditorPartFactory::instance() ) ),
TDEStdAccel::shortcut(TDEStdAccel::DeleteWordBack), this, TQT_SLOT( slotDelRule() ), actionCollection(), "del_rule" );
m_actionEditDocOptions = new KAction( i18n( "&Configure Firewall Options..." ), "configure", 0 , this, TQT_SLOT( slotEditDocOptions() ),
m_actionEditDocOptions = new TDEAction( i18n( "&Configure Firewall Options..." ), "configure", 0 , this, TQT_SLOT( slotEditDocOptions() ),
actionCollection(), "edit_doc_options" );
m_actionEditNetwork = new KAction( i18n( "&Configure the Network" ), TQIconSet( BarIcon( "configure_toolbars", KMFIPTEditorPartFactory::instance() ) ), 0 , this, TQT_SLOT( slotEditNetwork() ),
m_actionEditNetwork = new TDEAction( i18n( "&Configure the Network" ), TQIconSet( BarIcon( "configure_toolbars", KMFIPTEditorPartFactory::instance() ) ), 0 , this, TQT_SLOT( slotEditNetwork() ),
actionCollection(), "edit_network" );
@ -164,7 +164,7 @@ void KMFIPTEditorPart::slotEditNetwork() {
//###########################################
void KMFIPTEditorPart::setModified( bool modified ) {
// get a handle on our Save action and make sure it is valid
KAction * save = actionCollection() ->action( KStdAction::stdName( KStdAction::Save ) );
TDEAction * save = actionCollection() ->action( KStdAction::stdName( KStdAction::Save ) );
if ( !save )
return ;

@ -19,8 +19,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
class TQWidget;
class TQPainter;
class KURL;
class KAction;
class KActionMenu;
class TDEAction;
class TDEActionMenu;
class TDEInstance;
class TDEAboutData;
@ -95,13 +95,13 @@ private:
KMFRuleEdit *m_ruleedit;
KMFIPTDoc* m_doc;
KMFIPTDocOptions *m_editdoc;
KAction* m_actionEditNetwork;
KAction* m_actionEditChain;
KAction* m_actionNewChain;
KAction* m_actionNewRule;
KAction* m_actionDelChain;
KAction* m_actionDelRule;
KAction* m_actionEditDocOptions;
TDEAction* m_actionEditNetwork;
TDEAction* m_actionEditChain;
TDEAction* m_actionNewChain;
TDEAction* m_actionNewRule;
TDEAction* m_actionDelChain;
TDEAction* m_actionDelRule;
TDEAction* m_actionEditDocOptions;
};

@ -171,7 +171,7 @@ KMFRuleEdit::KMFRuleEdit( TQWidget* parent, const char* name, WFlags fl )
m_myNetworkWidget->hide(); //close( false );
m_check_input = new KMFCheckInput();
m_contextMenu = new KPopupMenu( this );
m_contextMenu = new TDEPopupMenu( this );
connect( cb_log_rule, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( slotLogRuleChanged() ) );
@ -1182,7 +1182,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
TQString lab_str = i18n("Rule: %1").arg( name );
m_contextMenu->insertTitle( icon_rule, lab_str );
KPopupMenu *sub_edit = new KPopupMenu( m_contextMenu );
TDEPopupMenu *sub_edit = new TDEPopupMenu( m_contextMenu );
sub_edit->insertTitle( i18n( "Edit Rule Option" ) );
for( uint i = 0; i < m_editPlugins.count(); i++ ) {
sub_edit->insertItem( icon_edit, i18n( "Edit %1" ).arg(m_editPlugins.at(i)->optionEditName() ), i );
@ -1205,7 +1205,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
m_contextMenu->insertItem( icon_del, i18n( "Delete Chain" ), this, TQT_SLOT( slotDelChain() ) );
m_contextMenu->insertSeparator();
KPopupMenu *sub_copy = new KPopupMenu( m_contextMenu );
TDEPopupMenu *sub_copy = new TDEPopupMenu( m_contextMenu );
connect( sub_copy, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotCopyRule( int ) ) );
sub_copy->insertTitle( i18n( "Copy to Chain" ) );
TQPtrList<IPTChain> chains = m_table ->chains();
@ -1215,7 +1215,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
}
m_contextMenu->insertItem( icon_copy, i18n( "Copy Rule" ), sub_copy );
KPopupMenu *sub_move = new KPopupMenu( m_contextMenu );
TDEPopupMenu *sub_move = new TDEPopupMenu( m_contextMenu );
connect( sub_move, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotMoveRule( int ) ) );
sub_move->insertTitle( i18n( "Move to Chain" ) );
TQPtrList<IPTChain> chains2 = m_table->chains();

@ -33,9 +33,9 @@
// project includes
#include "../core/kmfruleeditinterface.h"
class TQListViewItem;
class KListViewItem;
class TDEListViewItem;
class TQString;
class KPopupMenu;
class TDEPopupMenu;
namespace KMF {
class KMFIPTDoc;
@ -122,7 +122,7 @@ private:
KMFErrorHandler *m_err_handler;
KMFCheckInput *m_check_input;
KMFMainWindow *m_app;
KPopupMenu *m_contextMenu;
TDEPopupMenu *m_contextMenu;
TQPixmap icon_up, icon_down, icon_del, icon_edit, icon_rule, icon_filter, icon_rename,
icon_chain, icon_log, icon_accept, icon_drop, icon_cmd, icon_reject, icon_return,
icon_target, icon_queue, icon_new, icon_copy, icon_move;

@ -268,7 +268,7 @@ void KMFConfigDialog::setupPlugins(){
TQVBoxLayout *lay = new TQVBoxLayout( page );
TQLabel *text1 = new TQLabel( i18n( "<qt>In the list you can see which plugins have been found.</qt>" ), page );
lay->addWidget( text1 );
m_lv_plugins = new KListView( page );
m_lv_plugins = new TDEListView( page );
m_lv_plugins->addColumn( i18n("Name") );
m_lv_plugins->addColumn( i18n("Description") );
m_lv_plugins->addColumn( i18n("Library") );
@ -278,19 +278,19 @@ void KMFConfigDialog::setupPlugins(){
void KMFConfigDialog::checkPlugins() {
kdDebug() << "void KMFConfigDialog::checkPlugins()" << endl;
m_lv_plugins->clear();
KListViewItem *item_installers = new KListViewItem( m_lv_plugins, 0,0 );
TDEListViewItem *item_installers = new TDEListViewItem( m_lv_plugins, 0,0 );
item_installers->setText( 0, i18n("Installers") );
item_installers->setOpen( true );
KListViewItem *item_compilers = new KListViewItem( m_lv_plugins, 0,0 );
TDEListViewItem *item_compilers = new TDEListViewItem( m_lv_plugins, 0,0 );
item_compilers->setText( 0, i18n("Compilers") );
item_compilers->setOpen( true );
KListViewItem *item_optioneditors = new KListViewItem( m_lv_plugins, 0,0 );
TDEListViewItem *item_optioneditors = new TDEListViewItem( m_lv_plugins, 0,0 );
item_optioneditors->setText( 0, i18n("Rule Option Editors") );
item_optioneditors->setOpen( true );
KListViewItem *item_targetoptioneditors = new KListViewItem( m_lv_plugins, 0,0 );
TDEListViewItem *item_targetoptioneditors = new TDEListViewItem( m_lv_plugins, 0,0 );
item_targetoptioneditors->setText( 0, i18n("Rule Target Option Editors") );
item_targetoptioneditors->setOpen( true );
@ -299,13 +299,13 @@ void KMFConfigDialog::checkPlugins() {
// kdDebug() << "Query performed for KMyFirewall/Installer" << endl;
TDETrader::OfferList::iterator it;
if ( offers.empty() ) {
KListViewItem *item = new KListViewItem( item_installers, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_installers, 0,0);
item->setText(0, i18n("No installer plugins found!") );
kdDebug() << "NO MATCHING PLUGIN FOUND" << endl;
}
for ( it = offers.begin(); it != offers.end(); ++it ) {
KService::Ptr ptr = *it;
KListViewItem *item = new KListViewItem( item_installers, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_installers, 0,0);
item->setText(0, ptr->name() );
item->setText(1, ptr->comment() );
item->setText(2, ptr->library().local8Bit().data() );
@ -314,13 +314,13 @@ void KMFConfigDialog::checkPlugins() {
TDETrader::OfferList offers2 = TDETrader::self()->query( "KMyFirewall/Compiler" );
// kdDebug() << "Query performed for KMyFirewall/Compiler" << endl;
if ( offers2.empty() ) {
KListViewItem *item = new KListViewItem( item_compilers, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_compilers, 0,0);
item->setText(0, i18n("No compiler plugins found!") );
kdDebug() << "NO MATCHING PLUGIN FOUND" << endl;
}
for ( it = offers2.begin(); it != offers2.end(); ++it ) {
KService::Ptr ptr = *it;
KListViewItem *item = new KListViewItem( item_compilers, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_compilers, 0,0);
item->setText(0, ptr->name() );
item->setText(1, ptr->comment() );
item->setText(2, ptr->library().local8Bit().data() );
@ -344,14 +344,14 @@ void KMFConfigDialog::checkPlugins() {
TDETrader::OfferList offers3 = TDETrader::self()->query( "KMyFirewall/RuleOptionEdit" );
// kdDebug() << "Query performed for KMyFirewall/RuleOptionEdit" << endl;
if ( offers3.empty() ) {
KListViewItem *item = new KListViewItem( item_optioneditors, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_optioneditors, 0,0);
item->setText(0, i18n("No RuleOptionEdit plugins found.") );
kdDebug() << "NO MATCHING PLUGIN FOUND" << endl;
}
for ( it = offers3.begin(); it != offers3.end(); ++it ) {
KService::Ptr ptr = *it;
KListViewItem *item = new KListViewItem( item_optioneditors, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_optioneditors, 0,0);
item->setText(0, ptr->name() );
item->setText(1, ptr->comment() );
item->setText(2, ptr->library().local8Bit().data() );
@ -361,13 +361,13 @@ void KMFConfigDialog::checkPlugins() {
TDETrader::OfferList offers4 = TDETrader::self()->query( "KMyFirewall/RuleTargetOptionEdit" );
// kdDebug() << "Query performed for KMyFirewall/RuleTargetOptionEdit" << endl;
if ( offers4.empty() ) {
KListViewItem *item = new KListViewItem( item_targetoptioneditors, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_targetoptioneditors, 0,0);
item->setText(0, i18n("No RuleTargetOptionEdit plugins found.") );
kdDebug() << "NO MATCHING PLUGIN FOUND" << endl;
}
for ( it = offers4.begin(); it != offers4.end(); ++it ) {
KService::Ptr ptr = *it;
KListViewItem *item = new KListViewItem( item_targetoptioneditors, 0,0);
TDEListViewItem *item = new TDEListViewItem( item_targetoptioneditors, 0,0);
item->setText(0, ptr->name() );
item->setText(1, ptr->comment() );
item->setText(2, ptr->library().local8Bit().data() );

@ -31,7 +31,7 @@ class TQButtonGroup;
class KURLRequester;
class KPushButton;
class KComboBox;
class KListBox;
class TDEListBox;
class KIntSpinBox;
namespace KMF {
@ -100,7 +100,7 @@ private: // data
TQLabel *m_lvp_text1, *m_lvp_text2, *m_lvp_text3;
// Plugins
KListView *m_lv_plugins;
TDEListView *m_lv_plugins;
signals:
void sigConfigChanged();
};

@ -39,7 +39,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include "../kmyfirewall.h"
#include "kmflistviewitem.h"
namespace KMF {
KMFListView::KMFListView( TQWidget *parent, const char *name ) : KListView( parent, name ) {
KMFListView::KMFListView( TQWidget *parent, const char *name ) : TDEListView( parent, name ) {
loadIcons();
connect( this, TQT_SIGNAL( sigLoadNode( NetfilterObject* ) ),
this, TQT_SLOT( slotLoadNode( NetfilterObject* ) ) );
@ -56,8 +56,8 @@ KMFListView::KMFListView( TQWidget *parent, const char *name ) : KListView( pare
addColumn( i18n( "Value" ) );
setSizePolicy( TQSizePolicy( ( TQSizePolicy::SizeType ) 2, ( TQSizePolicy::SizeType ) 2, 0, 0,
sizePolicy().hasHeightForWidth() ) );
setFrameShape( KListView::StyledPanel );
setFrameShadow( KListView::Sunken );
setFrameShape( TDEListView::StyledPanel );
setFrameShadow( TDEListView::Sunken );
setSorting( 0, true );
setFullWidth( true );
setItemsMovable( true );

@ -31,7 +31,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
/**
@author Christian Hubinger
*/
class KListViewItem;
class TDEListViewItem;
namespace KMF {
class NetfilterObject;
class IPTable;
@ -41,7 +41,7 @@ class IPTRuleOption;
class KMFListViewItem;
class KDE_EXPORT KMFListView : public KListView {
class KDE_EXPORT KMFListView : public TDEListView {
Q_OBJECT
public:

@ -35,22 +35,22 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include "../core/iptruleoption.h"
#include "../core/netfilterobject.h"
namespace KMF {
KMFListViewItem::KMFListViewItem( KListView *parent, NetfilterObject* obj ) : KListViewItem( parent ) {
KMFListViewItem::KMFListViewItem( TDEListView *parent, NetfilterObject* obj ) : TDEListViewItem( parent ) {
m_top = false;
loadNetfilterObject(obj);
m_inUse = false;
}
KMFListViewItem::KMFListViewItem( KListView *parent, KListViewItem *after, NetfilterObject* obj ) : KListViewItem( parent, after ) {
KMFListViewItem::KMFListViewItem( TDEListView *parent, TDEListViewItem *after, NetfilterObject* obj ) : TDEListViewItem( parent, after ) {
m_top = false;
loadNetfilterObject(obj);
m_inUse = false;
}
KMFListViewItem::KMFListViewItem( KListViewItem *parent, NetfilterObject* obj ) : KListViewItem( parent ) {
KMFListViewItem::KMFListViewItem( TDEListViewItem *parent, NetfilterObject* obj ) : TDEListViewItem( parent ) {
m_top = false;
loadNetfilterObject(obj);
m_inUse = false;
}
KMFListViewItem::KMFListViewItem( KListViewItem *parent, KListViewItem *after, NetfilterObject* obj ) : KListViewItem( parent, after ) {
KMFListViewItem::KMFListViewItem( TDEListViewItem *parent, TDEListViewItem *after, NetfilterObject* obj ) : TDEListViewItem( parent, after ) {
m_top = false;
loadNetfilterObject(obj);
m_inUse = false;

@ -40,12 +40,12 @@ class KMFTarget;
class KMFProtocol;
class KMFProtocolCategory;
class KDE_EXPORT KMFListViewItem : public KListViewItem {
class KDE_EXPORT KMFListViewItem : public TDEListViewItem {
public:
KMFListViewItem( KListView *parent, NetfilterObject* );
KMFListViewItem( KListViewItem *parent, NetfilterObject* );
KMFListViewItem( KListView *parent, KListViewItem *after, NetfilterObject* );
KMFListViewItem( KListViewItem *parent, KListViewItem *after, NetfilterObject* );
KMFListViewItem( TDEListView *parent, NetfilterObject* );
KMFListViewItem( TDEListViewItem *parent, NetfilterObject* );
KMFListViewItem( TDEListView *parent, TDEListViewItem *after, NetfilterObject* );
KMFListViewItem( TDEListViewItem *parent, TDEListViewItem *after, NetfilterObject* );
virtual ~KMFListViewItem();

@ -52,7 +52,7 @@ KMFMyNetworkWidget::KMFMyNetworkWidget(TQWidget* parent, const char* name, WFlag
{
kdDebug() << "Contructor: KMFMyNetworkWidget::KMFMyNetworkWidget(TQWidget* parent, const char* name, WFlags fl)" << endl;
m_network = 0;
m_contextMenu = new KPopupMenu( this, "m_contextMenu" );
m_contextMenu = new TDEPopupMenu( this, "m_contextMenu" );
connect( m_lv_zones, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );

@ -24,7 +24,7 @@
#include <tqpixmap.h>
#include <tqguardedptr.h>
#include <tquuid.h>
class KPopupMenu;
class TDEPopupMenu;
class TQTextEdit;
@ -101,7 +101,7 @@ protected slots:
// TQTextEdit* m_zone_desc;
KMFNetworkWidget* m_network_widget;
// TQWidget *ws_pageZoneProperties;
KPopupMenu* m_contextMenu;
TDEPopupMenu* m_contextMenu;
};
}
#endif

@ -48,7 +48,7 @@ KMFTransactionLog* KMFTransactionLog::instance() {
}
KMFTransactionLog::KMFTransactionLog ( TQWidget* parent, const char* name, WFlags fl ) : KMyFirewallTransactionLog ( parent,name,fl ) {
m_contextMenu = new KPopupMenu( this, "m_contextMenu" );
m_contextMenu = new TDEPopupMenu( this, "m_contextMenu" );
m_currentTransaction = 0;
m_undoXMLFile = new KTempFile();
m_undoXMLFile->setAutoDelete( true );
@ -187,7 +187,7 @@ void KMFTransactionLog::slotLog( const TQString& msg ) {
void KMFTransactionLog::slotUpdateView() {
// kdDebug() << "KMFTransactionLog::updateView()" << endl;
KListViewItem* last = 0;
TDEListViewItem* last = 0;
TQValueList< KMFTransaction* > undos = KMFUndoEngine::instance()->undoTransactions();
TQValueList< KMFTransaction* >::iterator itUndo;
for ( itUndo = undos.begin(); itUndo != undos.end(); ++itUndo ) {
@ -238,28 +238,28 @@ void KMFTransactionLog::slotUpdateView() {
del->clear();
}
KListViewItem* KMFTransactionLog::setupListItem( KMFTransaction* trans, KListView* list, KListViewItem* after ) {
TDEListViewItem* KMFTransactionLog::setupListItem( KMFTransaction* trans, TDEListView* list, TDEListViewItem* after ) {
// kdDebug() << "Search transaction: " << trans->uuid().toString() << endl;
TQListViewItem* found = 0;
found = list->findItem ( trans->uuid().toString(), 1 );
if ( found ) {
return (KListViewItem*) found;
return (TDEListViewItem*) found;
}
// kdDebug() << "No Item Found" << endl;
KListViewItem* item = new KListViewItem( list, after );
TDEListViewItem* item = new TDEListViewItem( list, after );
item->setText( 0, trans->name() );
item->setText( 1, trans->uuid().toString() );
KListViewItem* last = 0;
TDEListViewItem* last = 0;
/* TQValueList<int>& objectIds = trans->objectIDs();
TQValueList<int>::iterator it;
for ( it = objectIds.begin(); it != objectIds.end(); ++it ) {*/
TQString obj_uuid = trans->objectUuid().toString();
KListViewItem* itemID = new KListViewItem( item, last, "", obj_uuid );
TDEListViewItem* itemID = new TDEListViewItem( item, last, "", obj_uuid );
last = itemID;
NetfilterObject *obj = 0;
obj = NetfilterObject::findObject ( obj_uuid );

@ -17,11 +17,11 @@
#include "kmyfirewalltransactionlog.h"
class KPopupMenu;
class TDEPopupMenu;
class TDEProcess;
class KTempFile;
class KListView;
class KListViewItem;
class TDEListView;
class TDEListViewItem;
namespace KMF {
class KMFTransaction;
@ -57,11 +57,11 @@ class KMFTransactionLog : public KMyFirewallTransactionLog
void slotKompareExited( TDEProcess* );
private:
KMFTransactionLog ( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
KListViewItem* setupListItem( KMFTransaction*, KListView*, KListViewItem*);
TDEListViewItem* setupListItem( KMFTransaction*, TDEListView*, TDEListViewItem*);
// DATA
private:
KPopupMenu *m_contextMenu;
TDEPopupMenu *m_contextMenu;
KMFTransaction* m_currentTransaction;
KTempFile *m_undoXMLFile;
KTempFile *m_redoXMLFile;

@ -57,7 +57,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
<string>If checked the list view also contains all protocols that are available by default, not only the ones you defined</string>
</property>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Protocol</string>
@ -171,7 +171,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="KListBox" row="1" column="1">
<widget class="TDEListBox" row="1" column="1">
<property name="name">
<cstring>m_lb_udpPorts</cstring>
</property>
@ -200,7 +200,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
<string>UDP Ports</string>
</property>
</widget>
<widget class="KListBox" row="1" column="0">
<widget class="TDEListBox" row="1" column="0">
<property name="name">
<cstring>m_lb_tcpPorts</cstring>
</property>

@ -35,7 +35,7 @@
<property name="childrenCollapsible">
<bool>false</bool>
</property>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Network/Target</string>

@ -25,7 +25,7 @@
<property name="spacing">
<number>2</number>
</property>
<widget class="KListView" row="0" column="0">
<widget class="TDEListView" row="0" column="0">
<column>
<property name="text">
<string>Accept Protocol</string>

@ -107,7 +107,7 @@
<string>NO Target Selected</string>
</property>
</widget>
<widget class="KListView" row="3" column="0" rowspan="1" colspan="5">
<widget class="TDEListView" row="3" column="0" rowspan="1" colspan="5">
<column>
<property name="text">
<string>Network/Target</string>

@ -78,7 +78,7 @@
<string>Undo stack</string>
</property>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>
@ -132,7 +132,7 @@
<string>Redo stack</string>
</property>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>

@ -299,7 +299,7 @@ void KMyFirewall::initActions() {
kdDebug() << "Init Actions..." << endl;
// Custom Actions
actionEditDocInfo = new KAction( i18n( "&Edit Document Information" ), "edit", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotEditDocInfo() ), actionCollection(), "edit_doc_info" );
actionEditDocInfo = new TDEAction( i18n( "&Edit Document Information" ), "edit", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotEditDocInfo() ), actionCollection(), "edit_doc_info" );
// KStdAction
actionNew = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ),
@ -327,16 +327,16 @@ void KMyFirewall::initActions() {
actionRedo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ),
actionCollection(), "redo" );
actionExportTargetConfig = new KAction( i18n( "&Export Target Configuration..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotExportTargetConfig() ),
actionExportTargetConfig = new TDEAction( i18n( "&Export Target Configuration..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotExportTargetConfig() ),
actionCollection(), "export_tagret_config" );
actionImportTargetConfig = new KAction( i18n( "&Import Target Configuration..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotImportTargetConfig() ),
actionImportTargetConfig = new TDEAction( i18n( "&Import Target Configuration..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotImportTargetConfig() ),
actionCollection(), "import_tagret_config" );
actionShowTransactionLog = new KAction( i18n( "&Show Transaction Log..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotShowTransactionLog() ),
actionShowTransactionLog = new TDEAction( i18n( "&Show Transaction Log..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotShowTransactionLog() ),
actionCollection(), "show_transaction_log" );
actionLoadTemplate = new KAction( i18n( "&Load Template..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotLoadTemplate() ),
actionLoadTemplate = new TDEAction( i18n( "&Load Template..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotLoadTemplate() ),
actionCollection(), "load_template" );
// KStdAction::showToolbar( TQT_TQOBJECT(this), TQT_SLOT( toggleToolBar() ) , actionCollection() );

@ -37,8 +37,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include "kmfwidgets/kmfmainwindow.h"
#include "core/kmyfirewallinterface.h"
class KAction;
class KActionMenu;
class TDEAction;
class TDEActionMenu;
class KDockWidget;
class KTempFile;
class TQCloseEvent;
@ -147,19 +147,19 @@ private: // data
KMFConfigDialog *m_configDlg;
KMFSelectInterface *m_selInterface;
KAction* actionQuit;
KAction* actionNew;
KAction* actionClose;
KAction* actionOpen;
KAction* actionSave;
KAction* actionSaveAs;
KAction* actionEditDocInfo;
KAction* actionLoadTemplate;
KAction* actionUndo;
KAction* actionRedo;
KAction* actionExportTargetConfig;
KAction* actionImportTargetConfig;
KAction* actionShowTransactionLog;
TDEAction* actionQuit;
TDEAction* actionNew;
TDEAction* actionClose;
TDEAction* actionOpen;
TDEAction* actionSave;
TDEAction* actionSaveAs;
TDEAction* actionEditDocInfo;
TDEAction* actionLoadTemplate;
TDEAction* actionUndo;
TDEAction* actionRedo;
TDEAction* actionExportTargetConfig;
TDEAction* actionImportTargetConfig;
TDEAction* actionShowTransactionLog;
bool saveQuit();
void closeEvent ( TQCloseEvent * );

Loading…
Cancel
Save