1 files changed, 2 insertions, 122 deletions

diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index a2ff1e9..40089a1 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,27 +1,28 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qcopchannel_qws.h> 
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h>
 #include <qplatinumstyle.h>
 #include <qmainwindow.h>
 #endif
 
+#include <qtextcodec.h> 
 #include <kstandarddirs.h>
 #include <qregexp.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include <qdir.h>
 #include "kaddressbookmain.h"
 #include "externalapphandler.h"
 #include <libkdepim/kpimglobalprefs.h>
 
 int main( int argc, char **argv )
 {
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
 #else
   QApplication a( argc, argv );
@@ -71,145 +72,24 @@ int main( int argc, char **argv )
 #endif
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));
        KAddressBookMain m ;
 //US      MainWindow m;
       QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 
       {
           KPimGlobalPrefs::instance()->setGlobalConfig();
       }
 #ifndef DESKTOP_VERSION
        a.showMainWidget( &m ); 
       
 #else
       a.setMainWidget( &m );
       m.resize (640, 480 );
       m.show();
-#endif
+#endif 
       a.exec();
 
 
   }
   qDebug("KA: Bye! ");
 }
 
-/*
-#include <stdlib.h>
-
-#include <qstring.h>
-
-#include <kabc/stdaddressbook.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kcrash.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kstartupinfo.h>
-#include <kuniqueapplication.h>
-#include <kwin.h>
-
-#include "kaddressbookmain.h"
-#include "kabcore.h"
-
-extern "C" {
-
-void crashHandler( int )
-{
-  KABC::StdAddressBook::handleCrash();
-  ::exit( 0 );
-}
-
-}
-
-class KAddressBookApp : public KUniqueApplication {
-  public:
-    KAddressBookApp() : mMainWin( 0 ) {}
-    ~KAddressBookApp() {}
-
-    int newInstance();
-
-  private:
-    KAddressBookMain *mMainWin;
-};
-
-int KAddressBookApp::newInstance()
-{
-  if ( isRestored() ) {
-    // There can only be one main window
-    if ( KMainWindow::canBeRestored( 1 ) ) {
-      mMainWin = new KAddressBookMain;
-      mMainWin->show();
-      mMainWin->restore( 1 );
-    }
-  } else {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-    QCString addrStr = args->getOption( "addr" );
-    QCString uidStr = args->getOption( "uid" );
-    QString addr;
-    QString uid;
-    if ( !addrStr.isEmpty() )
-      addr = QString::fromLocal8Bit( addrStr );
-    if ( !uidStr.isEmpty() )
-      uid = QString::fromLocal8Bit( uidStr );
-
-
-    if ( args->isSet( "editor-only" ) ) {
-      if ( !mMainWin )
-        mMainWin = new KAddressBookMain;
-        KStartupInfo::appStarted();
-        mMainWin->hide();
-    } else {
-      if ( mMainWin ) {
-        mMainWin->show();
-        KWin::setActiveWindow( mMainWin->winId() );
-      } else {
-        mMainWin = new KAddressBookMain;
-        mMainWin->show();
-      }
-    }
-    // Can not see why anyone would pass both a uid and an email address, so I'll leave it that two contact editors will show if they do
-    if ( !addr.isEmpty() )
-      mMainWin->addEmail( addr );
-
-    if ( !uid.isEmpty() )
-      mMainWin->showContactEditor( uid );
-    if ( args->isSet( "new-contact" ) ) {
-      mMainWin->newContact();
-    }
-  }
-
-  KCrash::setEmergencySaveFunction( crashHandler );
-
-  return 0;
-}
-
-// the dummy argument is required, because KMail apparently sends an empty
-// argument.
-static KCmdLineOptions kmoptions[] =
-{
-  { "a", 0 , 0 },
-  { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 },
-  { "uid <uid>", I18N_NOOP( "Shows contact editor with given uid" ), 0 },
-  { "editor-only", I18N_NOOP( "Launches in editor only mode" ), 0 },
-  { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 },
-  { "+[argument]", I18N_NOOP( "dummy argument" ), 0},
-  { 0, 0, 0}
-};
-
-int main( int argc, char *argv[] )
-{
-  KLocale::setMainCatalogue( "kaddressbook" );
-
-  KCmdLineArgs::init( argc, argv, KABCore::createAboutData() );
-  KCmdLineArgs::addCmdLineOptions( kmoptions );
-  KUniqueApplication::addCmdLineOptions();
-
-  if ( !KAddressBookApp::start() )
-    exit( 0 );
-
-  KAddressBookApp app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
-
-  return app.exec();
-}
-*/