[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs
From:       Benjamin Long <bflong () longbros ! com>
Date:       2007-06-09 23:47:18
Message-ID: 1181432838.138124.7822.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 673342 by bflong:

Get kdelib to build with Qtopia Core. Remove old Q_WS_QWS ifdefs. Add needed headers.

 M  +0 -4      cmake/modules/FindQt4.cmake  
 M  +0 -18     kde3support/kdecore/k3urldrag.cpp  
 M  +6 -0      kdeui/CMakeLists.txt  
 M  +2 -0      kdeui/shortcuts/kglobalaccel.cpp  
 A             kdeui/shortcuts/kglobalaccel_qws.cpp   [License: LGPL (v2+)]
 A             kdeui/shortcuts/kglobalaccel_qws.h   [License: LGPL (v2+)]
 A             kdeui/windowmanagement/kwindowsystem_qws.cpp   [License: LGPL (v2+)]
 M  +1 -89     khtml/ecma/kjs_window.cpp  
 M  +0 -14     khtml/ecma/kjs_window.h  


--- trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake #673341:673342
@@ -802,10 +802,6 @@
     SET(QT_QTUITOOLS_LIBRARY ${QT_QTUITOOLS_LIBRARY} ${QT_QTSCRIPT_LIBRARY} )
   ENDIF(QT_QTSCRIPT_LIBRARY AND QT_QTUITOOLS_LIBRARY)
 
-  IF(Q_WS_QWS)
-    SET(QT_QTGUI_LIBRARY ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY})
-  ENDIF(Q_WS_QWS)
-
   #######################################
   #
   #       Check the executables of Qt 
--- trunk/KDE/kdelibs/kde3support/kdecore/k3urldrag.cpp #673341:673342
@@ -154,24 +154,6 @@
     return false; // Couldn't decode the URLs
 }
 
-#ifdef Q_WS_QWS
-bool K3URLDrag::decode( QStringList const &e, KUrl::List &uris )
-{
-	QStringList::ConstIterator end(e.end());
-    for(QStringList::ConstIterator it=e.begin(); it!=end; ++it)
-    {
-      KUrl url = KUrl( *it, 106 ); // 106 is mib enum for utf8 codec
-      if ( !url.isValid() )
-      {
-        uris.clear();
-        break;
-      }
-      uris.append( url );
-    }
-    return !uris.isEmpty();
-}
-#endif
-
 ////
 
 const char * K3URLDrag::format( int i ) const
--- trunk/KDE/kdelibs/kdeui/CMakeLists.txt #673341:673342
@@ -219,6 +219,9 @@
 if (Q_WS_WIN)
     set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} shortcuts/kglobalaccel_win.cpp \
kernel/kapplication_win.cpp )  endif (Q_WS_WIN)
+if (Q_WS_QWS)
+    set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} shortcuts/kglobalaccel_qws.cpp )
+endif (Q_WS_QWS)
 
 if (Q_WS_X11)
     set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} windowmanagement/kwindowsystem_x11.cpp
@@ -233,6 +236,9 @@
 if (Q_WS_WIN)
     set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} windowmanagement/kwindowsystem_win.cpp)
 endif (Q_WS_WIN)
+if (Q_WS_QWS)
+    set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} windowmanagement/kwindowsystem_qws.cpp)
+endif (Q_WS_QWS)
 
 kde4_automoc(${kdeui_LIB_SRCS} dialogs/kdialogqueue_p.h)
 
--- trunk/KDE/kdelibs/kdeui/shortcuts/kglobalaccel.cpp #673341:673342
@@ -27,6 +27,8 @@
 #include "kglobalaccel_mac.h"
 #elif defined(Q_WS_WIN)
 #include "kglobalaccel_win.h"
+#elif defined(Q_WS_QWS)
+#include "kglobalaccel_qws.h"
 #else
 #include "kglobalaccel_emb.h"
 #endif
--- trunk/KDE/kdelibs/khtml/ecma/kjs_window.cpp #673341:673342
@@ -124,20 +124,6 @@
     QPointer<KHTMLPart> part;
   };
 
-
-#ifdef Q_WS_QWS
-  class KonquerorFunc : public DOMFunction {
-  public:
-    KonquerorFunc(ExecState *exec, const Konqueror* k, const char* name)
-      : DOMFunction(exec), konqueror(k), m_name(name) { }
-    virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List \
                &args);
-
-  private:
-    const Konqueror* konqueror;
-    QByteArray m_name;
-  };
-#endif
-
 } //namespace KJS
 
 #include "kjs_window.lut.h"
@@ -956,13 +942,7 @@
       const_cast<Window *>(this)->put(exec, "clientInformation", nav, \
DontDelete|ReadOnly|Internal);  return nav;
     }
-#ifdef Q_WS_QWS
-    case _Konqueror: {
-      ValueImp *k( new Konqueror(part) );
-      const_cast<Window *>(this)->put(exec, "konqueror", k, \
                DontDelete|ReadOnly|Internal);
-      return k;
-    }
-#endif
+
     case OffscreenBuffering:
       return Boolean(true);
     case OuterHeight:
@@ -2951,74 +2931,6 @@
   return Undefined();
 }
 
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef Q_WS_QWS
-
-const ClassInfo Konqueror::info = { "Konqueror", 0, 0, 0 };
-
-bool Konqueror::hasProperty(ExecState *exec, const Identifier &p) const
-{
-  if ( p.qstring().startsWith( "goHistory" ) ) return false;
-
-  return true;
-}
-
-//### FIXME: I haveno clue on whatthis does, so I didn't port it -- M.O.
-ValueImp *Konqueror::get(ExecState *exec, const Identifier &p) const
-{
-  if ( p == "goHistory" || part->url().protocol() != "http" || part->url().host() != \
                "localhost" )
-    return Undefined();
-
-  KParts::BrowserExtension *ext = part->browserExtension();
-  if ( ext ) {
-    KParts::BrowserInterface *iface = ext->browserInterface();
-    if ( iface ) {
-      QVariant prop = iface->property( p.qstring().toLatin1().constData() );
-
-      if ( prop.isValid() ) {
-        switch( prop.type() ) {
-        case QVariant::Int:
-          return Number( prop.toInt() );
-        case QVariant::String:
-          return String( prop.toString() );
-        default:
-          break;
-        }
-      }
-    }
-  }
-
-  return new KonquerorFunc(exec, this, p.qstring().toLatin1().constData() );
-}
-
-ValueImp *KonquerorFunc::callAsFunction(ExecState *exec, ObjectImp*, const List \
                &args)
-{
-  KParts::BrowserExtension *ext = konqueror->part->browserExtension();
-
-  if (!ext)
-    return Undefined();
-
-  KParts::BrowserInterface *iface = ext->browserInterface();
-
-  if ( !iface )
-    return Undefined();
-
-  QByteArray n = m_name.data();
-  n += "()";
-  iface->callMethod( n.data(), QVariant() );
-
-  return Undefined();
-}
-
-UString Konqueror::toString(ExecState *) const
-{
-  return UString("[object Konqueror]");
-}
-
-#endif
-/////////////////////////////////////////////////////////////////////////////
-
 } // namespace KJS
 
 
--- trunk/KDE/kdelibs/khtml/ecma/kjs_window.h #673341:673342
@@ -307,20 +307,6 @@
     QPointer<khtml::ChildFrame> m_frame;
   };
 
-#ifdef Q_WS_QWS
-  class Konqueror : public ObjectImp {
-    friend class KonquerorFunc;
-  public:
-    Konqueror(KHTMLPart *p) : part(p) { }
-    virtual bool getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, \
                PropertySlot& slot);
-    virtual UString toString(ExecState *exec) const;
-    virtual const ClassInfo* classInfo() const { return &info; }
-    static const ClassInfo info;
-  private:
-    KHTMLPart *part;
-  };
-#endif
-
 } // namespace
 
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]