author | llornkcor <llornkcor> | 2002-05-06 20:48:13 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-06 20:48:13 (UTC) |
commit | 24259e7b1446f671861b86ee1abb5d8021b98387 (patch) (unidiff) | |
tree | 2bbc06dbc590ba5cc5f5dd0e56025b07c9fa729b /noncore/settings/tabmanager/tabmanager.cpp | |
parent | d1dd3ae2eb11a9c6e83eaad817a6f84a53d68691 (diff) | |
download | opie-24259e7b1446f671861b86ee1abb5d8021b98387.zip opie-24259e7b1446f671861b86ee1abb5d8021b98387.tar.gz opie-24259e7b1446f671861b86ee1abb5d8021b98387.tar.bz2 |
fix for rmdir crash
Diffstat (limited to 'noncore/settings/tabmanager/tabmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/tabmanager/tabmanager.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/noncore/settings/tabmanager/tabmanager.cpp b/noncore/settings/tabmanager/tabmanager.cpp index af76251..f54c837 100644 --- a/noncore/settings/tabmanager/tabmanager.cpp +++ b/noncore/settings/tabmanager/tabmanager.cpp | |||
@@ -56,13 +56,13 @@ | |||
56 | * and tabs | 56 | * and tabs |
57 | */ | 57 | */ |
58 | TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false){ | 58 | TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false){ |
59 | rescanFolder(HOME_APP_DIR); | 59 | rescanFolder(HOME_APP_DIR); |
60 | 60 | ||
61 | // Connect the signals and slots | 61 | // Connect the signals and slots |
62 | connect(tabList, SIGNAL(doubleClicked(QListViewItem *)), | 62 | connect(tabList, SIGNAL(doubleClicked(QListViewItem *)), |
63 | this, SLOT(editItem(QListViewItem*))); | 63 | this, SLOT(editItem(QListViewItem*))); |
64 | (tabList->header())->hide(); | 64 | (tabList->header())->hide(); |
65 | connect(tabList, SIGNAL(moveItem(QListViewItem *, QListViewItem *)), | 65 | connect(tabList, SIGNAL(moveItem(QListViewItem *, QListViewItem *)), |
66 | this, SLOT(moveApplication(QListViewItem *, QListViewItem *))); | 66 | this, SLOT(moveApplication(QListViewItem *, QListViewItem *))); |
67 | } | 67 | } |
68 | 68 | ||
@@ -202,13 +202,13 @@ void TabManager::newApplication(){ | |||
202 | void TabManager::removeItem(){ | 202 | void TabManager::removeItem(){ |
203 | // Make sure we can delete | 203 | // Make sure we can delete |
204 | QListViewItem *item = tabList->currentItem(); | 204 | QListViewItem *item = tabList->currentItem(); |
205 | if(!item) | 205 | if(!item) |
206 | return; | 206 | return; |
207 | if(item->childCount() > 0){ | 207 | if(item->childCount() > 0){ |
208 | QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), | 208 | QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), |
209 | tr("Ok") ); | 209 | tr("Ok") ); |
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | 212 | ||
213 | // Prompt. | 213 | // Prompt. |
214 | int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"), | 214 | int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"), |
@@ -226,18 +226,21 @@ void TabManager::removeItem(){ | |||
226 | if(item->parent() == NULL){ | 226 | if(item->parent() == NULL){ |
227 | // Remove .directory file string | 227 | // Remove .directory file string |
228 | location = location.mid(0,location.length()-10); | 228 | location = location.mid(0,location.length()-10); |
229 | QDir dir; | 229 | QDir dir; |
230 | if(!dir.rmdir(location)) | 230 | if(!dir.rmdir(location)) |
231 | removeSuccessfull = false; | 231 | removeSuccessfull = false; |
232 | else | ||
233 | removeSuccessfull = true; | ||
234 | |||
232 | } | 235 | } |
233 | 236 | ||
234 | // If removing failed. | 237 | // If removing failed. |
235 | if(!removeSuccessfull){ | 238 | if(!removeSuccessfull){ |
236 | qDebug((QString("removeItem: ") + location).latin1()); | 239 | qDebug((QString("removeItem: ") + location).latin1()); |
237 | QMessageBox::critical(this, tr("Message"), tr("Can't remove."), | 240 | QMessageBox::critical(this, tr("Message"), tr("Can't remove."), |
238 | tr("Ok") ); | 241 | tr("Ok") ); |
239 | return; | 242 | return; |
240 | } | 243 | } |
241 | 244 | ||
242 | // Remove from the installer so it wont fail. | 245 | // Remove from the installer so it wont fail. |
243 | // Don't need to do this sense the current install uses rm -f so no error | 246 | // Don't need to do this sense the current install uses rm -f so no error |
@@ -367,13 +370,13 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){ | |||
367 | desktopFile = desktopFile.mid(slash, desktopFile.length()); | 370 | desktopFile = desktopFile.mid(slash, desktopFile.length()); |
368 | newFolder = newFolder + desktopFile; | 371 | newFolder = newFolder + desktopFile; |
369 | 372 | ||
370 | // Move file | 373 | // Move file |
371 | QDir r; | 374 | QDir r; |
372 | if(!r.rename(itemList[item], newFolder)){ | 375 | if(!r.rename(itemList[item], newFolder)){ |
373 | QMessageBox::critical(this, tr("Message"), tr("Can't move application."), | 376 | QMessageBox::critical(this, tr("Message"), tr("Can't move application."), |
374 | tr("Ok") ); | 377 | tr("Ok") ); |
375 | return; | 378 | return; |
376 | } | 379 | } |
377 | //qDebug((QString("moveApplication: ") + itemList[item]).latin1()); | 380 | //qDebug((QString("moveApplication: ") + itemList[item]).latin1()); |
378 | //qDebug((QString("moveApplication: ") + newFolder).latin1()); | 381 | //qDebug((QString("moveApplication: ") + newFolder).latin1()); |
379 | 382 | ||