-Remove #ifdef for NOQUICKLAUNCH as OPIE_EXPORT_APP works for

 both cases already.
-Use QPEApplication::setStylusOperation for RightOnHold feature
 instead of custom code

4 files changed, 31 insertions, 51 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a47edd8..afb44f5 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -36,9 +36,5 @@
 using namespace Opie::Ui;
 
-#ifdef NOQUICKLAUNCH
-AdvancedFm::AdvancedFm( )
-#else
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
-#endif
    : QMainWindow( ) {
    init();
@@ -72,5 +68,5 @@ void AdvancedFm::cleanUp() {
 
 void AdvancedFm::tabChanged(QWidget *) {
-//   owarn << "tab changed" << oendl; 
+//   owarn << "tab changed" << oendl;
    QString path = CurrentDir()->canonicalPath();
    currentPathCombo->lineEdit()->setText( path );
@@ -94,5 +90,5 @@ void AdvancedFm::tabChanged(QWidget *) {
 void AdvancedFm::populateView() {
 
-// owarn << "PopulateView" << oendl; 
+// owarn << "PopulateView" << oendl;
         QPixmap pm;
         QListView *thisView = CurrentView();
@@ -100,5 +96,5 @@ void AdvancedFm::populateView() {
         QString path = thisDir->canonicalPath();
 
-//owarn << "path is "+path << oendl; 
+//owarn << "path is "+path << oendl;
         thisView->clear();
         thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
@@ -161,5 +157,5 @@ void AdvancedFm::populateView() {
                         }
                         if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
-                                    //  odebug << " overlay link image" << oendl; 
+                                    //  odebug << " overlay link image" << oendl;
                                 pm= Resource::loadPixmap( "advancedfm/symlink" );
                                     //              pm= Resource::loadPixmap( "folder" );
@@ -185,5 +181,5 @@ void AdvancedFm::populateView() {
                         while ((mydirent = readdir(dir)) != NULL) {
                                 lstat( mydirent->d_name, &buf);
-//        odebug << mydirent->d_name << oendl; 
+//        odebug << mydirent->d_name << oendl;
                                 fileL.sprintf("%s", mydirent->d_name);
                                 devT = buf.st_dev;
@@ -210,5 +206,5 @@ void AdvancedFm::rePopulate() {
 
 //      int tmpTab = whichTab;
-// //  odebug << "" << tmpTab << "" << oendl; 
+// //  odebug << "" << tmpTab << "" << oendl;
 
 //    for(int i =1; i < 3; i++) {
@@ -220,8 +216,8 @@ void AdvancedFm::rePopulate() {
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
-//owarn << "listclicked" << oendl; 
+//owarn << "listclicked" << oendl;
    if(selectedItem) {
       QString strItem=selectedItem->text(0);
-//      owarn << strItem << oendl; 
+//      owarn << strItem << oendl;
       QString strSize=selectedItem->text(1);
       strSize=strSize.stripWhiteSpace();
@@ -260,7 +256,4 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
    }
    break;
-   case 2:
-      menuTimer.start( 500, TRUE );
-      break;
    };
 }
@@ -268,5 +261,5 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
 
 void AdvancedFm::switchToLocalTab() {
-//owarn << "switch to local view" << oendl; 
+//owarn << "switch to local view" << oendl;
    TabWidget->setCurrentWidget(0);
    Local_View->setFocus();
@@ -274,5 +267,5 @@ void AdvancedFm::switchToLocalTab() {
 
 void AdvancedFm::switchToRemoteTab() {
-//owarn << "switch to local view" << oendl; 
+//owarn << "switch to local view" << oendl;
    TabWidget->setCurrentWidget(1);
    Remote_View->setFocus();
@@ -330,5 +323,5 @@ QStringList AdvancedFm::getPath() {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
-//        odebug << it.current()->text(0) << oendl; 
+//        odebug << it.current()->text(0) << oendl;
       }
    }
@@ -381,5 +374,5 @@ void AdvancedFm::doAbout() {
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
-//   owarn << "key " << e->key() << "" << oendl; 
+//   owarn << "key " << e->key() << "" << oendl;
 //   if( CurrentView()->hasFocus()  )
    {
@@ -607,10 +600,4 @@ void AdvancedFm::showFileMenu() {
 
 
-void AdvancedFm::cancelMenuTimer() {
-
-   if( menuTimer.isActive() )
-      menuTimer.stop();
-}
-
 QString AdvancedFm::checkDiskSpace(const QString &path) {
    struct statfs fss;
@@ -639,5 +626,5 @@ void AdvancedFm::addToDocs() {
       for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
          curFile = thisDir->canonicalPath()+"/"+(*it);
-//                odebug << curFile << oendl; 
+//                odebug << curFile << oendl;
          QFileInfo fi(curFile);
          DocLnk f;
@@ -712,5 +699,5 @@ void AdvancedFm::addCustomDir() {
 
 void AdvancedFm::removeCustomDir() {
-//  odebug << "remove custom dir" << oendl; 
+//  odebug << "remove custom dir" << oendl;
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
@@ -747,5 +734,5 @@ void AdvancedFm::removeCustomDir() {
 
 void AdvancedFm::gotoCustomDir(const QString &dir) {
-//     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl; 
+//     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl;
 //  QString curDir = dir;
 //  QDir *thisDir = CurrentDir();
@@ -788,8 +775,8 @@ QDir *AdvancedFm::OtherDir() {
 QListView * AdvancedFm::CurrentView() {
    if ( whichTab == 1) {
-//      owarn << "CurrentView Tab 1" << oendl; 
+//      owarn << "CurrentView Tab 1" << oendl;
       return Local_View;
    } else {
-//      owarn << "CurrentView Tab 2" << oendl; 
+//      owarn << "CurrentView Tab 2" << oendl;
       return Remote_View;
    }
@@ -804,5 +791,5 @@ QListView * AdvancedFm::OtherView() {
 
 void AdvancedFm::setOtherTabCurrent() {
-//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; 
+//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl;
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
@@ -815,8 +802,8 @@ void AdvancedFm::setOtherTabCurrent() {
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
-//   odebug << "qcop message "+msg << oendl; 
+//   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
-//      odebug << "received" << oendl; 
+//      odebug << "received" << oendl;
       QString file;
       stream >> file;
@@ -831,5 +818,5 @@ void AdvancedFm::setDocument(const QString &file) {
 
 void AdvancedFm::gotoDirectory(const QString &file) {
-//   owarn << "goto dir "+file << oendl; 
+//   owarn << "goto dir "+file << oendl;
    QString curDir = file;
    QDir *thisDir = CurrentDir();
@@ -867,5 +854,5 @@ void AdvancedFm::findFile(const QString &fileName) {
 
 void AdvancedFm::slotSwitchMenu(int ) {
-//   odebug << "Switch " << item << "" << oendl; 
+//   odebug << "Switch " << item << "" << oendl;
    //   viewMenu->setItemChecked(item, true);
 }
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 4eaa6d6..effda0b 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -56,9 +56,5 @@ class AdvancedFm : public QMainWindow
 public:
     static QString appName() { return QString::fromLatin1("advancedfm"); }
-#ifdef NOQUICKLAUNCH
-   AdvancedFm();
-#else
    AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
-#endif
    ~AdvancedFm();
 protected slots:
@@ -139,6 +135,5 @@ protected slots:
    void openSearch();
    void dirMenuSelected(int);
-   void showFileMenu();
-   void cancelMenuTimer();
+   void showFileMenu();   
    void homeButtonPushed();
    void docButtonPushed();
@@ -167,5 +162,4 @@ private:
    MenuButton *menuButton;
    QString oldName;
-   QTimer menuTimer;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 29335f8..dc7e8e1 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -162,5 +162,5 @@ void AdvancedFm::init() {
          Local_View->installEventFilter( this );
 
-         QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
+         QPEApplication::setStylusOperation( Local_View->viewport() , QPEApplication::RightOnHold);
 
          tabLayout->addWidget( Local_View, 0, 0 );
@@ -186,5 +186,5 @@ void AdvancedFm::init() {
          Remote_View->installEventFilter( this );
 
-         QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
+         QPEApplication::setStylusOperation( Remote_View->viewport(), QPEApplication::RightOnHold);
 
          tabLayout_2->addWidget( Remote_View, 0, 0 );
@@ -224,9 +224,9 @@ void AdvancedFm::init() {
 
          if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
-                        odebug << "not have sd" << oendl; 
+                        odebug << "not have sd" << oendl;
                         sdButton->hide();
          }
          if( !StorageInfo::hasCf() ) {
-                        odebug << "not have cf" << oendl; 
+                        odebug << "not have cf" << oendl;
                         cfButton->hide();
          }
@@ -274,6 +274,4 @@ void AdvancedFm::initConnections()
            this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
 
-  connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
-
   connect( Remote_View, SIGNAL( clicked(QListViewItem*)),
            this,SLOT( ListClicked(QListViewItem*)) );
@@ -284,5 +282,8 @@ void AdvancedFm::initConnections()
           this,SLOT(tabChanged(QWidget*)));
 
-  connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
+  connect( Remote_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&, int)),
+           this, SLOT(showFileMenu()));
+  connect( Local_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&,int)),
+           this, SLOT(showFileMenu()));
 
   connect( menuButton, SIGNAL( selected(const QString&)), SLOT(gotoCustomDir(const QString&)));
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index df0d4af..06fc741 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -1,6 +1,4 @@
 
 /***************************************************************************
-using namespace Opie::Core;
-using namespace Opie::Core;
                           main.cpp  -  description
                              -------------------