summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-09-25 06:18:09 (UTC)
committer llornkcor <llornkcor>2004-09-25 06:18:09 (UTC)
commitc47a2d0e8ec283737f7c43474be4cf8070cde046 (patch) (unidiff)
tree3555656a8cc575c04432894eccbd7d4514560365
parent0671201a4527973c41adad5f5681938da7f1f824 (diff)
downloadopie-c47a2d0e8ec283737f7c43474be4cf8070cde046.zip
opie-c47a2d0e8ec283737f7c43474be4cf8070cde046.tar.gz
opie-c47a2d0e8ec283737f7c43474be4cf8070cde046.tar.bz2
remove
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp7
-rw-r--r--noncore/apps/advancedfm/advancedfm.h1
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp2
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp12
4 files changed, 4 insertions, 18 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9721f84..6f017b4 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -321,13 +321,6 @@ void AdvancedFm::fillCombo(const QString &currentPath) {
321 } 321 }
322} 322}
323 323
324void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
325 chdir( currentPath.latin1() );
326 CurrentDir()->cd( currentPath, TRUE);
327 populateView();
328 update();
329}
330
331QStringList AdvancedFm::getPath() { 324QStringList AdvancedFm::getPath() {
332 QStringList strList; 325 QStringList strList;
333 QListView *thisView=CurrentView(); 326 QListView *thisView=CurrentView();
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 00ab909..6f7eb96 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -153,7 +153,6 @@ protected slots:
153 void move(); 153 void move();
154 void moveTimer(); 154 void moveTimer();
155 155
156 void currentPathComboActivated(const QString &);
157 void fillCombo(const QString &); 156 void fillCombo(const QString &);
158 bool copyFile( const QString & , const QString & ); 157 bool copyFile( const QString & , const QString & );
159 void fileStatus(); 158 void fileStatus();
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index fe565a0..1047c5a 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -255,7 +255,7 @@ void AdvancedFm::initConnections()
255 connect( cdUpButton ,SIGNAL(released()), this,SLOT( upDir()) ); 255 connect( cdUpButton ,SIGNAL(released()), this,SLOT( upDir()) );
256 connect( docButton,SIGNAL(released()), this,SLOT( docButtonPushed()) ); 256 connect( docButton,SIGNAL(released()), this,SLOT( docButtonPushed()) );
257 connect( homeButton,SIGNAL(released()), this,SLOT( homeButtonPushed()) ); 257 connect( homeButton,SIGNAL(released()), this,SLOT( homeButtonPushed()) );
258 connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( currentPathComboActivated(const QString&) ) ); 258 connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( changeTo(const QString&) ) );
259 259
260 connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), this,SLOT(currentPathComboChanged())); 260 connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), this,SLOT(currentPathComboChanged()));
261 261
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 706658e..7b3dcf6 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -259,16 +259,10 @@ void AdvancedFm::doProperties() {
259} 259}
260 260
261void AdvancedFm::upDir() { 261void AdvancedFm::upDir() {
262 QDir *thisDir = CurrentDir();
263 QString current = thisDir->canonicalPath();
264 QDir dir(current);
265 dir.cdUp();
266 current = dir.canonicalPath();
267 chdir( current.latin1() );
268 thisDir->cd( current, TRUE);
269 262
270 populateView(); 263 QDir dir( CurrentDir()->canonicalPath());
271 update(); 264 dir.cdUp();
265 changeTo(dir.canonicalPath());
272} 266}
273 267
274void AdvancedFm::copyTimer() { 268void AdvancedFm::copyTimer() {