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

List:       kde-commits
Subject:    kdeedu/keduca
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-01-18 19:00:17
Message-ID: 20040118190017.EAD23922D () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

KURL handling fixes


  M +1 -1      keduca/keduca.h   1.12
  M +1 -1      keduca/keducaview.cpp   1.25
  M +1 -1      keducabuilder/keducabuilder.h   1.3
  M +5 -4      libkeduca/fileread.cpp   1.4
  M +1 -1      libkeduca/fileread.h   1.2
  M +1 -1      libkeduca/kgallerydialog.cpp   1.3
  M +1 -1      libkeduca/kgallerydialog.h   1.2


--- kdeedu/keduca/keduca/keduca.h  #1.11:1.12
@@ -43,5 +43,5 @@ public:
     ~Keduca();
   /** Open gallery window */
-  void initGallery(const KURL &urlFile=0);
+  void initGallery(const KURL &urlFile=KURL());
 
 private:

--- kdeedu/keduca/keduca/keducaview.cpp  #1.24:1.25
@@ -370,5 +370,5 @@ bool KEducaView::openURL( const KURL &ur
 {
     _keducaFile = new FileRead();
-    if( !_keducaFile->openFile( url.url() ) ) return false;
+    if( !_keducaFile->openFile( url ) ) return false;
 
     _isInitStatus = true;

--- kdeedu/keduca/keducabuilder/keducabuilder.h  #1.2:1.3
@@ -47,5 +47,5 @@ public:
     bool startChooser();
     /** Init Internet Gallery Servers */
-    void initGallery(const KURL &urlFile = 0);
+    void initGallery(const KURL &urlFile = KURL());
 
 private:

--- kdeedu/keduca/libkeduca/fileread.cpp  #1.3:1.4
@@ -605,5 +605,6 @@ QString FileRead::getPicture()
 QPixmap FileRead::getPicturePixmap()
 {
-  QString picture = getPicture();
+  
+  KURL picture ( getPicture() );
   QPixmap pict;
     
@@ -697,5 +698,5 @@ bool FileRead::saveFile( const KURL &url
         if( saveFile(_tmpfile->name(), copyimages) ) {
             // upload the file
-             KIO::Job * job = KIO::file_copy( _tmpfile->name(), _currentURL, -1, \
true /*overwrite*/ ); +             KIO::Job * job = KIO::file_copy( \
                KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true \
                /*overwrite*/ );
              connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( \
slotUploadFinished (KIO::Job *) ) );  return true;
@@ -819,5 +820,5 @@ bool FileRead::saveFile( const QString &
         KIO::CopyJob *copyjob;
 
-        copyjob = KIO::copy( KurlLIST, _currentURL.directory(false,true), true);
+        copyjob = KIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), \
true);  }
     _changed=false;
@@ -859,5 +860,5 @@ bool FileRead::saveResults( const KURL &
         if( saveResults(_tmpfile->name(), results) ) {
             // upload the file
-             KIO::Job * job = KIO::file_copy( _tmpfile->name(), _currentURL, -1, \
true /*overwrite*/ ); +             KIO::Job * job = KIO::file_copy( \
                KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true \
                /*overwrite*/ );
              connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( \
slotUploadFinished (KIO::Job *) ) );  return true;

--- kdeedu/keduca/libkeduca/fileread.h  #1.1:1.2
@@ -125,5 +125,5 @@ public:
     void recordSwap( bool );
     /** Save file */
-    bool saveFile( const KURL &url = "", bool copyimages = false );
+    bool saveFile( const KURL &url = KURL(), bool copyimages = false );
     /** Save results */
     bool saveResults( const KURL &url, const QString &results );

--- kdeedu/keduca/libkeduca/kgallerydialog.cpp  #1.2:1.3
@@ -224,5 +224,5 @@ KURL KGalleryDialog::getURL()
     
   kdDebug()<< urlAddress <<endl;
-  return urlAddress;
+  return KURL( urlAddress );
 }
 

--- kdeedu/keduca/libkeduca/kgallerydialog.h  #1.1:1.2
@@ -59,5 +59,5 @@ private: // Private attributes
   /** Current url */
   KURL _currentURL;
-  /** The temporary file to wich the document is saved, NULL if no temporary file is \
needed */ +  /** The temporary file to which the document is saved, NULL if no \
temporary file is needed */  KTempFile *_tmpfile;
 private: // Private methods


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