TDE
/
kvpnc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename many classes and header files to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent f82b690456
commit fed45b4784
19 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
src/addnetworkroutedialog.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
#include "addnetworkroutedialog.h"
#include <klocale.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klineedit.h>
#include <kcombobox.h>
#include <tqcheckbox.h>

2
src/importipsecprofiledialog.cpp
Unescape View File

@ -50,7 +50,7 @@
#include "importipsecprofiledialog.h"
#include "utils.h"
#include "importcertificatedialog.h"
#include <klistview.h>
#include <tdelistview.h>
#include "kvpncimportprofileselectiondialogbase.h"

20
src/kvpnc.cpp
Unescape View File

@ -77,13 +77,13 @@
#include <kmessagebox.h>
#include <tdeio/netaccess.h>
#include <ktempfile.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kglobal.h>
#include <kstandarddirs.h>
#include <knuminput.h>
#include <tdewallet.h>
#include <kinputdialog.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <tdefiledialog.h>
#include "kvpnc.h"
@ -13992,7 +13992,7 @@ void KVpnc::readFromStderr_ipsecwhack()
}
}
void KVpnc::readFromStdout_ipsecwhacklisten()
void KVpnc::readFromStdout_ipsecwhactdelisten()
{
if ( IpsecWhackListenProcess == 0 || IpsecGotError )
return;
@ -14142,7 +14142,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
}
}
void KVpnc::readFromStderr_ipsecwhacklisten()
void KVpnc::readFromStderr_ipsecwhactdelisten()
{
bool abort = false;
if ( IpsecWhackListenProcess ==0 || IpsecGotError )
@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
else
{
// we have to give some time to sleep and try again...
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) );
IpsecWhackListenProcess->tryTerminate();
sleep ( 2 );
if ( IpsecWhackListenProcess->isRunning() )
@ -21416,13 +21416,13 @@ void KVpnc::ipsecStarted()
IpsecWhackListenProcess->addArgument ( "whack" );
IpsecWhackListenProcess->addArgument ( "--listen" );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) );
if ( !IpsecWhackListenProcess->start ( env ) )
{
disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) );
disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) );
delete IpsecWhackListenProcess;
IpsecWhackListenProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) );

8
src/kvpnc.h
Unescape View File

@ -38,8 +38,8 @@
#include <tqsize.h>
#include <tqpopupmenu.h>
#include <kapp.h>
#include <kmainwindow.h>
#include <kaction.h>
#include <tdemainwindow.h>
#include <tdeaction.h>
#include <kprocess.h>
#include <kwizard.h>
#include <kapp.h>
@ -381,8 +381,8 @@ private slots:
void readFromStderr_ipsec();
void readFromStdout_ipsecwhack();
void readFromStderr_ipsecwhack();
void readFromStdout_ipsecwhacklisten();
void readFromStderr_ipsecwhacklisten();
void readFromStdout_ipsecwhactdelisten();
void readFromStderr_ipsecwhactdelisten();
void readFromStdout_ipsecwhackstatus();
void readFromStderr_ipsecwhackstatus();
void readFromStdout_ipsecwhackdelete();

4
src/kvpncconfig.cpp
Unescape View File

@ -24,7 +24,7 @@
#include "kvpncimportprofileselectiondialog.h"
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <iostream>
#include <kstandarddirs.h>
@ -35,7 +35,7 @@
#include <tqcursor.h>
#include <tqregexp.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kurl.h>
#include <kinputdialog.h>
#include <klineedit.h>

2
src/kvpncimportprofileselectiondialog.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
#include "kvpncimportprofileselectiondialog.h"
#include <kpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqlistview.h>
KvpncImportProfileSelectionDialog::KvpncImportProfileSelectionDialog()

2
src/kvpncimportprofileselectiondialogbase.ui
Unescape View File

@ -212,7 +212,7 @@
</connections>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
src/kvpnckicker.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tqimage.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kmessagebox.h>
#include "kvpnckicker.h"
#include "kvpnc.h"

2
src/kvpnckicker.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqwidget.h>
#include <tqevent.h>
#include <ksystemtray.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include "kvpncconfig.h"

2
src/logviewerdialog.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
#include "logviewerdialog.h"
#include <klocale.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqpixmap.h>
#include <kglobal.h>
#include <tqstring.h>

2
src/main.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kmessagebox.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kapp.h>
#include <klocale.h>

2
src/manageciscocert.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tqcursor.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kcombobox.h>

2
src/newprofilewizardnetworkroute.ui
Unescape View File

@ -251,7 +251,7 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>

2
src/preferencesdialog.cpp
Unescape View File

@ -41,7 +41,7 @@
#include <klineedit.h>
#include <kinputdialog.h>
#include <knuminput.h>
#include <klistview.h>
#include <tdelistview.h>
#include <ktextedit.h>
#include <kpassdlg.h>
#include <tqlayout.h>

2
src/profilenetworkrouteoptions.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <tqcheckbox.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqpushbutton.h>
#include <kpushbutton.h>
#include <kmessagebox.h>

2
src/profilenetworkrouteoptionsbase.ui
Unescape View File

@ -285,7 +285,7 @@
</forwards>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
src/toolsinfodialog.cpp
Unescape View File

@ -20,7 +20,7 @@
//BEGIN INCLUDES
#include "toolsinfodialog.h"
#include "listviewtooltip.h"
#include <klistview.h>
#include <tdelistview.h>
//#include <tqlistviewitem.h>
#include <tqpixmap.h>
#include <kglobal.h>

2
src/toolsinfowidgetbase.ui
Unescape View File

@ -136,6 +136,6 @@
</widget>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

2
src/vpntypesinfodialog.cpp
Unescape View File

@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "vpntypesinfodialog.h"
#include <klistview.h>
#include <tdelistview.h>
//#include <tqlistviewitem.h>
#include <tqpixmap.h>
#include <kglobal.h>

Write Preview
Loading…
Cancel
Save