Diffstat (limited to 'noncore/net/opietooth/manager/scandialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index f8f7b15..ec8df82 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp | |||
@@ -90,6 +90,7 @@ namespace OpieTooth { | |||
90 | 90 | ||
91 | connect( (QObject*)StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); | 91 | connect( StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); |
92 | connect( (QObject*)StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); | 92 | connect( StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); |
93 | connect( (QObject*)localDevice, SIGNAL( foundDevices( const QString& , RemoteDevices::ValueList ) ), | 93 | connect( localDevice, SIGNAL( foundDevices( const QString& , RemoteDevice::ValueList ) ), |
94 | this, SLOT(fillList(const QString& , RemoteDevices::ValueList ) ) ) ; | 94 | this, SLOT(fillList(const QString& , RemoteDevice::ValueList ) ) ) ; |
95 | // connect( this, SIGNAL( accept() ), this, SLOT( emitToManager() )); | ||
95 | progressStat = 0; | 96 | progressStat = 0; |
@@ -108,2 +109,8 @@ namespace OpieTooth { | |||
108 | 109 | ||
110 | void ScanDialog::accept() { | ||
111 | emitToManager(); | ||
112 | QDialog::accept(); | ||
113 | } | ||
114 | |||
115 | |||
109 | void ScanDialog::startSearch() { | 116 | void ScanDialog::startSearch() { |
@@ -128,2 +135,3 @@ namespace OpieTooth { | |||
128 | 135 | ||
136 | qDebug("fill List"); | ||
129 | QCheckListItem * deviceItem; | 137 | QCheckListItem * deviceItem; |
@@ -133,3 +141,3 @@ namespace OpieTooth { | |||
133 | 141 | ||
134 | deviceItem = new QCheckListItem( ListView1, (*it).name() ); | 142 | deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox ); |
135 | deviceItem->setText(1, (*it).mac() ); | 143 | deviceItem->setText(1, (*it).mac() ); |
@@ -143,2 +151,3 @@ namespace OpieTooth { | |||
143 | void ScanDialog::emitToManager() { | 151 | void ScanDialog::emitToManager() { |
152 | qDebug("vor liste durchsuchen"); | ||
144 | 153 | ||
@@ -158,2 +167,3 @@ namespace OpieTooth { | |||
158 | } | 167 | } |
168 | qDebug("vor emit"); | ||
159 | emit selectedDevices( *deviceList ); | 169 | emit selectedDevices( *deviceList ); |
@@ -166,3 +176,2 @@ namespace OpieTooth { | |||
166 | ScanDialog::~ScanDialog() { | 176 | ScanDialog::~ScanDialog() { |
167 | emitToManager(); | ||
168 | delete localDevice; | 177 | delete localDevice; |