diff options
| -rw-r--r-- | kdecore/kbufferedio.cpp | 10 | ||||
| -rw-r--r-- | kdecore/kconfigbackend.cpp | 2 | ||||
| -rw-r--r-- | kdecore/kextsock.cpp | 10 | ||||
| -rw-r--r-- | kdecore/kglobalaccel.cpp | 8 | ||||
| -rw-r--r-- | kdecore/kglobalaccel_x11.cpp | 2 | ||||
| -rw-r--r-- | kdecore/klocale.cpp | 10 | ||||
| -rw-r--r-- | kdecore/klocale.h | 10 |
7 files changed, 46 insertions, 6 deletions
diff --git a/kdecore/kbufferedio.cpp b/kdecore/kbufferedio.cpp index 5b9e66dce..951c41244 100644 --- a/kdecore/kbufferedio.cpp +++ b/kdecore/kbufferedio.cpp @@ -111,12 +111,22 @@ bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) return true; } +#ifdef USE_QT3 int KBufferedIO::bytesAvailable() const +#endif // USE_QT3 +#ifdef USE_QT4 +qint64 KBufferedIO::bytesAvailable() const +#endif // USE_QT4 { return readBufferSize(); } +#ifdef USE_QT3 int KBufferedIO::bytesToWrite() const +#endif // USE_QT3 +#ifdef USE_QT4 +qint64 KBufferedIO::bytesToWrite() const +#endif // USE_QT4 { return writeBufferSize(); } diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp index 09d3a65c1..3fa113180 100644 --- a/kdecore/kconfigbackend.cpp +++ b/kdecore/kconfigbackend.cpp @@ -1178,7 +1178,7 @@ bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser) if (!cmdToExec.isEmpty() && app) { KProcess lprocess; - lprocess << cmdToExec << "--title" << app->instanceName() << "--msgbox" << errorMsg.local8Bit(); + lprocess << cmdToExec << "--title" << app->instanceName() << "--msgbox" << TQCString(errorMsg.local8Bit()); lprocess.start( KProcess::Block ); } } diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp index dd670608c..6371bb7eb 100644 --- a/kdecore/kextsock.cpp +++ b/kdecore/kextsock.cpp @@ -222,7 +222,12 @@ KExtendedSocket::~KExtendedSocket() delete d; } +#ifdef USE_QT3 void KExtendedSocket::reset() +#endif // USE_QT3 +#ifdef USE_QT4 +bool KExtendedSocket::reset() +#endif // USE_QT4 { closeNow(); release(); @@ -1552,7 +1557,12 @@ int KExtendedSocket::unreadBlock(const char *, uint) return -1; } +#ifdef USE_QT3 int KExtendedSocket::bytesAvailable() const +#endif // USE_QT3 +#ifdef USE_QT4 +qint64 KExtendedSocket::bytesAvailable() const +#endif // USE_QT4 { if (d->status < connected || d->flags & passiveSocket) return -2; diff --git a/kdecore/kglobalaccel.cpp b/kdecore/kglobalaccel.cpp index a3c4ecf33..689b08616 100644 --- a/kdecore/kglobalaccel.cpp +++ b/kdecore/kglobalaccel.cpp @@ -54,10 +54,10 @@ void KGlobalAccel::clear() { d->clearActions(); } */ KAccelActions& KGlobalAccel::actions() - { return d->actions(); } + { return d->KAccelBase::actions(); } const KAccelActions& KGlobalAccel::actions() const - { return d->actions(); } + { return d->KAccelBase::actions(); } bool KGlobalAccel::isEnabled() { return ((KAccelBase*)d)->isEnabled(); } @@ -95,7 +95,7 @@ bool KGlobalAccel::remove( const TQString& sAction ) const KShortcut& KGlobalAccel::shortcut( const TQString& sAction ) const { - const KAccelAction* pAction = d->actions().actionPtr( sAction ); + const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->shortcut() : KShortcut::null(); } @@ -105,7 +105,7 @@ bool KGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, c { return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); } TQString KGlobalAccel::label( const TQString& sAction ) const { - const KAccelAction* pAction = d->actions().actionPtr( sAction ); + const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->label() : TQString(); } bool KGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable ) diff --git a/kdecore/kglobalaccel_x11.cpp b/kdecore/kglobalaccel_x11.cpp index 8721ecf1e..e9d86e576 100644 --- a/kdecore/kglobalaccel_x11.cpp +++ b/kdecore/kglobalaccel_x11.cpp @@ -431,7 +431,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s void KGlobalAccelPrivate::slotActivated( int iAction ) { - KAccelAction* pAction = actions().actionPtr( iAction ); + KAccelAction* pAction = KAccelBase::actions().actionPtr( iAction ); if( pAction ) activate( pAction, KKeySequence() ); } diff --git a/kdecore/klocale.cpp b/kdecore/klocale.cpp index 810103e9f..f83ec6be1 100644 --- a/kdecore/klocale.cpp +++ b/kdecore/klocale.cpp @@ -2077,12 +2077,22 @@ void KLocale::initFileNameEncoding(KConfig *) // which, on Unix platforms, use the locale's codec. } +#ifdef USE_QT3 TQCString KLocale::encodeFileNameUTF8( const TQString & fileName ) +#endif // USE_QT3 +#ifdef USE_QT4 +TQByteArray KLocale::encodeFileNameUTF8( const TQString & fileName ) +#endif // USE_QT4 { return fileName.utf8(); } +#ifdef USE_QT3 TQString KLocale::decodeFileNameUTF8( const TQCString & localFileName ) +#endif // USE_QT3 +#ifdef USE_QT4 +TQString KLocale::decodeFileNameUTF8( const TQByteArray & localFileName ) +#endif // USE_QT4 { return TQString::fromUtf8(localFileName); } diff --git a/kdecore/klocale.h b/kdecore/klocale.h index bab4c4adb..5f8be8f7c 100644 --- a/kdecore/klocale.h +++ b/kdecore/klocale.h @@ -1221,12 +1221,22 @@ private: /** * @internal A TQFile filename encoding function (TQFile::encodeFn). */ +#ifdef USE_QT3 static TQCString encodeFileNameUTF8( const TQString & fileName ); +#endif // USE_QT3 +#ifdef USE_QT4 + static TQByteArray encodeFileNameUTF8( const TQString & fileName ); +#endif // USE_QT4 /** * @internal TQFile filename decoding function (TQFile::decodeFn). */ +#ifdef USE_QT3 static TQString decodeFileNameUTF8( const TQCString & localFileName ); +#endif // USE_QT3 +#ifdef USE_QT4 + static TQString decodeFileNameUTF8( const TQByteArray & localFileName ); +#endif // USE_QT4 /** * @internal Changes the file name of the catalog to the correct |