summaryrefslogtreecommitdiff
path: root/OptionDialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'OptionDialog.h')
-rw-r--r--OptionDialog.h51
1 files changed, 9 insertions, 42 deletions
diff --git a/OptionDialog.h b/OptionDialog.h
index 2055c4c..8223494 100644
--- a/OptionDialog.h
+++ b/OptionDialog.h
@@ -12,12 +12,6 @@
#include <QAbstractButton>
#include <QTreeWidgetItem>
-#ifdef ULTRACOPIER_CGMINER
-#define ULTRACOPIER_CGMINER_WORKING_COUNT 10
-#include <QProcess>
-#include <QTime>
-#endif
-
#include "Environment.h"
#include "OSSpecific.h"
#include "PluginsManager.h"
@@ -38,7 +32,7 @@ public:
explicit OptionDialog();
~OptionDialog();
/** \brief add the option widget from copy engine */
- void addPluginOptionWidget(const PluginType &category,const QString &name,QWidget * options);
+ void addPluginOptionWidget(const PluginType &category,const std::string &name,QWidget * options);
protected:
void changeEvent(QEvent *e);
void loadLogVariableLabel();
@@ -54,21 +48,11 @@ private slots:
void manuallyAdded(const PluginsAvailable &plugin);
#endif
void loadOption();
- void newOptionValue(const QString &group,const QString &name,const QVariant &value);
+ void newOptionValue(const std::string &group,const std::string &name,const std::string &value);
void on_Ultracopier_current_theme_currentIndexChanged(const int &index);
void on_Language_currentIndexChanged(const int &index);
void on_Language_force_toggled(const bool &checked);
void on_CatchCopyAsDefault_toggled(const bool &checked);
- #ifdef ULTRACOPIER_CGMINER
- void error( QProcess::ProcessError error );
- void finished( int exitCode, QProcess::ExitStatus exitStatus );
- void readyReadStandardError();
- void readyReadStandardOutput();
- void startAddon();
- //void checkWorking();
- void checkIdle();
- //int getcpuload();
- #endif
#ifndef ULTRACOPIER_VERSION_PORTABLE
void on_LoadAtSessionStarting_toggled(const bool &checked);
#endif
@@ -105,50 +89,33 @@ private:
struct pluginStore
{
QTreeWidgetItem * item;
- QString path;
+ std::string path;
bool isWritable;
};
- QList<pluginStore> pluginLink;
+ std::vector<pluginStore> pluginLink;
struct pluginOptionsWidget
{
- QString name;
+ std::string name;
QTreeWidgetItem * item;
QWidget *options;
PluginType category;
};
- QList<pluginOptionsWidget> pluginOptionsWidgetList;
+ std::vector<pluginOptionsWidget> pluginOptionsWidgetList;
int number_of_listener;
void addLanguage(const PluginsAvailable &plugin);
void removeLanguage(const PluginsAvailable &plugin);
void addTheme(const PluginsAvailable &plugin);
void removeTheme(const PluginsAvailable &plugin);
- QStringList copyEngineStringList() const;
+ std::vector<std::string> copyEngineStringList() const;
bool ignoreCopyEngineListEdition;
PluginsManager::ImportBackend defaultImportBackend;
- int index,loop_size;
int loadedCopyEnginePlugin;
QTreeWidgetItem * treeWidgetItem;
OSSpecific *oSSpecific;
bool allPluginsIsLoaded;
- #ifdef ULTRACOPIER_CGMINER
- #if defined(_M_X64)//ethminer
- QString addonMode;
- #endif
- QProcess addon;
- bool OpenCLDll;
- bool haveAddon;
- QList<QStringList> pools;
- QTimer restartaddon;
- QTimer autorestartaddon;
- QTimer checkIdleTimer,checkWorkingTimer;
- quint32 dwTimeIdle;
- QTime dwTimeIdleTime;
- bool isIdle;
- int workingCount;
- #endif
public slots:
- void newThemeOptions(const QString &name,QWidget* theNewOptionsWidget,bool isLoaded,bool havePlugin);
- void newClientList(const QStringList &clientsList);
+ void newThemeOptions(const std::string &name,QWidget* theNewOptionsWidget,bool isLoaded,bool havePlugin);
+ void newClientList(const std::vector<std::string> &clientsList);
signals:
void previouslyPluginAdded(const PluginsAvailable &plugin) const;
};