From 22ca84d4d22ed7e39c626981e5ae85e9287c3edb Mon Sep 17 00:00:00 2001 From: wodim Date: Thu, 7 Apr 2016 13:00:54 +0200 Subject: Remove all ifdefs related to older versions of Qt. Now that we only support Qt 5 we will no longer need these. --- src/modules/filetransferwindow/FileTransferWindow.cpp | 5 ----- src/modules/help/HelpWidget.h | 6 +----- src/modules/help/HelpWindow.h | 6 +----- src/modules/mediaplayer/MpAmipInterface.cpp | 13 ------------- src/modules/mediaplayer/MpWinampInterface.cpp | 5 ----- src/modules/objects/KvsObject_ftp.cpp | 11 +++-------- src/modules/objects/KvsObject_http.cpp | 11 +++-------- src/modules/objects/KvsObject_lcd.cpp | 4 ---- src/modules/objects/KvsObject_sql.cpp | 2 -- src/modules/objects/KvsObject_sql.h | 6 +----- src/modules/objects/KvsObject_widget.h | 6 +----- src/modules/options/OptionsWidget_textEncoding.cpp | 4 ---- src/modules/options/OptionsWidget_textIcons.cpp | 4 ---- src/modules/snd/libkvisnd.cpp | 14 ++------------ src/modules/theme/ThemeFunctions.cpp | 4 ---- src/modules/trayicon/libkvitrayicon.cpp | 6 +----- 16 files changed, 13 insertions(+), 94 deletions(-) (limited to 'src/modules') diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index bd1edbba9..255c9baf4 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -141,13 +141,8 @@ FileTransferWidget::FileTransferWidget(QWidget * pParent) setHorizontalHeaderLabels(colHeaders); //default column widths setColumnWidth(0, FILETRANSFERW_CELLSIZE); -#if (QT_VERSION >= 0x050000) horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed); horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive); -#else - horizontalHeader()->setResizeMode(0, QHeaderView::Fixed); - horizontalHeader()->setResizeMode(1, QHeaderView::Interactive); -#endif setColumnWidth(1, 500); horizontalHeader()->setStretchLastSection(true); //focus policy diff --git a/src/modules/help/HelpWidget.h b/src/modules/help/HelpWidget.h index 7d22fb9d4..79a3d78fa 100644 --- a/src/modules/help/HelpWidget.h +++ b/src/modules/help/HelpWidget.h @@ -28,11 +28,7 @@ #include "kvi_settings.h" #ifdef COMPILE_WEBKIT_SUPPORT - #if (QT_VERSION < 0x050000) - #include - #else - #include - #endif + #include #include #include #else diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h index 6c6996be7..0c4d5f831 100644 --- a/src/modules/help/HelpWindow.h +++ b/src/modules/help/HelpWindow.h @@ -32,11 +32,7 @@ #include #ifdef COMPILE_WEBKIT_SUPPORT - #if (QT_VERSION < 0x050000) - #include - #else - #include - #endif + #include #else class QTextBrowser; #endif diff --git a/src/modules/mediaplayer/MpAmipInterface.cpp b/src/modules/mediaplayer/MpAmipInterface.cpp index 4b41ff9c2..1e01aac05 100644 --- a/src/modules/mediaplayer/MpAmipInterface.cpp +++ b/src/modules/mediaplayer/MpAmipInterface.cpp @@ -94,12 +94,7 @@ static bool loadAmipDll() static QTextCodec * mediaplayer_get_codec() { QTextCodec * pCodec = 0; - -#if (QT_VERSION < 0x050000) - pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toLatin1()); -#else pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toUtf8()); -#endif if(!pCodec) pCodec = QTextCodec::codecForLocale(); @@ -244,11 +239,7 @@ QString MpAmipInterface::mrl() QTextCodec * pCodec = mediaplayer_get_codec(); if(pCodec) { -#if (QT_VERSION < 0x050000) - szRet = pCodec->toUnicode(szFn.toLatin1()); -#else szRet = pCodec->toUnicode(szFn.toUtf8()); -#endif } else { szRet = szFn; } @@ -265,11 +256,7 @@ QString getAmipString(const char * var) QString szString = eval_str(var); QTextCodec * pCodec = mediaplayer_get_codec(); if(pCodec) { -#if (QT_VERSION < 0x050000) - szRet = pCodec->toUnicode(szString.toLatin1()); -#else szRet = pCodec->toUnicode(szString.toUtf8()); -#endif } else { szRet = szString; } diff --git a/src/modules/mediaplayer/MpWinampInterface.cpp b/src/modules/mediaplayer/MpWinampInterface.cpp index 8d6981fd3..08666c864 100644 --- a/src/modules/mediaplayer/MpWinampInterface.cpp +++ b/src/modules/mediaplayer/MpWinampInterface.cpp @@ -167,12 +167,7 @@ static QTextCodec * mediaplayer_get_codec() { QTextCodec * pCodec = 0; - -#if (QT_VERSION < 0x050000) - pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toLatin1()); -#else pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toUtf8()); -#endif if(!pCodec) pCodec = QTextCodec::codecForLocale(); diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp index adfebfa36..5b25cda6a 100644 --- a/src/modules/objects/KvsObject_ftp.cpp +++ b/src/modules/objects/KvsObject_ftp.cpp @@ -30,14 +30,9 @@ #include "KviLocale.h" -#if (QT_VERSION > 0x050000) - // Qt >= 5.0.0 has no QFtp. - // We use the external source code module provided by digia (in qtftp) - #include -#else - // Use standard QFtp - #include -#endif +// Qt >= 5.0.0 has no QFtp. +// We use the external source code module provided by digia (in qtftp) +#include #include diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index 57bb11d74..7a83bbc10 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -28,14 +28,9 @@ #include "KviError.h" #include "KviLocale.h" -#if (QT_VERSION > 0x050000) - // Qt >= 5.0.0 has no QHttp. - // We use the external source code module provided by digia (in qthttp) - #include -#else - // Use standard QHttp - #include -#endif +// Qt >= 5.0.0 has no QHttp. +// We use the external source code module provided by digia (in qthttp) +#include #include diff --git a/src/modules/objects/KvsObject_lcd.cpp b/src/modules/objects/KvsObject_lcd.cpp index b770a1ac5..39c8f3489 100644 --- a/src/modules/objects/KvsObject_lcd.cpp +++ b/src/modules/objects/KvsObject_lcd.cpp @@ -164,11 +164,7 @@ KVSO_CLASS_FUNCTION(lcd,setNumDigits) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit) KVSO_PARAMETERS_END(c) -#if (QT_VERSION >= 0x050000) ((QLCDNumber *)widget())->setDigitCount((int)digit); -#else - ((QLCDNumber *)widget())->setNumDigits((int)digit); -#endif return true; } diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp index 722f1724b..9e212c8b8 100644 --- a/src/modules/objects/KvsObject_sql.cpp +++ b/src/modules/objects/KvsObject_sql.cpp @@ -29,11 +29,9 @@ #include "KvsObject_memoryBuffer.h" #include #include -#if (QT_VERSION >= 0x050000) #include #include #include -#endif #define CHECK_QUERY_IS_INIT if (!m_pCurrentSQlQuery)\ {\ diff --git a/src/modules/objects/KvsObject_sql.h b/src/modules/objects/KvsObject_sql.h index ac8ebf2b5..dff227903 100644 --- a/src/modules/objects/KvsObject_sql.h +++ b/src/modules/objects/KvsObject_sql.h @@ -29,11 +29,7 @@ #include "KviPointerList.h" #include "KviKvsVariant.h" #include "object_macros.h" -#if (QT_VERSION >= 0x050000) - #include -#else - #include -#endif +#include #include class KvsObject_sql : public KviKvsObject diff --git a/src/modules/objects/KvsObject_widget.h b/src/modules/objects/KvsObject_widget.h index 054f1af2e..0f49ce25d 100644 --- a/src/modules/objects/KvsObject_widget.h +++ b/src/modules/objects/KvsObject_widget.h @@ -33,11 +33,7 @@ #include #ifdef COMPILE_WEBKIT_SUPPORT - #if (QT_VERSION < 0x050000) - #include - #else - #include - #endif + #include #endif class KvsObject_widget : public KviKvsObject diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index 415a8c460..c037d174b 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -156,11 +156,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) header << __tr2qs_ctx("Language code", "options"); header << __tr2qs_ctx("Provided by", "options"); m_pSpellCheckerDictionaries->setHorizontalHeaderLabels(header); -#if (QT_VERSION >= 0x050000) m_pSpellCheckerDictionaries->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); -#else - m_pSpellCheckerDictionaries->horizontalHeader()->setResizeMode(QHeaderView::Stretch); -#endif m_pSpellCheckerDictionaries->setSelectionBehavior(QAbstractItemView::SelectRows); m_pSpellCheckerDictionaries->setSelectionMode(QAbstractItemView::SingleSelection); m_pSpellCheckerDictionaries->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index 957555776..c55fef5bf 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -80,11 +80,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) m_pTable->setColumnCount(2); m_pTable->setColumnWidth(0,300); -#if (QT_VERSION >= 0x050000) m_pTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); -#else - m_pTable->horizontalHeader()->setResizeMode(QHeaderView::Stretch); -#endif m_pTable->horizontalHeader()->stretchLastSection(); m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows); m_pTable->setSelectionMode(QAbstractItemView::SingleSelection); diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index fb0f3f383..ff0779868 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -239,18 +239,8 @@ void KviSoundPlayer::detectSoundSystem() KVI_OPTION_STRING(KviOption_stringSoundSystem) = "oss"; #endif -#if (QT_VERSION < 0x050000) - if(QSound::isAvailable()) -#else - // on qt5 QSound::isAvailable() is not available anymore - // Note: consider the use of QMediaPlayer - if(true) -#endif - { - KVI_OPTION_STRING(KviOption_stringSoundSystem) = "qt"; - return; - } - KVI_OPTION_STRING(KviOption_stringSoundSystem) = "null"; + KVI_OPTION_STRING(KviOption_stringSoundSystem) = "qt"; + return; #endif } diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index 2e7d7444f..52a429021 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -367,11 +367,7 @@ namespace ThemeFunctions if(bMaximizeFrame) g_pMainWindow->showMaximized(); -#if (QT_VERSION >= 0x050000) QPixmap pix = g_pMainWindow->grab(); -#else - QPixmap pix = QPixmap::grabWidget(g_pMainWindow); -#endif bool bResult = true; if(pix.isNull()) diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index a66f6864a..f919de909 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -57,11 +57,7 @@ #define ICON_SIZE 16 #include #else - #if QT_VERSION >= 0x050000 - #define ICON_SIZE 48 - #else - #define ICON_SIZE 22 - #endif + #define ICON_SIZE 48 #endif extern KVIRC_API KviPointerHashTable * g_pGlobalWindowDict; -- cgit v1.3.1-10-gc9f91