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

List:       kde-commits
Subject:    koffice/krita
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-11-20 14:09:39
Message-ID: 20101120140939.53316AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199060 by rempt:

remove some deprecated items

 M  +1 -1      image/CMakeLists.txt  
 M  +1 -1      ui/CMakeLists.txt  
 M  +0 -1      ui/kis_histogram_view.cc  
 M  +8 -2      ui/kis_node_model.cpp  
 M  +12 -13    ui/kis_view2.cpp  


--- trunk/koffice/krita/image/CMakeLists.txt #1199059:1199060
@@ -209,7 +209,7 @@
 
 kde4_add_library(kritaimage SHARED ${kritaimage_LIB_SRCS})
 
-target_link_libraries(kritaimage ${KDE4_KPARTS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} komain pigmentcms \
${KDE4_THREADWEAVER_LIBRARIES} ) +target_link_libraries(kritaimage ${KDE4_KPARTS_LIBS} komain pigmentcms \
${KDE4_THREADWEAVER_LIBRARIES} )  target_link_libraries(kritaimage LINK_INTERFACE_LIBRARIES pigmentcms \
komain ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} )  
 if(OPENEXR_FOUND)
--- trunk/koffice/krita/ui/CMakeLists.txt #1199059:1199060
@@ -214,7 +214,7 @@
 
 kde4_add_library(kritaui SHARED ${kritaui_LIB_SRCS} )
 
-target_link_libraries(kritaui ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain \
kowidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}) +target_link_libraries(kritaui \
${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain kowidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})  
 if(HAVE_OPENGL)
     target_link_libraries(kritaui ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENEXR_LIBRARIES})
--- trunk/koffice/krita/ui/kis_histogram_view.cc #1199059:1199060
@@ -24,7 +24,6 @@
 #include <QPixmap>
 #include <QLabel>
 #include <QComboBox>
-#include <q3buttongroup.h>
 #include <QPushButton>
 #include <qscrollbar.h>
 //Added by qt3to4:
--- trunk/koffice/krita/ui/kis_node_model.cpp #1199059:1199060
@@ -21,6 +21,8 @@
 #include <iostream>
 
 #include <QMimeData>
+#include <QDataStream>
+#include <QBuffer>
 
 #include <klocale.h>
 
@@ -391,7 +393,9 @@
     //dbgUI <<"KisNodeModel::mimeData";
     QMimeData* data = new QMimeData;
     QByteArray encoded;
-    QDataStream stream(&encoded, QIODevice::WriteOnly);
+    QBuffer buf(&encoded);
+    buf.open(QIODevice::WriteOnly);
+    QDataStream stream(&buf);
 
     // encode the data
     QModelIndexList::ConstIterator it = indexes.begin();
@@ -399,6 +403,8 @@
         stream << qVariantFromValue(qulonglong(it->internalPointer()));
     }
 
+    buf.close();
+
     data->setData("application/x-kritalayermodeldatalist", encoded);
     return data;
 }
@@ -414,7 +420,7 @@
         return false;
     }
     QByteArray encoded = data->data("application/x-kritalayermodeldatalist");
-    QDataStream stream(&encoded, QIODevice::ReadOnly);
+    QDataStream stream(encoded);
     QList<KisNode*> nodes;
     while (! stream.atEnd()) {
         QVariant v;
--- trunk/koffice/krita/ui/kis_view2.cpp #1199059:1199060
@@ -38,7 +38,6 @@
 #include <QPrintDialog>
 #include <QObject>
 
-#include <k3urldrag.h>
 #include <kaction.h>
 #include <klocale.h>
 #include <kmenu.h>
@@ -339,10 +338,8 @@
     dbgUI << "KisView2::dragEnterEvent";
     // Only accept drag if we're not busy, particularly as we may
     // be showing a progress bar and calling qApp->processEvents().
-    if (K3URLDrag::canDecode(event) && QApplication::overrideCursor() == 0) {
+    if (event->mimeData()->hasImage()) {
         event->accept();
-    } else if (event->mimeData()->hasImage()) {
-        event->accept();
     } else {
         event->ignore();
     }
@@ -378,9 +375,8 @@
         return;
     }
 
-    KUrl::List urls;
-    if (K3URLDrag::decode(event, urls)) {
-        if (urls.count() > 0) {
+    QList<QUrl> urls = event->mimeData()->urls();
+    if (urls.length() > 0) {
 
             KMenu popup;
             popup.setObjectName("drop_popup");
@@ -411,11 +407,10 @@
             QAction *action = popup.exec(QCursor::pos());
 
             if (action != 0 && action != cancel) {
-                for (KUrl::List::ConstIterator it = urls.constBegin(); it != urls.constEnd(); ++it) {
-                    KUrl url = *it;
+            foreach(QUrl url, urls) {
 
                     if (action == insertAsNewLayer || action == insertAsNewLayers) {
-                        m_d->imageManager->importImage(url);
+                    m_d->imageManager->importImage(KUrl(url));
                     } else {
                         Q_ASSERT(action == openInNewDocument || action == openInNewDocuments);
 
@@ -426,8 +421,8 @@
                 }
             }
         }
+
     }
-}
 
 KoZoomController *KisView2::zoomController() const
 {
@@ -751,12 +746,16 @@
         KService::Ptr service = *iter;
         dbgUI << "Load plugin " << service->name();
         int errCode = 0;
+        QString error = 0;
+
+
         KParts::Plugin* plugin =
-                KService::createInstance<KParts::Plugin> (service, this, QStringList(), &errCode);
+                dynamic_cast<KParts::Plugin*>(service->createInstance<QObject>(this, QVariantList(), \
&error)); +        //KService::createInstance<KParts::Plugin> (service, this, QStringList(), &errCode);
         if (plugin) {
             insertChildClient(plugin);
         } else {
-            errKrita << "Fail to create an instance for " << service->name() << " " << \
KLibLoader::errorString(errCode) << " " << KLibLoader::self()->lastErrorMessage(); +            errKrita \
<< "Fail to create an instance for " << service->name() << " " << error;  }
     }
 }


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