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

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       Laurent Montel <montel () kde ! org>
Date:       2005-10-04 9:02:35
Message-ID: 1128416555.951680.27991.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 467079 by mlaurent:

libkonq compiles/links fine now.
TODO remove K3URLDrag (after porting other things)


 M  +1 -1      Makefile.am  
 M  +3 -3      konq_dirpart.cc  
 M  +2 -1      konq_historymgr.cc  
 M  +2 -2      konq_operations.cc  
 M  +2 -2      konq_undo.cc  


--- trunk/KDE/kdebase/libkonq/Makefile.am #467078:467079
@@ -21,7 +21,7 @@
 
 lib_LTLIBRARIES = libkonq.la
 libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libkonq_la_LIBADD = $(LIB_KPARTS)
+libkonq_la_LIBADD = $(LIB_KPARTS) $(LIB_KDE3SUPPORT)
 
 libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
    konq_xmlguiclient.cc\
--- trunk/KDE/kdebase/libkonq/konq_dirpart.cc #467078:467079
@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <konq_drag.h>
 #include <kparts/browserextension.h>
-#include <kurldrag.h>
+#include <k3urldrag.h>
 #include <kuserprofile.h>
 #include <kurifilter.h>
 #include <kglobalsettings.h>
@@ -124,7 +124,7 @@
 }
 
 KonqDirPart::KonqDirPart( QObject *parent, const char *name )
-            :KParts::ReadOnlyPart( parent, name ),
+            :KParts::ReadOnlyPart( parent/*, name*/ ),
     m_pProps( 0L ),
     m_findPart( 0L )
 {
@@ -414,7 +414,7 @@
     QMimeSource *data = QApplication::clipboard()->data();
     if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
         if ( KonqDrag::decodeIsCutSelection( data ) )
-            (void) KURLDrag::decode( data, lst );
+            (void) K3URLDrag::decode( data, lst );
 
     disableIcons( lst );
 
--- trunk/KDE/kdebase/libkonq/konq_historymgr.cc #467078:467079
@@ -36,9 +36,10 @@
 const Q_UINT32 KonqHistoryManager::s_historyVersion = 3;
 
 KonqHistoryManager::KonqHistoryManager( QObject *parent, const char *name )
-    : KParts::HistoryProvider( parent, name ),
+    : KParts::HistoryProvider( parent ),
               KonqHistoryComm( "KonqHistoryManager" )
 {
+	setObjectName(name);
     m_updateTimer = new QTimer( this );
 
     // defaults
--- trunk/KDE/kdebase/libkonq/konq_operations.cc #467078:467079
@@ -135,7 +135,7 @@
       kdDebug(1203) << "move (from clipboard data) = " << move << endl;
     }
 
-    KIO::Job *job = KIO::pasteClipboard( destURL, move );
+    KIO::Job *job = KIO::pasteClipboard( destURL, parent, move );
     if ( job )
     {
         KonqOperations * op = new KonqOperations( parent );
@@ -387,7 +387,7 @@
     {
         //kdDebug(1203) << "Pasting to " << dest.url() << endl;
         KonqOperations * op = new KonqOperations(parent);
-        KIO::CopyJob* job = KIO::pasteMimeSource( ev, dest,
+        KIO::CopyJob* job = KIO::pasteMimeSource( ev->mimeData(), dest,
                                                   i18n( "File name for dropped contents:" ),
                                                   parent );
         if ( job ) // 0 if canceled by user
--- trunk/KDE/kdebase/libkonq/konq_undo.cc #467078:467079
@@ -27,7 +27,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-
+#include <q3cstring.h>
 #include <kapplication.h>
 #include <kdatastream.h>
 #include <kdebug.h>
@@ -503,7 +503,7 @@
           delete d->m_undoJob;
           d->m_undoJob = 0;
       }
-      KDirNotify_stub allDirNotify( "*", "KDirNotify*" );
+      KDirNotify_stub allDirNotify( Q3CString("*"), Q3CString("KDirNotify*") );
       QList<KURL>::ConstIterator it = d->m_dirsToUpdate.begin();
       for( ; it != d->m_dirsToUpdate.end(); ++it ) {
           kdDebug() << "Notifying FilesAdded for " << *it << endl;
[prev in list] [next in list] [prev in thread] [next in thread]