aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/core/KviQString.cpp8
-rw-r--r--src/kvilib/net/KviHttpRequest.h6
-rw-r--r--src/kvilib/net/KviUrl.cpp10
-rw-r--r--src/kvilib/tal/KviTalApplication.cpp6
-rw-r--r--src/kvilib/tal/KviTalApplication.h2
-rw-r--r--src/kvilib/tal/KviTalListWidget.cpp2
-rw-r--r--src/kvirc/kernel/KviApplication.cpp35
-rw-r--r--src/kvirc/ui/KviInputEditor.cpp7
-rw-r--r--src/kvirc/ui/KviInputEditor.h8
-rw-r--r--src/kvirc/ui/KviMainWindow.cpp4
-rw-r--r--src/kvirc/ui/KviThemedLabel.cpp19
-rw-r--r--src/kvirc/ui/KviThemedLineEdit.cpp27
-rw-r--r--src/modules/filetransferwindow/FileTransferWindow.cpp5
-rw-r--r--src/modules/help/HelpWidget.h6
-rw-r--r--src/modules/help/HelpWindow.h6
-rw-r--r--src/modules/mediaplayer/MpAmipInterface.cpp13
-rw-r--r--src/modules/mediaplayer/MpWinampInterface.cpp5
-rw-r--r--src/modules/objects/KvsObject_ftp.cpp11
-rw-r--r--src/modules/objects/KvsObject_http.cpp11
-rw-r--r--src/modules/objects/KvsObject_lcd.cpp4
-rw-r--r--src/modules/objects/KvsObject_sql.cpp2
-rw-r--r--src/modules/objects/KvsObject_sql.h6
-rw-r--r--src/modules/objects/KvsObject_widget.h6
-rw-r--r--src/modules/options/OptionsWidget_textEncoding.cpp4
-rw-r--r--src/modules/options/OptionsWidget_textIcons.cpp4
-rw-r--r--src/modules/snd/libkvisnd.cpp14
-rw-r--r--src/modules/theme/ThemeFunctions.cpp4
-rw-r--r--src/modules/trayicon/libkvitrayicon.cpp6
28 files changed, 27 insertions, 214 deletions
diff --git a/src/kvilib/core/KviQString.cpp b/src/kvilib/core/KviQString.cpp
index f14d3aee5..ec162474b 100644
--- a/src/kvilib/core/KviQString.cpp
+++ b/src/kvilib/core/KviQString.cpp
@@ -38,10 +38,6 @@
#include <stdio.h> // for sprintf()
#include <QRegExp>
-#if (QT_VERSION < 0x050000)
-#include <QTextDocument> // for Qt::escape()
-#endif
-
// kvi_string.cpp
extern unsigned char iso88591_toLower_map[256];
extern unsigned char iso88591_toUpper_map[256];
@@ -1306,10 +1302,6 @@ namespace KviQString
QString toHtmlEscaped(QString szData)
{
-#if (QT_VERSION >= 0x050000)
return szData.toHtmlEscaped();
-#else
- return Qt::escape(szData);
-#endif
}
}
diff --git a/src/kvilib/net/KviHttpRequest.h b/src/kvilib/net/KviHttpRequest.h
index b25e26c27..309a5eded 100644
--- a/src/kvilib/net/KviHttpRequest.h
+++ b/src/kvilib/net/KviHttpRequest.h
@@ -40,11 +40,7 @@
#include <QObject>
-#if (QT_VERSION >= 0x050000)
- #include <QtNetwork/QAbstractSocket>
-#else
- #include <QAbstractSocket>
-#endif
+#include <QtNetwork/QAbstractSocket>
class KviDnsResolver;
class KviDataBuffer;
diff --git a/src/kvilib/net/KviUrl.cpp b/src/kvilib/net/KviUrl.cpp
index c1da5b79e..02a9a6468 100644
--- a/src/kvilib/net/KviUrl.cpp
+++ b/src/kvilib/net/KviUrl.cpp
@@ -58,20 +58,12 @@ void KviUrl::parse()
QUrl url(m_szUrl);
m_szProtocol = url.scheme();
m_szHost = url.host();
-#if (QT_VERSION >= 0x050000)
- m_szPath.append(url.path(QUrl::FullyEncoded));
-#else
- m_szPath = url.encodedPath();
-#endif
+ m_szPath.append(url.path(QUrl::FullyEncoded));
if(url.hasQuery())
{
m_szPath.append(QChar('?'));
-#if (QT_VERSION >= 0x050000)
m_szPath.append(url.query(QUrl::FullyEncoded));
-#else
- m_szPath.append(url.encodedQuery());
-#endif
}
if(m_szPath.isEmpty()) m_szPath=QString("/");
m_szUser = url.userName();
diff --git a/src/kvilib/tal/KviTalApplication.cpp b/src/kvilib/tal/KviTalApplication.cpp
index 6b21f7a48..05ec0de59 100644
--- a/src/kvilib/tal/KviTalApplication.cpp
+++ b/src/kvilib/tal/KviTalApplication.cpp
@@ -33,10 +33,8 @@
KviTalApplication::KviTalApplication(int & iArgc, char ** ppcArgv)
: QApplication(iArgc,ppcArgv)
{
- #if (QT_VERSION >= 0x050000)
- // Session management has been broken by source incompatible changes.
- QObject::connect(this,SIGNAL(commitDataRequest(QSessionManager &)),this,SLOT(commitData(QSessionManager &)));
- #endif
+ // Session management has been broken by source incompatible changes.
+ QObject::connect(this,SIGNAL(commitDataRequest(QSessionManager &)),this,SLOT(commitData(QSessionManager &)));
}
#endif //!defined(COMPILE_KDE4_SUPPORT)
diff --git a/src/kvilib/tal/KviTalApplication.h b/src/kvilib/tal/KviTalApplication.h
index 94253d12d..0d0edc03b 100644
--- a/src/kvilib/tal/KviTalApplication.h
+++ b/src/kvilib/tal/KviTalApplication.h
@@ -75,9 +75,7 @@ public:
*/
virtual void saveConfiguration() = 0;
-#if (QT_VERSION >= 0x050000)
public Q_SLOTS:
-#endif
/**
* \brief Commits the data and save the session
* \param manager The session manager
diff --git a/src/kvilib/tal/KviTalListWidget.cpp b/src/kvilib/tal/KviTalListWidget.cpp
index 79d84c702..1a6ada36b 100644
--- a/src/kvilib/tal/KviTalListWidget.cpp
+++ b/src/kvilib/tal/KviTalListWidget.cpp
@@ -55,9 +55,7 @@ bool KviTalListWidget::eventFilter(QObject *o,QEvent * e)
{
// And this does not even work when the items should shrink...
// ...but well, that's the best we can do (but only under Qt5, as with Qt4 this is even protected).
-#if QT_VERSION >= 0x050000
emit model()->layoutChanged();
-#endif
// The model is hidden so we can't make these public.
//model()->beginResetModel();
//model()->endResetModel();
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 2ddf74392..81c5514f0 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -104,18 +104,11 @@
#include <QMessageBox>
#include <QTextCodec>
#include <QMetaObject>
-
-#if (QT_VERSION < 0x050000)
- #include <QCleanlooksStyle>
-#else
- #include <QCommonStyle>
-#endif
+#include <QCommonStyle>
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
#include <QPluginLoader>
- #if (QT_VERSION >= 0x050000)
- #include <QtWin>
- #endif
+ #include <QtWin>
#endif
#ifdef COMPILE_DBUS_SUPPORT
@@ -235,11 +228,7 @@ KviApplication::KviApplication(int &argc,char ** argv)
// workaround for gtk+ style forcing a crappy white background (ticket #777, #964, #1009, ..)
if(QString("QGtkStyle").compare(qApp->style()->metaObject()->className())==0)
{
-#if (QT_VERSION < 0x050000)
- setStyle(new QCleanlooksStyle());
-#else
setStyle(QStyleFactory::create("Fusion"));
-#endif
setPalette(style()->standardPalette());
}
#endif
@@ -305,11 +294,7 @@ void KviApplication::setup()
// encoding every time.
QTextCodec * pUTF8Codec = KviLocale::instance()->codecForName("UTF-8");
if(pUTF8Codec)
-#if (QT_VERSION >= 0x050000)
QTextCodec::setCodecForLocale(pUTF8Codec);
-#else
- QTextCodec::setCodecForCStrings(pUTF8Codec);
-#endif
else
qDebug("Aaargh... have no UTF-8 codec?");
@@ -649,13 +634,9 @@ bool KviApplication::supportsCompositing()
#endif
#ifdef COMPILE_QX11INFO_SUPPORT
- #if (QT_VERSION >= 0x050000)
- // Qt5 does not support QX11Info::isCompositingManagerRunning()
- // Well...assume we're compositing capable, should be true on all recent linux distros
- return true;
- #else
- return QX11Info::isCompositingManagerRunning();
- #endif
+ // Qt5 does not support QX11Info::isCompositingManagerRunning()
+ // Well...assume we're compositing capable, should be true on all recent linux distros
+ return true;
#endif // COMPILE_QX11INFO_SUPPORT
#ifdef COMPILE_ON_MAC
return true;
@@ -1323,11 +1304,7 @@ void KviApplication::updatePseudoTransparency()
SelectObject(bitmap_dc, null_bitmap);
DeleteDC(bitmap_dc);
- #if (QT_VERSION >= 0x050000)
- QPixmap pix = QtWin::fromHBITMAP(bitmap);
- #else
- QPixmap pix = QPixmap::fromWinHBITMAP(bitmap);
- #endif
+ QPixmap pix = QtWin::fromHBITMAP(bitmap);
DeleteObject(bitmap);
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 39b37c630..02fdd8091 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -63,16 +63,11 @@
#include <QFontMetrics>
#include <QKeyEvent>
#include <QDragEnterEvent>
-#if (QT_VERSION < 0x050000)
- #include <QInputContext>
-#endif
#include <QMenu>
#include <QWidgetAction>
#include <QTextBoundaryFinder>
-#if (QT_VERSION >= 0x050000)
- #include <qdrawutil.h> // qDrawShadePanel
-#endif
+#include <qdrawutil.h> // qDrawShadePanel
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
#include <windows.h>
diff --git a/src/kvirc/ui/KviInputEditor.h b/src/kvirc/ui/KviInputEditor.h
index 3d90a932f..75edcef62 100644
--- a/src/kvirc/ui/KviInputEditor.h
+++ b/src/kvirc/ui/KviInputEditor.h
@@ -63,11 +63,7 @@ class KviUserListView;
#define KVI_INPUT_DEF_FORE 101
#ifndef ACCEL_KEY
- #if (QT_VERSION >= 0x050000)
- #define ACCEL_KEY(k) "\t" + QKeySequence(Qt::ControlModifier | Qt::Key_ ## k ).toString()
- #else
- #define ACCEL_KEY(k) "\t" + QString(QKeySequence(Qt::ControlModifier | Qt::Key_ ## k ))
- #endif
+ #define ACCEL_KEY(k) "\t" + QKeySequence(Qt::ControlModifier | Qt::Key_ ## k ).toString()
#endif
class KviInputEditorSpellCheckerBlock
@@ -937,9 +933,7 @@ protected:
virtual void dragEnterEvent(QDragEnterEvent * e);
virtual void dropEvent(QDropEvent * e);
virtual void inputMethodEvent(QInputMethodEvent * e) ;
-#if (QT_VERSION >= 0x050000)
virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
-#endif
virtual void paintEvent(QPaintEvent * e);
bool checkWordSpelling(const QString &szWord);
void splitTextIntoSpellCheckerBlocks(const QString &szText,KviPointerList<KviInputEditorSpellCheckerBlock> &lBuffer);
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index bcb49d4cb..a3d44c38e 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -361,11 +361,7 @@ void KviMainWindow::freeAccelleratorKeySequence(QString & key)
void KviMainWindow::accelActivated()
{
-#if (QT_VERSION >= 0x050000)
KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(((QShortcut *)sender())->key()).toString());
-#else
- KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(QString)(((QShortcut *)sender())->key()));
-#endif
}
void KviMainWindow::executeInternalCommand(int index)
diff --git a/src/kvirc/ui/KviThemedLabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp
index ee2f4b1e2..9b94639f1 100644
--- a/src/kvirc/ui/KviThemedLabel.cpp
+++ b/src/kvirc/ui/KviThemedLabel.cpp
@@ -34,9 +34,7 @@
#include <QPainter>
#include <QStyleOptionFrameV2>
-#if (QT_VERSION >= 0x050000)
- #include <qdrawutil.h> // qDrawShadePanel
-#endif
+#include <qdrawutil.h> // qDrawShadePanel
#ifdef COMPILE_PSEUDO_TRANSPARENCY
extern QPixmap * g_pShadedChildGlobalDesktopBackground;
@@ -47,12 +45,7 @@ KviThemedLabel::KviThemedLabel(QWidget * par, KviWindow * pWindow,const char * n
{
setObjectName(name);
m_pKviWindow = pWindow;
-
-#if (QT_VERSION < 0x050000)
- setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
-#else
setMargin(4);
-#endif
setAutoFillBackground(false);
applyOptions();
}
@@ -86,20 +79,10 @@ void KviThemedLabel::paintEvent(QPaintEvent *e)
#ifdef COMPILE_PSEUDO_TRANSPARENCY
QPainter *p = new QPainter(this);
-#if (QT_VERSION >= 0x050000)
// In Qt5 QStyle::drawPrimitive seems to always overwrite the background, no matter what.
qDrawShadePanel(p,0,0,width(),height(),palette(),true,1,NULL);
QRect r(1,1,width()-2,height()-2);
-#else
- QStyleOptionFrameV2 option;
- option.initFrom(this);
-
- style()->drawPrimitive(QStyle::PE_FrameLineEdit, &option, p, this);
-
- QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &option, this);
-
-#endif
if(KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency) && g_pApp->supportsCompositing())
{
diff --git a/src/kvirc/ui/KviThemedLineEdit.cpp b/src/kvirc/ui/KviThemedLineEdit.cpp
index cbff5e918..6310898ea 100644
--- a/src/kvirc/ui/KviThemedLineEdit.cpp
+++ b/src/kvirc/ui/KviThemedLineEdit.cpp
@@ -35,10 +35,7 @@
#include <QStyleOptionFrameV2>
#include <QPaintEvent>
-#if (QT_VERSION >= 0x050000)
- #include <qdrawutil.h> // qDrawShadePanel
-#endif
-
+#include <qdrawutil.h> // qDrawShadePanel
#ifdef COMPILE_PSEUDO_TRANSPARENCY
extern QPixmap * g_pShadedChildGlobalDesktopBackground;
@@ -50,7 +47,6 @@ KviThemedLineEdit::KviThemedLineEdit(QWidget * par, KviWindow * pWindow,const ch
setObjectName(name);
m_pKviWindow = pWindow;
-#if (QT_VERSION >= 0x050000)
setFrame(false);
int l,t,r,b;
@@ -60,8 +56,6 @@ KviThemedLineEdit::KviThemedLineEdit(QWidget * par, KviWindow * pWindow,const ch
if(r < 4)
r = 4;
setTextMargins(l,t,r,b);
-#endif
-
setAutoFillBackground(false);
applyOptions();
@@ -97,29 +91,10 @@ void KviThemedLineEdit::paintEvent ( QPaintEvent * event )
QPainter *p = new QPainter(this);
QPalette pal = palette();
-#if (QT_VERSION >= 0x050000)
// In Qt5 QStyle::drawPrimitive seems to always overwrite the background, no matter what.
qDrawShadePanel(p,0,0,width(),height(),palette(),true,1,NULL);
QRect r(1,1,width()-2,height()-2);
-#else
-
- QStyleOptionFrameV2 option;
-
- option.initFrom(this);
- option.rect = contentsRect();
- option.lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, &option, this);
- option.midLineWidth = 0;
- option.state |= QStyle::State_Sunken;
- if(isReadOnly())
- option.state |= QStyle::State_ReadOnly;
- option.features = QStyleOptionFrameV2::None;
-
- style()->drawPrimitive(QStyle::PE_FrameLineEdit, &option, p, this);
-
- QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &option, this);
-
-#endif
if(KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency) && g_pApp->supportsCompositing())
{
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 <QtWebKit/QWebView>
- #else
- #include <QtWebKitWidgets/QWebView>
- #endif
+ #include <QtWebKitWidgets/QWebView>
#include <QToolBar>
#include <QVBoxLayout>
#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 <QTabWidget>
#ifdef COMPILE_WEBKIT_SUPPORT
- #if (QT_VERSION < 0x050000)
- #include <QtWebKit/QWebView>
- #else
- #include <QtWebKitWidgets/QWebView>
- #endif
+ #include <QtWebKitWidgets/QWebView>
#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 <qftp.h>
-#else
- // Use standard QFtp
- #include <QFtp>
-#endif
+// Qt >= 5.0.0 has no QFtp.
+// We use the external source code module provided by digia (in qtftp)
+#include <qftp.h>
#include <QHashIterator>
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 <qhttp.h>
-#else
- // Use standard QHttp
- #include <QHttp>
-#endif
+// Qt >= 5.0.0 has no QHttp.
+// We use the external source code module provided by digia (in qthttp)
+#include <qhttp.h>
#include <QUrl>
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 <stdlib.h>
#include <QHash>
-#if (QT_VERSION >= 0x050000)
#include <QSqlDriver>
#include <QSqlError>
#include <QSqlRecord>
-#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 <QSqlQuery>
-#else
- #include <QtSql>
-#endif
+#include <QSqlQuery>
#include <QHash>
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 <QGraphicsEffect>
#ifdef COMPILE_WEBKIT_SUPPORT
- #if (QT_VERSION < 0x050000)
- #include <QtWebKit/QWebView>
- #else
- #include <QtWebKitWidgets/QWebView>
- #endif
+ #include <QtWebKitWidgets/QWebView>
#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 <Windows.h>
#else
- #if QT_VERSION >= 0x050000
- #define ICON_SIZE 48
- #else
- #define ICON_SIZE 22
- #endif
+ #define ICON_SIZE 48
#endif
extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 08:13:15 +0000