[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Adam Treat]

SVN commit 638382 by treat:

* Fix header, fix QByteArray bits, fix Q_EXPORT -> Q_CORE_EXPORT
and use a typedef to temporarily get away from KMdi


 M  +3 -3      emailthread.cpp  
 M  +1 -1      emailthread.h  
 M  +8 -2      kst.h  
 M  +1 -1      kstalignment.h  


--- branches/work/kst/portto4/kst/src/libkstapp/emailthread.cpp #638381:638382
@@ -95,8 +95,8 @@
   KIO::Scheduler::connect(SIGNAL(slaveError(KIO::Slave *, int, const QString &)), this,
                             SLOT(slaveError(KIO::Slave *, int, const QString &)));
 
-  _strBody.insert( 0, QString("Subject:%1\n\n").arg(_strSubject).toLatin1());
-  _strBody.insert( 0, QString("To:%1\n").arg(_strTo).toLatin1());
+  _strBody.insert( 0, QString("Subject:%1\n\n").arg(_strSubject).toLatin1().data());
+  _strBody.insert( 0, QString("To:%1\n").arg(_strTo).toLatin1().data());
 
   _bodyOffset = 0;
   _bodyLength = _strBody.length();
@@ -177,7 +177,7 @@
   int chunkSize = qMin(_bodyLength - _bodyOffset, uint(0x8000));
 
   if (chunkSize > 0) {
-    array.duplicate(_strBody.data() + _bodyOffset, chunkSize);
+    array = _strBody.data() + _bodyOffset;
     _bodyOffset += chunkSize;
   } else {
     array.resize(0);
--- branches/work/kst/portto4/kst/src/libkstapp/emailthread.h #638381:638382
@@ -22,7 +22,7 @@
 #include <qobject.h>
 
 #include <kio/global.h>
-#include <kio/passdlg.h>
+#include <kio/passworddialog.h>
 #include <kio/scheduler.h>
 
 #include "kstsettings.h"
--- branches/work/kst/portto4/kst/src/libkstapp/kst.h #638381:638382
@@ -21,12 +21,12 @@
 #include <config.h>
 
 // include files for Qt
+#include <QMainWindow>
 #include <qpointer.h>
 #include <qtimer.h>
 //Added by qt3to4:
 #include <Q3ValueList>
 #include <QLabel>
-#include <QCustomEvent>
 
 // include files for KDE
 // #include <kmdimainfrm.h>
@@ -96,6 +96,12 @@
   * @author original Source Framework automatically generated by
   * KDevelop, (c) The KDevelop Team.  Modified by C. Barth Netterfield
   */
+
+//FIXME This is going to be fun porting away from KMDI, but for now use a typedef
+//and see how far we get...
+typedef QMainWindow KMdiMainFrm;
+typedef QWidget KMdiChildView;
+
 class KST_EXPORT KstApp : public KMdiMainFrm {
   Q_OBJECT
   public:
@@ -174,7 +180,7 @@
     void moveTabRight(KstViewWindow*);
 
   protected:
-    void customEvent(QCustomEvent *e);
+    void customEvent(QEvent *e);
 
 
     /** save options to the configuration file
--- branches/work/kst/portto4/kst/src/libkstapp/kstalignment.h #638381:638382
@@ -23,7 +23,7 @@
 #include <qpoint.h>
 #include <qrect.h>
 
-Q_EXPORT int operator<(const QPoint &p1, const QPoint &p2);
+Q_CORE_EXPORT int operator<(const QPoint &p1, const QPoint &p2);
 
 // this class keeps track of the plot line alignment (eg, xaxis lineup, etc)
 class KstAlignment {