diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-12-31 08:41:16 +0100 | 
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-12-31 08:42:33 +0100 | 
| commit | d1e0537f704ea67483ccbdf7461e636490aba0cf (patch) | |
| tree | 6b965181a903a6f1fba1d9415b7fe634bbf27451 /ftnoir_tracker_joystick | |
| parent | 54892e5f6a15c1ce0aba364039174eda3d1a6b8b (diff) | |
meta: get rid of Initialize(), now RAII
Diffstat (limited to 'ftnoir_tracker_joystick')
| -rw-r--r-- | ftnoir_tracker_joystick/ftnoir_tracker_joystick.h | 6 | ||||
| -rw-r--r-- | ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp | 18 | 
2 files changed, 1 insertions, 23 deletions
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h index 9c856d85..67291e6f 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h @@ -62,11 +62,7 @@ class TrackerControls: public QWidget, public ITrackerDialog  {      Q_OBJECT  public: -	explicit TrackerControls(); -    ~TrackerControls(); -    void showEvent (QShowEvent *); - -    void Initialize(QWidget *parent); +    TrackerControls();      void registerTracker(ITracker *foo) {          tracker = dynamic_cast<FTNoIR_Tracker*>(foo);      } diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp index af3613d9..42ca8689 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp @@ -50,29 +50,11 @@ fin:  	loadSettings();  } -// -// Destructor for server-dialog -// -TrackerControls::~TrackerControls() { -} - -void TrackerControls::Initialize(QWidget *parent) { -	QPoint offsetpos(100, 100); -	if (parent) { -		this->move(parent->pos() + offsetpos); -	} -	show(); -} -  void TrackerControls::doOK() {  	save();  	this->close();  } -void TrackerControls::showEvent ( QShowEvent * ) { -	loadSettings(); -} -  void TrackerControls::doCancel() {  	if (settingsDirty) {  		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );  | 
