mirror of
https://github.com/ChronosX88/nesca.git
synced 2024-10-18 10:21:03 +00:00
ada13732ae
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
50 lines
936 B
C++
50 lines
936 B
C++
<<<<<<< HEAD
|
|
#ifndef DRAWERTH_ME2SCANNER_H
|
|
#define DRAWERTH_ME2SCANNER_H
|
|
|
|
#pragma once
|
|
#include "nesca_3.h"
|
|
#include "resource.h"
|
|
|
|
class DrawerTh_ME2Scanner : public QThread
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
static void doEmitionAddPolyLine();
|
|
static void doEmitDrawTextPlacers();
|
|
|
|
public: signals: void sAddPolyLine();
|
|
public: signals: void sDrawTextPlacers();
|
|
|
|
protected:
|
|
void run();
|
|
};
|
|
extern DrawerTh_ME2Scanner *dtME2;
|
|
#endif // DRAWERTH_ME2SCANNER_H
|
|
=======
|
|
#ifndef DRAWERTH_ME2SCANNER_H
|
|
#define DRAWERTH_ME2SCANNER_H
|
|
|
|
#pragma once
|
|
#include "nesca_3.h"
|
|
#include "resource.h"
|
|
|
|
class DrawerTh_ME2Scanner : public QThread
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
static void doEmitionAddPolyLine();
|
|
static void doEmitDrawTextPlacers();
|
|
|
|
public: signals: void sAddPolyLine();
|
|
public: signals: void sDrawTextPlacers();
|
|
|
|
protected:
|
|
void run();
|
|
};
|
|
extern DrawerTh_ME2Scanner *dtME2;
|
|
#endif // DRAWERTH_ME2SCANNER_H
|
|
>>>>>>> 5d30af667b7f24c6e91d2bf1888215f755b4378d
|