1 files changed, 8 insertions, 6 deletions

diff --git a/microkde/kurl.h b/microkde/kurl.h
index cd65a1c..016eb24 100644
--- a/microkde/kurl.h
+++ b/microkde/kurl.h
@@ -16,19 +16,21 @@
  *  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  *  Boston, MA 02111-1307, USA.
  **/
 
 #ifndef __kurl_h__
 #define __kurl_h__ "$Id$"
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
-class QUrl;
+class Q3Url;
 class QStringList;
 template <typename K, typename V> class QMap;
 
 class KURLPrivate;
 /**
  * Represents and parses a URL.
  *
  * A prototypical URL looks like:
@@ -59,17 +61,17 @@ public:
   };
 
   /**
    * KURL::List is a QValueList that contains KURLs with a few
    * convenience methods.
    * @see KURL
    * @see QValueList
    */
-  class List : public QValueList<KURL>
+  class List : public Q3ValueList<KURL>
   {
   public:
     /**
      * Creates an empty List.
      */
       List() { }
       /**
        * Creates a list that contains the given URL as only
@@ -130,27 +132,27 @@ public:
    * Constructor taking a QCString @p url, which is an _encoded_ representation
    * of the URL, exactly like the usual constructor. This is useful when
    * then URL, in its encoded form, is strictly ascii.
    * @param url A encoded URL. If the URL does not have a protocol part,
    *            "file:" is assumed.
    * @param encoding_hint MIB of original encoding of URL.
    * @see QTextCodec::mibEnum()
    */
-  KURL( const QCString& url, int encoding_hint = 0 );
+  KURL( const Q3CString& url, int encoding_hint = 0 );
   /**
    * Copy constructor.
    * @param u the KURL to copy
    */
   KURL( const KURL& u );
   /**
    * Converts from a @ref QUrl.
    * @param u the QUrl
    */
-  KURL( const QUrl &u );
+  KURL( const Q3Url &u );
   /**
    * Constructor allowing relative URLs.
    *
    * @param _baseurl The base url.
    * @param _rel_url A relative or absolute URL.
    * If this is an absolute URL then @p _baseurl will be ignored.
    * If this is a relative URL it will be combined with @p _baseurl.
    * Note that _rel_url should be encoded too, in any case.
@@ -653,17 +655,17 @@ public:
    * possible it strips the right most URL. It continues stripping URLs.
    * @return a URL that is a level higher
    */
   KURL upURL( ) const;
 
   KURL& operator=( const KURL& _u );
   KURL& operator=( const QString& _url );
   KURL& operator=( const char * _url );
-  KURL& operator=( const QUrl & u );
+  KURL& operator=( const Q3Url & u );
 
   bool operator==( const KURL& _u ) const;
   bool operator==( const QString& _u ) const;
   bool operator!=( const KURL& _u ) const { return !( *this == _u ); }
   bool operator!=( const QString& _u ) const { return !( *this == _u ); }
 
   /**
    * The same as equals(), just with a less obvious name.