Restored qt_cast()

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1217837 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 11 insertions, 11 deletions

diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp
index d2f5f81f6..3447803d1 100644
--- a/kdecore/kaccelmanager.cpp
+++ b/kdecore/kaccelmanager.cpp
@@ -1,5 +1,5 @@
 /*  This file is part of the KDE project
-    Copyright (C) 2002 Matthias Hölzer-Klüpfel <mhk@kde.org>
+    Copyright (C) 2002 Matthias H�lzer-Kl�pfel <mhk@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -320,7 +320,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
 
   if (dynamic_cast<TQComboBox*>(w) || dynamic_cast<TQLineEdit*>(w) ||
       dynamic_cast<TQTextEdit*>(w) || dynamic_cast<TQTextView*>(w) ||
-      dynamic_cast<TQSpinBox*>(w) || w->tqqt_cast( "KMultiTabBar" ))
+      dynamic_cast<TQSpinBox*>(w) || w->qt_cast( "KMultiTabBar" ))
       return;
 
   // now treat 'ordinary' widgets
@@ -661,7 +661,7 @@ void KAccelString::dump()
  The algorithm has some advantages:
 
    * it favors 'nice' accelerators (first characters in a word, etc.)
-   * it is quite fast, O(N²)
+   * it is quite fast, O(N�)
    * it is easy to understand :-)
 
  The disadvantages:
diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp
index c6561bad4..7517bb8e0 100644
--- a/kdecore/kextsock.cpp
+++ b/kdecore/kextsock.cpp
@@ -1262,7 +1262,7 @@ void KExtendedSocket::cancelAsyncConnect()
   d->status = lookupDone;
 }
 
-bool KExtendedSocket::open(int mode)
+bool KExtendedSocket::open(OpenMode mode)
 {
   if (mode != IO_Raw | IO_ReadWrite)
     return false;		// invalid open mode
diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h
index 02922ec33..7783b319b 100644
--- a/kdecore/kextsock.h
+++ b/kdecore/kextsock.h
@@ -627,7 +627,7 @@ public:
    * @return true if successful, false when an error occurred or the most was
    *         not correct
    */
-  virtual bool open(int mode = IO_Raw | IO_ReadWrite);
+  virtual bool open(OpenMode mode = (OpenMode)(IO_Raw | IO_ReadWrite));
 
   /**
    * Closes the socket. If we have data still in the write buffer yet to be
diff --git a/kdecore/kqiodevicegzip_p.cpp b/kdecore/kqiodevicegzip_p.cpp
index 14bb38125..84409ddb0 100644
--- a/kdecore/kqiodevicegzip_p.cpp
+++ b/kdecore/kqiodevicegzip_p.cpp
@@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void)
         close();
 }
 
-bool KQIODeviceGZip::open(int mode)
+bool KQIODeviceGZip::open(OpenMode mode)
 {
     if (m_gzfile)
         close(); // One file is already open, so close it first.
diff --git a/kdecore/kqiodevicegzip_p.h b/kdecore/kqiodevicegzip_p.h
index 8c547a742..8ac0d3a0f 100644
--- a/kdecore/kqiodevicegzip_p.h
+++ b/kdecore/kqiodevicegzip_p.h
@@ -38,7 +38,7 @@ public:
     KQIODeviceGZip(const TQString& filename);
     ~KQIODeviceGZip(void);
 
-    bool open(int mode);
+    bool open(OpenMode mode);
     void close(void);
     void flush(void);
 
diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h
index bf1c8c04e..7ec934483 100644
--- a/kdecore/network/kclientsocketbase.h
+++ b/kdecore/network/kclientsocketbase.h
@@ -281,7 +281,7 @@ public:
    *
    * You should not call this function; instead, use @ref connect
    */
-  virtual inline bool open(int)
+  virtual inline bool open(OpenMode)
   { return connect(); }
 
   /**
diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp
index 08bd57121..185879841 100644
--- a/kdecore/network/kresolverstandardworkers.cpp
+++ b/kdecore/network/kresolverstandardworkers.cpp
@@ -667,7 +667,7 @@ KResolver::ErrorCodes KStandardWorker::addUnix()
   if (!m_encodedName.isEmpty())
     return KResolver::AddrFamily; // non local hostname
 
-  if (protocol() || static_cast<const char *>(protocolName()))
+  if (protocol() || !protocolName().isEmpty())
     return KResolver::BadFlags;	// cannot have Unix sockets with protocols
 
   TQString pathname = serviceName();
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 8b4789e02..54c15b156 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -171,7 +171,7 @@ bool KSocketDevice::setSocketOptions(int opts)
   return true;			// all went well
 }
 
-bool KSocketDevice::open(int)
+bool KSocketDevice::open(OpenMode)
 {
   resetError();
   return false;
diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h
index 5409335aa..4e7c6353d 100644
--- a/kdecore/network/ksocketdevice.h
+++ b/kdecore/network/ksocketdevice.h
@@ -142,7 +142,7 @@ public:
   /**
    * Reimplementation from TQIODevice. You should not call this function in sockets.
    */
-  virtual bool open(int mode);
+  virtual bool open(OpenMode mode);
 
   /**
    * Closes the socket. Reimplemented from TQIODevice.