AdvancedFM: libopie->libopie2

10 files changed, 209 insertions, 222 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9c13e53..5148172 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -13,10 +13,4 @@
 #include "advancedfm.h"
 
-
-//  #include <opie/ofileselector.h>
-//  #include <opie/ofiledialog.h>
-
-#include <opie/osplitter.h>
-
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -109,111 +103,111 @@ void AdvancedFm::populateView() {
 
 // qWarning("PopulateView");
-		QPixmap pm;
-		QListView *thisView = CurrentView();
-		QDir *thisDir = CurrentDir();
-		QString path = thisDir->canonicalPath();
+        QPixmap pm;
+        QListView *thisView = CurrentView();
+        QDir *thisDir = CurrentDir();
+        QString path = thisDir->canonicalPath();
 
 //qWarning("path is "+path);
-		thisView->clear();
-		thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
-		thisDir->setMatchAllDirs(TRUE);
-		thisDir->setNameFilter(filterStr);
-		QString fileL, fileS, fileDate;
-		QString fs= getFileSystemType((const QString &) path);
-		setCaption(tr("AdvancedFm :: ")+fs+" :: "
-							 +checkDiskSpace((const QString &) path)+ tr(" kB free") );
-		bool isDir=FALSE;
-		const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
-		QFileInfoListIterator it(*list);
-		QFileInfo *fi;
-		while ( (fi=it.current()) ) {
-				if (fi->isSymLink() )  {
-						QString symLink=fi->readLink();
-						QFileInfo sym( symLink);
-						fileS.sprintf( "%10i", sym.size() );
-						fileL =  fi->fileName() +" ->  " + sym.filePath().data();
-						fileDate = sym.lastModified().toString();
-				}  else  {
-						fileS.sprintf( "%10i", fi->size() );
-						fileL = fi->fileName();
-						fileDate= fi->lastModified().toString();
-						if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
+        thisView->clear();
+        thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
+        thisDir->setMatchAllDirs(TRUE);
+        thisDir->setNameFilter(filterStr);
+        QString fileL, fileS, fileDate;
+        QString fs= getFileSystemType((const QString &) path);
+        setCaption(tr("AdvancedFm :: ")+fs+" :: "
+                             +checkDiskSpace((const QString &) path)+ tr(" kB free") );
+        bool isDir=FALSE;
+        const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
+        QFileInfoListIterator it(*list);
+        QFileInfo *fi;
+        while ( (fi=it.current()) ) {
+                if (fi->isSymLink() )  {
+                        QString symLink=fi->readLink();
+                        QFileInfo sym( symLink);
+                        fileS.sprintf( "%10i", sym.size() );
+                        fileL =  fi->fileName() +" ->  " + sym.filePath().data();
+                        fileDate = sym.lastModified().toString();
+                }  else  {
+                        fileS.sprintf( "%10i", fi->size() );
+                        fileL = fi->fileName();
+                        fileDate= fi->lastModified().toString();
+                        if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
 //           if(fileL == "..")
-								fileL += "/";
-								isDir=TRUE;
-						}
-				}
-				QFileInfo fileInfo(  path + "/" + fileL);
-
-				if(fileL !="./" && fi->exists())  {
-						item = new QListViewItem( thisView, fileL, fileS , fileDate);
-
-						if(isDir || fileL.find("/",0,TRUE) != -1) {
-
-								if( !QDir( fi->filePath() ).isReadable()) //is directory
-										pm = Resource::loadPixmap( "lockedfolder" );
-								else
-										pm= Resource::loadPixmap( "folder" );
-						}
-						else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-								pm = Resource::loadPixmap( "exec");
-						}
-						else if( (fileInfo.permission( QFileInfo::ExeUser)
-											| fileInfo.permission( QFileInfo::ExeGroup)
-											| fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
-								pm = Resource::loadPixmap( "exec");
-						}
-						else if( !fi->isReadable() )  {
-								pm = Resource::loadPixmap( "locked" );
-						}
-						else { //everything else goes by mimetype
-								MimeType mt(fi->filePath());
-								pm=mt.pixmap(); //sets the correct pixmap for mimetype
-								if(pm.isNull()) {
-										pm = unknownXpm;
-								}
-						}
-						if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
-									//  qDebug(" overlay link image");
-								pm= Resource::loadPixmap( "advancedfm/symlink" );
-									//              pm= Resource::loadPixmap( "folder" );
+                                fileL += "/";
+                                isDir=TRUE;
+                        }
+                }
+                QFileInfo fileInfo(  path + "/" + fileL);
+
+                if(fileL !="./" && fi->exists())  {
+                        item = new QListViewItem( thisView, fileL, fileS , fileDate);
+
+                        if(isDir || fileL.find("/",0,TRUE) != -1) {
+
+                                if( !QDir( fi->filePath() ).isReadable()) //is directory
+                                        pm = Resource::loadPixmap( "lockedfolder" );
+                                else
+                                        pm= Resource::loadPixmap( "folder" );
+                        }
+                        else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                                pm = Resource::loadPixmap( "exec");
+                        }
+                        else if( (fileInfo.permission( QFileInfo::ExeUser)
+                                            | fileInfo.permission( QFileInfo::ExeGroup)
+                                            | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+                                pm = Resource::loadPixmap( "exec");
+                        }
+                        else if( !fi->isReadable() )  {
+                                pm = Resource::loadPixmap( "locked" );
+                        }
+                        else { //everything else goes by mimetype
+                                MimeType mt(fi->filePath());
+                                pm=mt.pixmap(); //sets the correct pixmap for mimetype
+                                if(pm.isNull()) {
+                                        pm = unknownXpm;
+                                }
+                        }
+                        if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
+                                    //  qDebug(" overlay link image");
+                                pm= Resource::loadPixmap( "advancedfm/symlink" );
+                                    //              pm= Resource::loadPixmap( "folder" );
 //                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
 //                QPainter painter( &pm );
 //                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
 //                pm.setMask( pm.createHeuristicMask( FALSE ) );
-						}
-						item->setPixmap( 0,pm);
-
-				}
-				isDir=FALSE;
-				++it;
-		}
-
-		if( path.find("dev",0,TRUE) != -1) {
-				struct stat buf;
-				dev_t devT;
-				DIR *dir;
-				struct dirent *mydirent;
-
-				if((dir = opendir( path.latin1())) != NULL)
-						while ((mydirent = readdir(dir)) != NULL) {
-								lstat( mydirent->d_name, &buf);
+                        }
+                        item->setPixmap( 0,pm);
+
+                }
+                isDir=FALSE;
+                ++it;
+        }
+
+        if( path.find("dev",0,TRUE) != -1) {
+                struct stat buf;
+                dev_t devT;
+                DIR *dir;
+                struct dirent *mydirent;
+
+                if((dir = opendir( path.latin1())) != NULL)
+                        while ((mydirent = readdir(dir)) != NULL) {
+                                lstat( mydirent->d_name, &buf);
 //        qDebug(mydirent->d_name);
-								fileL.sprintf("%s", mydirent->d_name);
-								devT = buf.st_dev;
-								fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
-								fileDate.sprintf("%s", ctime( &buf.st_mtime));
-								if( fileL.find(".") == -1 ) {
-										item= new QListViewItem( thisView, fileL, fileS, fileDate);
-										pm = unknownXpm;
-										item->setPixmap( 0,pm);
-								}
-						}
+                                fileL.sprintf("%s", mydirent->d_name);
+                                devT = buf.st_dev;
+                                fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
+                                fileDate.sprintf("%s", ctime( &buf.st_mtime));
+                                if( fileL.find(".") == -1 ) {
+                                        item= new QListViewItem( thisView, fileL, fileS, fileDate);
+                                        pm = unknownXpm;
+                                        item->setPixmap( 0,pm);
+                                }
+                        }
 
-				closedir(dir);
-		}
+                closedir(dir);
+        }
 
-		thisView->setSorting( 3,FALSE);
-		fillCombo( (const QString &) path );
+        thisView->setSorting( 3,FALSE);
+        fillCombo( (const QString &) path );
 }
 
@@ -784,5 +778,5 @@ void AdvancedFm::gotoCustomDir(const QString &dir) {
 
 QDir *AdvancedFm::CurrentDir() {
-   
+
    if ( whichTab == 1) {
       return &currentDir;
@@ -825,5 +819,5 @@ void AdvancedFm::setOtherTabCurrent() {
    }
    OtherView()->setFocus();
-   OtherView()->setSelected( CurrentView()->firstChild(), true);      
+   OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 
@@ -865,5 +859,5 @@ void AdvancedFm::gotoDirectory(const QString &file) {
       findFile(file);
    }
-  
+
 }
 
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index bfefa77..547fa7c 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -15,6 +15,6 @@
 #define QT_QWS_OPIE
 
-//#include <opie/otabwidget.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
+#include <opie2/osplitter.h>
 
 #include <qpe/ir.h>
@@ -31,5 +31,6 @@
 #include <qpixmap.h>
 
-class OSplitter;
+using Opie::OSplitter;
+
 class QVBoxLayout;
 class QHBoxLayout;
@@ -41,5 +42,4 @@ class QLabel;
 class QProgressBar;
 class QSpinBox;
-class QTabWidget;
 class QWidget;
 class QPopupMenu;
@@ -162,5 +162,5 @@ protected slots:
    bool copyDirectory( const QString & , const QString & );
 //   void navigateToSelected();
-   bool moveDirectory( const QString & , const QString & );	 
+   bool moveDirectory( const QString & , const QString & );
 //   void slotSwitchtoLocal(int);
 
@@ -187,5 +187,5 @@ private slots:
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
-   
+
 };
 
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 70db018..ca9856b 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -7,10 +7,10 @@ TARGET    = advancedfm
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2 -lopieui2
 
 TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
-	 ../../../i18n/nl/advancedfm.ts \
-	 ../../../i18n/da/advancedfm.ts \
-	 ../../../i18n/xx/advancedfm.ts \
+     ../../../i18n/nl/advancedfm.ts \
+     ../../../i18n/da/advancedfm.ts \
+     ../../../i18n/xx/advancedfm.ts \
    ../../../i18n/en/advancedfm.ts \
    ../../../i18n/es/advancedfm.ts \
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
 
 
-!contains(CONFIG,quick-app) {	
+!contains(CONFIG,quick-app) {
  DESTDIR = $(OPIEDIR)/bin
  DEFINES += NOQUICKLAUNCH
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index ddaa39a..763ae34 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -12,7 +12,5 @@
 #include "advancedfm.h"
 
-#include <opie/osplitter.h>
 #include <qpe/storage.h>
-
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
@@ -130,5 +128,5 @@ void AdvancedFm::init() {
   currentPathCombo->setEditable(TRUE);
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
-  currentPathCombo->setFocusPolicy(NoFocus);  
+  currentPathCombo->setFocusPolicy(NoFocus);
   layout->addWidget( lineBox );
 
@@ -154,5 +152,5 @@ void AdvancedFm::init() {
   Local_View->setFocusPolicy(StrongFocus);
   Local_View->installEventFilter( this );
- 
+
   QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
@@ -178,5 +176,5 @@ void AdvancedFm::init() {
   Remote_View->setFocusPolicy(StrongFocus);
   Remote_View->installEventFilter( this );
- 
+
   QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
@@ -212,5 +210,5 @@ void AdvancedFm::init() {
     if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
           zaurusDevice=TRUE;
-    else 
+    else
           zaurusDevice=FALSE;
 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 78f9da2..18bbd43 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -14,7 +14,4 @@
 #include "filePermissions.h"

 

-#include <opie/otabwidget.h>

-#include <opie/oprocess.h>

-

 #include <qpe/lnkproperties.h>

 #include <qpe/qpeapplication.h>

@@ -70,5 +67,5 @@ void AdvancedFm::showMenuHidden() {
     }

      b = !b;

-		 populateView();

+         populateView();

 }

 

@@ -81,5 +78,5 @@ void AdvancedFm::showHidden() {
       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

     }

-		 populateView();

+         populateView();

 }

 

@@ -147,5 +144,5 @@ void AdvancedFm::makeDir() {
       thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);

   }

-	populateView();

+    populateView();

 }

 

@@ -184,5 +181,5 @@ void AdvancedFm::doDelete() {
             //if file is a directory

 

-            switch ( QMessageBox::warning( this, tr("Delete Directory?"), 

+            switch ( QMessageBox::warning( this, tr("Delete Directory?"),

                                            tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,

                                            tr("Yes"), tr("No"), 0, 0, 1) ) {

@@ -192,5 +189,5 @@ void AdvancedFm::doDelete() {
                QString cmd="rm -rf "+f;

                startProcess( (const QString)cmd.latin1() );

-							 populateView();

+                             populateView();

             }

             break;

@@ -210,5 +207,5 @@ void AdvancedFm::doDelete() {
                };

             }

-      

+

             QString cmd="rm "+f;

             QFile file(f);

@@ -216,5 +213,5 @@ void AdvancedFm::doDelete() {
             if( fi.fileName().find("../",0,TRUE)==-1) {

 //               qDebug("remove link files "+myFile);

-               

+

 //               DocLnk lnk(f);

                  DocLnk *lnk;

@@ -229,5 +226,5 @@ void AdvancedFm::doDelete() {
       }

    }

-	populateView();

+    populateView();

 }

 

@@ -245,5 +242,5 @@ void AdvancedFm::filePerms() {
          delete  filePerm;

    }

-	populateView();

+    populateView();

 }

 

@@ -277,5 +274,5 @@ void AdvancedFm::upDir() {
   thisDir->cd(  current, TRUE);

 

-	populateView();

+    populateView();

   update();

 }

@@ -338,6 +335,6 @@ void AdvancedFm::copy() {
          }

       }

-			setOtherTabCurrent();

-			rePopulate();

+            setOtherTabCurrent();

+            rePopulate();

    }

 }

@@ -388,6 +385,6 @@ void AdvancedFm::copyAs() {
 

    }

-			rePopulate();

-			setOtherTabCurrent();

+            rePopulate();

+            setOtherTabCurrent();

 }

 

@@ -437,5 +434,5 @@ void AdvancedFm::copySameDir() {
       delete fileDlg;

     }

-			rePopulate();

+            rePopulate();

 }

 

@@ -460,78 +457,78 @@ void AdvancedFm::move() {
           curFile = thisDir->canonicalPath();

           if(curFile.right(1).find("/",0,TRUE) == -1)

-							curFile +="/";

+                            curFile +="/";

           curFile+= item;

 //          qDebug("CurrentFile file is " + curFile);

 

           if(QFileInfo(curFile).isDir()) {

-							moveDirectory( curFile, destFile );

-							rePopulate();

-							return;

+                            moveDirectory( curFile, destFile );

+                            rePopulate();

+                            return;

           }

 

-					QFile f( curFile);

+                    QFile f( curFile);

           if( f.exists()) {

-							if( !copyFile(  curFile, destFile) )  {

-									QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);

-									return;

+                            if( !copyFile(  curFile, destFile) )  {

+                                    QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);

+                                    return;

               } else

-									QFile::remove(curFile);

+                                    QFile::remove(curFile);

           }

-			}

+            }

 

   }

-			rePopulate();

-			setOtherTabCurrent();

+            rePopulate();

+            setOtherTabCurrent();

 }

 

 bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {

-		int err = 0;

-		if( copyDirectory( src, dest ) ) {      QString cmd = "rm -rf " + src;

-		err = system((const char*)cmd);

-		} else

-				err = -1;

-   

-		if(err!=0) {

-				QMessageBox::message(tr("Note"),tr("Could not move\n") + src);

-				return false;

-		}

-		return true;

+        int err = 0;

+        if( copyDirectory( src, dest ) ) {      QString cmd = "rm -rf " + src;

+        err = system((const char*)cmd);

+        } else

+                err = -1;

+

+        if(err!=0) {

+                QMessageBox::message(tr("Note"),tr("Could not move\n") + src);

+                return false;

+        }

+        return true;

 }

 

 bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {

 

-		QString	cmd = "/bin/cp -fpR " + src + " " + dest;

+        QString    cmd = "/bin/cp -fpR " + src + " " + dest;

     qWarning(cmd);

-		int	err = system( (const char *) cmd );

-		if ( err != 0 ) {

-				QMessageBox::message("AdvancedFm",

-														 tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );

-				return false;

-		}

+        int    err = system( (const char *) cmd );

+        if ( err != 0 ) {

+                QMessageBox::message("AdvancedFm",

+                                                         tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );

+                return false;

+        }

 

-		return true;

+        return true;

 }

- 

+

 

 bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {

 

-		

-		if(QFileInfo(src).isDir()) {

-				if( copyDirectory( src, dest )) {

-						setOtherTabCurrent();

-						populateView();

-						return true;

-				}

-				else

-						return false;

-		}

-

-

-		bool success = true;

-		struct stat status;

-		QFile srcFile(src);

-		QFile destFile(dest);

-		int err=0;   

-		int read_fd=0;

+

+        if(QFileInfo(src).isDir()) {

+                if( copyDirectory( src, dest )) {

+                        setOtherTabCurrent();

+                        populateView();

+                        return true;

+                }

+                else

+                        return false;

+        }

+

+

+        bool success = true;

+        struct stat status;

+        QFile srcFile(src);

+        QFile destFile(dest);

+        int err=0;

+        int read_fd=0;

    int write_fd=0;

    struct stat stat_buf;

@@ -548,5 +545,5 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
        return success = false;

       }

-      write_fd = destFile.handle(); 

+      write_fd = destFile.handle();

       if(write_fd != -1) {

          err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);

@@ -678,7 +675,7 @@ void AdvancedFm::mkSym() {
           startProcess( (const QString)cmd );

         }

-			rePopulate();

-			setOtherTabCurrent();

-	}

+            rePopulate();

+            setOtherTabCurrent();

+    }

 }

 

@@ -732,5 +729,5 @@ void AdvancedFm::startProcess(const QString & cmd) {
 

 void AdvancedFm::processEnded(OProcess *) {

-			rePopulate();

+            rePopulate();

 }

 

@@ -798,5 +795,5 @@ void AdvancedFm::doRename(QListView * view) {
     r.setX( view->contentsX() );

 

-		if ( r.width() > view->visibleWidth() )

+        if ( r.width() > view->visibleWidth() )

         r.setWidth( view->visibleWidth() );

 

@@ -811,9 +808,9 @@ void AdvancedFm::doRename(QListView * view) {
     view->addChild( renameBox, r.x(), r.y() );

 

-		renameBox->resize( r.size() );

+        renameBox->resize( r.size() );

 

-		view->viewport()->setFocusProxy( renameBox );

+        view->viewport()->setFocusProxy( renameBox );

 

-		renameBox->setFocus();

+        renameBox->setFocus();

     renameBox->show();

 }

@@ -821,7 +818,7 @@ void AdvancedFm::doRename(QListView * view) {
 

 void AdvancedFm::renameIt() {

-		if( !CurrentView()->currentItem()) return;

+        if( !CurrentView()->currentItem()) return;

 

-		QListView *thisView = CurrentView();

+        QListView *thisView = CurrentView();

     oldName = thisView->currentItem()->text(0);

     doRename( thisView );

@@ -832,6 +829,6 @@ void AdvancedFm::okRename() {
 

    QString newName = renameBox->text();

-	 cancelRename();

-	 QListView * view = CurrentView();

+     cancelRename();

+     QListView * view = CurrentView();

    QString path =  CurrentDir()->canonicalPath() + "/";

    oldName = path + oldName;

@@ -843,5 +840,5 @@ void AdvancedFm::okRename() {
    view->takeItem( view->currentItem() );

    delete view->currentItem();

-	 rePopulate();

+     rePopulate();

 }

 

diff --git a/noncore/apps/advancedfm/config.in b/noncore/apps/advancedfm/config.in
index 72a1f1b..0ba1487 100644
--- a/noncore/apps/advancedfm/config.in
+++ b/noncore/apps/advancedfm/config.in
@@ -2,3 +2,3 @@
     boolean "opie-advancedfm (advanced file manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index 51e38dc..3c1a164 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -11,11 +11,11 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#include <qpe/qpeapplication.h>
-
-
 
 #include "advancedfm.h"
 
 #ifdef NOQUICKLAUNCH
+
+#include <qpe/qpeapplication.h>
+
 int main(int argc, char *argv[])
 {
@@ -27,5 +27,5 @@ int main(int argc, char *argv[])
 }
 #else
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index 5bab6ab..bb311c1 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -5,5 +5,5 @@ Section: opie/applications
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Description: Advanced File Manager
  The advanced file manager for the Opie environment.
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 33abdfc..7dc2416 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -6,6 +6,4 @@
 #include "output.h"
 
-#include <opie/oprocess.h>
-
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
diff --git a/noncore/apps/advancedfm/output.h b/noncore/apps/advancedfm/output.h
index 199a684..26c0fa0 100644
--- a/noncore/apps/advancedfm/output.h
+++ b/noncore/apps/advancedfm/output.h
@@ -17,13 +17,13 @@
 #include <qwhatsthis.h>
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
+class QVBoxLayout;
+class QHBoxLayout;
+class QGridLayout;
 class QMultiLineEdit;
 
 class Output : public QDialog
-{ 
+{
     Q_OBJECT
 
@@ -45,9 +45,9 @@ protected slots:
   private:
     QString cmmd;
-    
+
 };
 
 class InputDialog : public QDialog
-{ 
+{
     Q_OBJECT
 
@@ -57,8 +57,8 @@ public:
     QString inputText;
     QLineEdit* LineEdit1;
-  void setInputText(const QString &); 
+  void setInputText(const QString &);
 private slots:
     void returned();
-    
+
 };