diff options
-rw-r--r-- | konq-plugins/searchbar/searchbar.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/oblique/kbuffer.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/oblique/kbuffer.h | 9 |
3 files changed, 0 insertions, 17 deletions
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 0752ada..524e95d 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -537,13 +537,9 @@ void SearchBarPlugin::updateComboVisibility() void SearchBarPlugin::focusSearchbar() { -#ifdef USE_QT4 - m_searchCombo->setFocus(); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Shortcut ); m_searchCombo->setFocus(); TQFocusEvent::resetReason(); -#endif // USE_QT4 } SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : diff --git a/noatun-plugins/oblique/kbuffer.cpp b/noatun-plugins/oblique/kbuffer.cpp index 6c08025..b7e5ae0 100644 --- a/noatun-plugins/oblique/kbuffer.cpp +++ b/noatun-plugins/oblique/kbuffer.cpp @@ -33,11 +33,7 @@ void TDEBuffer::flush(){ } /** query buffer size */ -#ifdef USE_QT4 -qint64 TDEBuffer::size() const { -#else // USE_QT4 TQ_ULONG TDEBuffer::size() const { -#endif // USE_QT4 return buf.size(); } diff --git a/noatun-plugins/oblique/kbuffer.h b/noatun-plugins/oblique/kbuffer.h index 18f9b3b..2971253 100644 --- a/noatun-plugins/oblique/kbuffer.h +++ b/noatun-plugins/oblique/kbuffer.h @@ -23,11 +23,7 @@ public: /** read in a block of memory */ TQ_LONG readBlock(char* data, long unsigned int maxLen); /** query buffer size */ -#ifdef USE_QT4 - qint64 size() const; -#else // USE_QT4 TQ_ULONG size() const; -#endif // USE_QT4 /** No descriptions */ void flush(); /** Close buffer */ @@ -45,11 +41,6 @@ public: return &buf[0]; } -#ifdef USE_QT4 - virtual inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); } - virtual inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); } -#endif // USE_QT4 - private: std::vector<char> buf; std::vector<char>::iterator bufPos; |