nesca/CheckKey_Th.h

<<<<<<< HEAD
#ifndef CHECKKEY_TH_H
#define CHECKKEY_TH_H

#pragma once
#include "nesca_3.h"
#include "resource.h"
extern int emitIfOK;
class CheckKey_Th : public QThread
{
	Q_OBJECT

protected:
	void run();
};

extern CheckKey_Th *chKTh;
#endif // CHECKKEY_TH_H
=======
#ifndef CHECKKEY_TH_H
#define CHECKKEY_TH_H

#pragma once
#include "nesca_3.h"
#include "resource.h"
extern int emitIfOK;
class CheckKey_Th : public QThread
{
	Q_OBJECT

protected:
	void run();
};

extern CheckKey_Th *chKTh;
#endif // CHECKKEY_TH_H
>>>>>>> 5d30af667b7f24c6e91d2bf1888215f755b4378d
Merge branch 'master' of https://github.com/cora32/nesca Conflicts: 00000036.wav ActivityDrawerTh_HorNet.cpp ActivityDrawerTh_HorNet.h CheckKey_Th.cpp CheckKey_Th.h CheckProxy_Th.cpp CheckProxy_Th.h DrawerTh_GridQoSScanner.cpp DrawerTh_GridQoSScanner.h DrawerTh_HorNet.cpp DrawerTh_HorNet.h DrawerTh_ME2Scanner.cpp DrawerTh_ME2Scanner.h DrawerTh_QoSScanner.cpp DrawerTh_QoSScanner.h DrawerTh_VoiceScanner.cpp DrawerTh_VoiceScanner.h IRCPinger_Th.cpp IRCPinger_Th.h STh.cpp STh.h connector.cpp finder.cpp irc_nmblinker.cpp irc_nmblinker.h login.txt main.cpp msgcheckerthread.cpp msgcheckerthread.h negatives.txt nesca_3.cpp nesca_3.h nesca_3.qrc nesca_3.ui nesca_startModule.cpp oIRC_Th.cpp oIRC_Th.h pass.txt piestat.cpp piestat.h progressbardrawer.cpp progressbardrawer.h resource.h sshpass.txt vercheckerthread.cpp vercheckerthread.h wflogin.txt wfpass.txt 2014-09-07 19:07:40 +00:00			`<<<<<<< HEAD`
3_2266B_784 2014-09-07 18:54:46 +00:00			`#ifndef CHECKKEY_TH_H`
			`#define CHECKKEY_TH_H`

			`#pragma once`
			`#include "nesca_3.h"`
			`#include "resource.h"`
			`extern int emitIfOK;`
			`class CheckKey_Th : public QThread`
			`{`
			`Q_OBJECT`

			`protected:`
			`void run();`
			`};`

			`extern CheckKey_Th *chKTh;`
			`#endif // CHECKKEY_TH_H`
Merge branch 'master' of https://github.com/cora32/nesca Conflicts: 00000036.wav ActivityDrawerTh_HorNet.cpp ActivityDrawerTh_HorNet.h CheckKey_Th.cpp CheckKey_Th.h CheckProxy_Th.cpp CheckProxy_Th.h DrawerTh_GridQoSScanner.cpp DrawerTh_GridQoSScanner.h DrawerTh_HorNet.cpp DrawerTh_HorNet.h DrawerTh_ME2Scanner.cpp DrawerTh_ME2Scanner.h DrawerTh_QoSScanner.cpp DrawerTh_QoSScanner.h DrawerTh_VoiceScanner.cpp DrawerTh_VoiceScanner.h IRCPinger_Th.cpp IRCPinger_Th.h STh.cpp STh.h connector.cpp finder.cpp irc_nmblinker.cpp irc_nmblinker.h login.txt main.cpp msgcheckerthread.cpp msgcheckerthread.h negatives.txt nesca_3.cpp nesca_3.h nesca_3.qrc nesca_3.ui nesca_startModule.cpp oIRC_Th.cpp oIRC_Th.h pass.txt piestat.cpp piestat.h progressbardrawer.cpp progressbardrawer.h resource.h sshpass.txt vercheckerthread.cpp vercheckerthread.h wflogin.txt wfpass.txt 2014-09-07 19:07:40 +00:00			`=======`
			`#ifndef CHECKKEY_TH_H`
			`#define CHECKKEY_TH_H`

			`#pragma once`
			`#include "nesca_3.h"`
			`#include "resource.h"`
			`extern int emitIfOK;`
			`class CheckKey_Th : public QThread`
			`{`
			`Q_OBJECT`

			`protected:`
			`void run();`
			`};`

			`extern CheckKey_Th *chKTh;`
			`#endif // CHECKKEY_TH_H`
			`>>>>>>> 5d30af667b7f24c6e91d2bf1888215f755b4378d`