mrege noncore/net/*

4 files changed, 10 insertions, 22 deletions

diff --git a/noncore/net/opieftp/main.cpp b/noncore/net/opieftp/main.cpp
index 4f5a7d4..0217e41 100644
--- a/noncore/net/opieftp/main.cpp
+++ b/noncore/net/opieftp/main.cpp
@@ -11,17 +11,6 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#include <qpe/qpeapplication.h>
-
-
-
+#include <opie/oapplicationfactory.h>
 #include "opieftp.h"
 
-int main(int argc, char *argv[])
-{
-    QPEApplication a(argc, argv);
-
-    OpieFtp opieftp;
-    a.showMainWidget( &opieftp);
-    return a.exec();
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> )
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 269449e..ee7d32f 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -58,6 +58,6 @@ static int log_progress(netbuf *, int xfered, void *)
 }
 
-OpieFtp::OpieFtp( )
-        : QMainWindow( )
+OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
+        : QMainWindow( parent,  name, fl )
 {
     setCaption( tr( "OpieFtp" ) );
@@ -271,15 +271,15 @@ OpieFtp::OpieFtp( )
              this,SLOT( serverListClicked( const QString &) ) );
   
-    connectServerBtn = new QPushButton( "Connect", tab_3 , "ConnectButton" );
+    connectServerBtn = new QPushButton( tr("Connect"), tab_3 , "ConnectButton" );
     tabLayout_3->addMultiCellWidget( connectServerBtn, 6, 6, 0, 1);
     connectServerBtn->setToggleButton(TRUE);
     connect(connectServerBtn,SIGNAL( toggled( bool)),SLOT( connectorBtnToggled(bool) ));
 
-    newServerButton= new QPushButton( "Add", tab_3 , "NewServerButton" );
+    newServerButton= new QPushButton( tr("Add"), tab_3 , "NewServerButton" );
     tabLayout_3->addMultiCellWidget( newServerButton, 6, 6, 2, 2);
     connect( newServerButton,SIGNAL( clicked()),SLOT( NewServer() ));
 
     QPushButton *deleteServerBtn;
-    deleteServerBtn = new QPushButton( "Delete", tab_3 , "OpenButton" );
+    deleteServerBtn = new QPushButton( tr("Delete"), tab_3 , "OpenButton" );
     tabLayout_3->addMultiCellWidget( deleteServerBtn, 6, 6, 3, 3);
 
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 9d5d211..7bd615a 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -48,7 +48,8 @@ class OpieFtp : public QMainWindow
 
 public:
-    OpieFtp(  );
+    OpieFtp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~OpieFtp();
 
+    static QString appName() { return QString::fromLatin1("opieftp"); }
     QTabWidget *TabWidget;
     QWidget *tab, *tab_2, *tab_3;
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index ac16819..185c341 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -1,8 +1,6 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
+CONFIG    += qt warn_on release quick-app
 HEADERS   = opieftp.h inputDialog.h 
 SOURCES   = opieftp.cpp inputDialog.cpp main.cpp
 TARGET    = opieftp
-DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include