WebSVN - OpenInventory - Различия - Редакция 241 и 242


#ifndef WMITHREAD_H
#define WMITHREAD_H

#include <QThread>
#include <QProcess>
#include <QMutex>
#include <QDebug>

class WmiThread : public QThread
{
    Q_OBJECT
public:
    explicit WmiThread(QObject *parent = 0);
    void run();
    void stop();
    void setHost(QString new_host){host = new_host;}
    void setUser(QString new_user){user_name = new_user;}
    void setPassword(QString new_password){password = new_password;}
    QByteArray buffer(){return p_buffer;}
    void clearBuffer(){p_buffer.clear();}
    bool isError(){return error;}
    bool isStopped(){
        mutex.lock();
        return stopped;
        mutex.unlock();

                        };
    void setWmiString(QString new_wmi_string){wmi_string = new_wmi_string;}
private:
    volatile bool stopped;
    volatile bool error;
   QProcess process;
    QString host;
    QString user_name;
    QString password;
    QMutex mutex;
    QByteArray p_buffer; //çäåñü áóäåì õðàíèòü äàííûå, ñ÷èòàííûå èç ñòàíäàðòíîãî ïîòîêà äëÿ ÷òåíèÿ (ïðîöåññà)
    QString wmi_string;  //çäåñü áóäåì õðàíèòü wmi-çàïðîñ

signals:

public slots:
    void readStandartProcessOutput();
    void readStandartProcessError();

private slots:



};

#endif // WMITHREAD_H
 

Редакция 241	Редакция 242
1	#ifndef WMITHREAD_H	1	#ifndef WMITHREAD_H
2	#define WMITHREAD_H	2	#define WMITHREAD_H
3		3
4	#include <QThread>	4	#include <QThread>
5	#include <QProcess>	5	#include <QProcess>
6	#include <QMutex>	6	#include <QMutex>
-		7	#include <QDebug>
7		8
8	class WmiThread : public QThread	9	class WmiThread : public QThread
9	{	10	{
10	Q_OBJECT	11	Q_OBJECT
11	public:	12	public:
12	explicit WmiThread(QObject *parent = 0);	13	explicit WmiThread(QObject *parent = 0);
13	void run();	14	void run();
14	void stop();	15	void stop();
15	void setHost(QString new_host){host = new_host;}	16	void setHost(QString new_host){host = new_host;}
16	void setUser(QString new_user){user_name = new_user;}	17	void setUser(QString new_user){user_name = new_user;}
17	void setPassword(QString new_password){password = new_password;}	18	void setPassword(QString new_password){password = new_password;}
18	QByteArray buffer(){return p_buffer;}	19	QByteArray buffer(){return p_buffer;}
19	void clearBuffer(){p_buffer.clear();}	20	void clearBuffer(){p_buffer.clear();}
20	bool isError(){return error;}	21	bool isError(){return error;}
-		22	bool isStopped(){
-		23	mutex.lock();
-		24	return stopped;
-		25	mutex.unlock();
-		26
-		27	};
21	void setWmiString(QString new_wmi_string){wmi_string = new_wmi_string;}	28	void setWmiString(QString new_wmi_string){wmi_string = new_wmi_string;}
22	private:	29	private:
23	volatile bool stopped;	30	volatile bool stopped;
24	volatile bool error;	31	volatile bool error;
25	QProcess process;	32	QProcess process;
26	QString host;	33	QString host;
27	QString user_name;	34	QString user_name;
28	QString password;	35	QString password;
29	QMutex mutex;	36	QMutex mutex;
30	QByteArray p_buffer; //çäåñü áóäåì õðàíèòü äàííûå, ñ÷èòàííûå èç ñòàíäàðòíîãî ïîòîêà äëÿ ÷òåíèÿ (ïðîöåññà)	37	QByteArray p_buffer; //çäåñü áóäåì õðàíèòü äàííûå, ñ÷èòàííûå èç ñòàíäàðòíîãî ïîòîêà äëÿ ÷òåíèÿ (ïðîöåññà)
31	QString wmi_string; //çäåñü áóäåì õðàíèòü wmi-çàïðîñ	38	QString wmi_string; //çäåñü áóäåì õðàíèòü wmi-çàïðîñ
32		39
33	signals:	40	signals:
34		41
35	public slots:	42	public slots:
36	void readStandartProcessOutput();	43	void readStandartProcessOutput();
37	void readStandartProcessError();	44	void readStandartProcessError();
38		45
39	private slots:	46	private slots:
40		47
41		48
42		49
43	};	50	};
44		51
45	#endif // WMITHREAD_H	52	#endif // WMITHREAD_H
46		53

Хранилища Subversion OpenInventory

(root)/trunk/DBViewer/wmithread.h @ 256 - Редакция 241 → 242