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

List:       kde-devel
Subject:    kdenetwork patch (cvs Aug. 7, 2001)
From:       Jesse Barnes <jbarnes () sgi ! com>
Date:       2001-08-07 23:01:28
[Download RAW message or body]

Here's yet another patch for the kdenetwork package.  I still couldn't
compile the lanbrowsing app:
cc-1323 CC: ERROR File = netmanager.cpp, Line = 965
  No operator "<<" matches these operands.

            The operand types are:  ostream << MyString.
     cerr<<"Reading options from config file: "<<m_usedConfigFileName<<endl;

I got a bunch of those and didn't feel like fixing all ~100 of them to use
MyString.data().  Other than that, everything was fine.

Jesse

Index: kmail/kmfolderimap.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmfolderimap.cpp,v
retrieving revision 1.2
diff -u -3 -p -r1.2 kmfolderimap.cpp
--- kmail/kmfolderimap.cpp	2001/08/07 20:17:39	1.2
+++ kmail/kmfolderimap.cpp	2001/08/07 22:15:59
@@ -110,7 +110,8 @@ void KMFolderImap::removeMsg(int idx, bo
     deleteMessage(msg);
   }
 
-  return KMFolderImapInherited::removeMsg(idx);
+  KMFolderImapInherited::removeMsg(idx);
+  return;
 }
 
 //-----------------------------------------------------------------------------
Index: kmail/kmmessage.h
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmmessage.h,v
retrieving revision 1.66
diff -u -3 -p -r1.66 kmmessage.h
--- kmail/kmmessage.h	2001/08/07 17:35:48	1.66
+++ kmail/kmmessage.h	2001/08/07 22:16:00
@@ -356,7 +356,7 @@ public:
     virtual KMMsgStatus status(void) const { return mStatus; }
     /** Set status and mark dirty. */
     virtual void setStatus(const KMMsgStatus status);
-    virtual void setStatus(const char* s1, const char* s2=0) { return KMMsgBase::setStatus(s1, s2); }
+    virtual void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); return; }
 
 protected:
     /** Convert wildcards into normal string */
Index: kmail/kmmsginfo.h
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmmsginfo.h,v
retrieving revision 1.20
diff -u -3 -p -r1.20 kmmsginfo.h
--- kmail/kmmsginfo.h	2001/08/07 17:35:48	1.20
+++ kmail/kmmsginfo.h	2001/08/07 22:16:00
@@ -58,8 +58,8 @@ public:
   virtual void setMsgIdMD5(const QString&);
 
   /** Grr.. c++! */
-  virtual void setStatus(const char* s1, const char* s2=0) { return KMMsgBase::setStatus(s1, s2); }
-  virtual void setDate(const char* s1) { return KMMsgBase::setDate(s1); }
+  virtual void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); return; }
+  virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); return; }
 
   virtual bool dirty(void) const;
 
Index: ksirc/puke/pkfiledialog.cpp
===================================================================
RCS file: /home/kde/kdenetwork/ksirc/puke/pkfiledialog.cpp,v
retrieving revision 1.14
diff -u -3 -p -r1.14 pkfiledialog.cpp
--- ksirc/puke/pkfiledialog.cpp	2001/01/06 16:05:31	1.14
+++ ksirc/puke/pkfiledialog.cpp	2001/08/07 22:16:01
@@ -56,7 +56,6 @@ void PKFileDialog::messageHandler(int fd
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = 0;
     pmRet.iTextSize = widget()->baseURL().path().length();
-#warning check if the cast is okay
     pmRet.cArg = (char*) widget()->baseURL().path().ascii();
     emit outputMessage(fd, &pmRet);
     break;
@@ -78,7 +77,6 @@ void PKFileDialog::messageHandler(int fd
     pmRet.iArg = 0;
     selFile = widget()->selectedURL().path();
     pmRet.iTextSize = selFile.length();
-#warning check if the cast is okay
     pmRet.cArg = (char*) selFile.ascii();
     emit outputMessage(fd, &pmRet);
     break;

 
>> Visit http://master.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

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