author | zautrix <zautrix> | 2004-07-05 08:15:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-05 08:15:56 (UTC) |
commit | 9f0d4ee43ce6f8c61abbd546376ef4f262261a1e (patch) (side-by-side diff) | |
tree | 4484ee12251cc858c3130271e5a798f4302be888 | |
parent | 25671b4735f2604e13f4d6801b96f016ac8b9834 (diff) | |
download | kdepimpi-9f0d4ee43ce6f8c61abbd546376ef4f262261a1e.zip kdepimpi-9f0d4ee43ce6f8c61abbd546376ef4f262261a1e.tar.gz kdepimpi-9f0d4ee43ce6f8c61abbd546376ef4f262261a1e.tar.bz2 |
Found and fixed problem of fastload of KAPI
-rw-r--r-- | kaddressbook/mainembedded.cpp | 6 | ||||
-rw-r--r-- | microkde/kdeui/kmainwindow.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index c127601..dce6a88 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -37,43 +37,41 @@ int main( int argc, char **argv ) } if ( ! exitHelp ) { KGlobal::setAppName( "kaddressbook" ); #ifndef DESKTOP_VERSION if ( QApplication::desktop()->width() > 320 ) KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); else KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); #else QString fileName ; fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/"; KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); #endif KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); - KAddressBookMain* m = new KAddressBookMain(); + KAddressBookMain m ; //US MainWindow m; //US QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); #ifndef DESKTOP_VERSION - a.showMainWidget(m ); - m->showMaximized(); + a.showMainWidget( &m ); #else a.setMainWidget(m ); m->show(); - //m->resize( 640, 480 ); #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> diff --git a/microkde/kdeui/kmainwindow.cpp b/microkde/kdeui/kmainwindow.cpp index 3a2a4d0..bd5a2cc 100644 --- a/microkde/kdeui/kmainwindow.cpp +++ b/microkde/kdeui/kmainwindow.cpp @@ -41,33 +41,33 @@ public: bool autoSaveSettings:1; bool settingsDirty:1; bool autoSaveWindowSize:1; bool care_about_geometry:1; QString autoSaveGroup; //US KAccel * kaccel; //US KMainWindowInterface *m_interface; KDEPrivate::ToolBarHandler *toolBarHandler; QTimer* settingsTimer; KToggleAction *showStatusBarAction; QRect defaultWindowSize; }; static bool no_query_exit = false; KMainWindow::KMainWindow( QWidget* parent, const char *name, WFlags f ) - : QMainWindow( parent, name, f )/*US, KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )*/ + : QMainWindow( parent, name ) /*LR, f ) with the default widget flag we cannot have fastload */ /*US, KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )*/ { mQToolBar = 0; initKMainWindow(name); } void KMainWindow::parseGeometry(bool parsewidth) { //US the following code is not getting used in the embedded version !! So disable it for now /*US assert ( !kapp->geometryArgument().isNull() ); assert ( d->care_about_geometry ); #ifndef Q_WS_QWS // FIXME: (E) Implement something similar for Qt Embedded (or decide we don't need it) int x, y; |