aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/snd/libkvisnd.cpp26
-rw-r--r--src/modules/snd/libkvisnd.h13
-rw-r--r--src/modules/str/libkvistr.cpp49
-rw-r--r--src/modules/texticons/libkvitexticons.cpp3
-rw-r--r--src/modules/theme/libkvitheme.cpp12
-rw-r--r--src/modules/theme/managementdialog.cpp52
-rw-r--r--src/modules/theme/managementdialog.h23
-rw-r--r--src/modules/theme/packthemedialog.cpp60
-rw-r--r--src/modules/theme/packthemedialog.h8
-rw-r--r--src/modules/theme/savethemedialog.cpp44
-rw-r--r--src/modules/theme/savethemedialog.h7
-rw-r--r--src/modules/theme/themefunctions.cpp9
-rw-r--r--src/modules/theme/themefunctions.h4
13 files changed, 119 insertions, 191 deletions
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index c12d4e28a..3701bcb28 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -24,9 +24,9 @@
//=============================================================================
#include "libkvisnd.h"
+
#include "kvi_module.h"
#include "kvi_debug.h"
-
#include "kvi_fileutils.h"
#include "kvi_malloc.h"
#include "kvi_window.h"
@@ -34,13 +34,13 @@
#include "kvi_locale.h"
#include "kvi_qstring.h"
-#include <qsound.h>
+#include <QSound>
#ifdef COMPILE_ON_WINDOWS
#include <mmsystem.h>
#else //!COMPILE_ON_WINDOWS
- #include <qfile.h>
+ #include <QFile>
#include <unistd.h>
#include <errno.h>
@@ -103,16 +103,10 @@ KviSoundPlayer::KviSoundPlayer()
#endif //COMPILE_ARTS_SUPPORT
#endif //!COMPILE_ON_WINDOWS
-#if QT_VERSION >= 0x030100
if(QSound::isAvailable())
m_pSoundSystemDict->insert("qt",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playQt)));
-#else
- if(QSound::available())
- m_pSoundSystemDict->insert("qt",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playQt)));
-#endif
m_pSoundSystemDict->insert("null",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playNull)));
-
}
KviSoundPlayer::~KviSoundPlayer()
@@ -142,7 +136,6 @@ void KviSoundPlayer::getAvailableSoundSystems(QStringList *l)
}
}
-
bool KviSoundPlayer::havePlayingSounds()
{
return (m_pThreadList->count() > 0);
@@ -170,7 +163,6 @@ bool KviSoundPlayer::event(QEvent * e)
return QObject::event(e);
}
-
void KviSoundPlayer::detectSoundSystem()
{
#ifdef COMPILE_ON_WINDOWS
@@ -206,11 +198,7 @@ void KviSoundPlayer::detectSoundSystem()
KVI_OPTION_STRING(KviOption_stringSoundSystem) = "oss";
#endif
-#if QT_VERSION >= 0x030100
if(QSound::isAvailable())
-#else
- if(QSound::available())
-#endif
{
KVI_OPTION_STRING(KviOption_stringSoundSystem) = "qt";
return;
@@ -295,7 +283,6 @@ bool KviSoundPlayer::playNull(const QString &szFileName)
return true;
}
-
bool KviSoundPlayer::play(const QString &szFileName)
{
if(isMuted()) return true;
@@ -317,8 +304,6 @@ bool KviSoundPlayer::play(const QString &szFileName)
}
-
-
KviSoundThread::KviSoundThread(const QString &szFileName)
: KviThread()
{
@@ -616,7 +601,7 @@ static bool snd_kvs_cmd_autodetect(KviKvsModuleCommandCall * c)
} else {
c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sound system detected to: %s"),KVI_OPTION_STRING(KviOption_stringSoundSystem).utf8().data());
}
- return true;
+ return true;
}
@@ -731,7 +716,7 @@ static bool snd_module_ctrl(KviModule * m,const char * operation,void * param)
KVIRC_MODULE(
"Sound", // module name
- "1.0.0", // module version
+ "4.0.0", // module version
"(C) 2002 Szymon Stefanek (pragma at kvirc dot net)," \
"Juanjo Alvarez (juanjux at yahoo dot es)", // author & (C)
"Sound playing commands",
@@ -744,4 +729,3 @@ KVIRC_MODULE(
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "libkvisnd.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index a5fd3c63c..bfe419f71 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -24,15 +24,15 @@
//
#include "kvi_settings.h"
-
-#include <qobject.h>
-
-#include "kvi_thread.h"
-#include "kvi_string.h"
-
#include "kvi_pointerlist.h"
#include "kvi_pointerhashtable.h"
#include "kvi_options.h"
+#include "kvi_thread.h"
+#include "kvi_string.h"
+
+#include <QObject>
+
+class KviSoundPlayer;
//class KviWavSoundFileReader
//{
@@ -162,7 +162,6 @@ protected:
#endif //COMPILE_ARTS_SUPPORT
#endif //!COMPILE_ON_WINDOWS
-class KviSoundPlayer;
typedef bool (KviSoundPlayer::*SoundSystemRoutine)(const QString &szFileName);
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index af5ace281..788b5761b 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -25,17 +25,16 @@
//#warning: FIXME: Incomplete documentation ('seealso', 'example', etc)
#include "kvi_module.h"
-
#include "kvi_locale.h"
#include "kvi_mirccntrl.h"
#include "kvi_qstring.h"
#include "kvi_debug.h"
#include "kvi_settings.h"
#include "kvi_malloc.h"
-
#include "kvi_kvs_arraycast.h"
-#include <qregexp.h>
-#include <qclipboard.h>
+
+#include <QRegExp>
+#include <QClipboard>
#ifdef COMPILE_SSL_SUPPORT
#include <openssl/evp.h>
@@ -334,14 +333,8 @@ static bool str_kvs_fnc_isunsignednumber(KviKvsModuleFunctionCall * c)
if(!v->asNumber(nNum)) bRet = false;
else
{
- if(nNum.isInteger())
- {
- bRet = nNum.integer() >= 0;
- }
- else
- {
- bRet = nNum.real() >= 0.0;
- }
+ if(nNum.isInteger()) bRet = nNum.integer() >= 0;
+ else bRet = nNum.real() >= 0.0;
}
c->returnValue()->setBoolean(bRet);
return true;
@@ -586,8 +579,7 @@ static bool str_kvs_fnc_find(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("ocurrence",KVS_PT_INTEGER,KVS_PF_OPTIONAL,iOcurence)
KVSM_PARAMETERS_END(c)
int pos = 1;
- if(iOcurence!=0)
- pos = iOcurence;
+ if(iOcurence!=0) pos = iOcurence;
if(pos<1)
{
c->returnValue()->setInteger(-1);
@@ -1080,26 +1072,33 @@ static bool str_kvs_fnc_replacenocase(KviKvsModuleFunctionCall * c)
static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c)
{
- QString szString,szNewstr;
+ QString szString,szNewString;
+ int idx=0;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
KVSM_PARAMETERS_END(c)
- char * toReplace[]={" ", "#", "$", "&", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"};
- char * newStr[]={"%20", "%23", "%24", "&amp;", "%2F", "%3A", "&lt;", "%3D", "&gt;", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", "%7B", "%7C", "%7D", "%7E"};
+ const char * const toReplace[]={
+ " ", "#", "$", "/", ":",
+ "<", "=", ">", "?", "@",
+ "[", "\\", "]", "^", "`",
+ "{", "|", "}"
+ };
- /*
- for(int idx=0,idx<22,idx++)
- szNewstr=szString.replace(toReplace[idx],newStr[idx],false);
- */
+ const char * const newStr[]={
+ "%20", "%23", "%24", "%2F", "%3A",
+ "%3C", "%3D", "%3E", "%3F", "%40",
+ "%5B", "%5C", "%5D", "%5E", "%60",
+ "%7B", "%7C", "%7D"
+ };
- int idx=0;
- while(idx<20){
- szNewstr=szString.replace(toReplace[idx],newStr[idx],false);
+ while(idx<sizeof(toReplace))
+ {
+ szNewString=szString.replace(toReplace[idx],newStr[idx],false);
idx++;
}
- c->returnValue()->setString(szNewstr);
+ c->returnValue()->setString(szNewString);
return true;
}
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index 44ccca655..d026cffce 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -143,7 +143,6 @@ static bool texticons_module_init(KviModule * m)
return true;
}
-
static bool texticons_module_cleanup(KviModule *m)
{
return true;
@@ -151,7 +150,7 @@ static bool texticons_module_cleanup(KviModule *m)
KVIRC_MODULE(
"Texticons", // module name
- "1.0.0", // module version
+ "4.0.0", // module version
"Copyright (C) 2006 Alexey Uzhva (wizard at opendoor dot ru)",
"Texticons handling functions module",
texticons_module_init,
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 54f1359f6..e73d46be0 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -22,6 +22,9 @@
//
///////////////////////////////////////////////////////////////////////////////
+#include "managementdialog.h"
+#include "themefunctions.h"
+
#include "kvi_module.h"
#include "kvi_locale.h"
#include "kvi_qstring.h"
@@ -37,10 +40,7 @@
#include "kvi_fileutils.h"
#include "kvi_filedialog.h"
-#include "managementdialog.h"
-#include "themefunctions.h"
-
-#include <qfileinfo.h>
+#include <QFileInfo>
QRect g_rectManagementDialogGeometry(0,0,0,0);
@@ -182,8 +182,8 @@ static bool theme_module_can_unload(KviModule * m)
KVIRC_MODULE(
- "theme", // module name
- "1.0.0", // module version
+ "Theme", // module name
+ "4.0.0", // module version
"Copyright (C) 2006 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
"Theme management functions",
theme_module_init,
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index cef417909..43dbe7ee1 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -33,33 +33,6 @@
#include "savethemedialog.h"
#include "themefunctions.h"
-#include "kvi_iconmanager.h"
-#include "kvi_msgbox.h"
-
-
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include "kvi_tal_listbox.h"
-#include <qlineedit.h>
-#include <kvi_tal_textedit.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qfiledialog.h>
-#include "kvi_tal_popupmenu.h"
-#include <qcombobox.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qimage.h>
-#include <kvi_tal_textedit.h>
-//#include <qmultilineedit.h>
-#ifdef COMPILE_USE_QT4
-#include <QCloseEvent>
-#endif
-#include <qbuffer.h>
-
#include "kvi_options.h"
#include "kvi_locale.h"
#include "kvi_config.h"
@@ -74,13 +47,35 @@
#include "kvi_fileextensions.h"
#include "kvi_filedialog.h"
#include "kvi_dynamictooltip.h"
+#include "kvi_iconmanager.h"
+#include "kvi_msgbox.h"
+#include "kvi_tal_listbox.h"
+#include "kvi_tal_popupmenu.h"
+#include <kvi_tal_textedit.h>
+#include <kvi_tal_textedit.h>
+
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QRegExp>
+#include <QMessageBox>
+#include <QDir>
+#include <QStringList>
+#include <QDateTime>
+#include <QFileDialog>
+#include <QComboBox>
+#include <QPainter>
+#include <QToolTip>
+#include <QImage>
+#include <QBuffer>
+#include <QCloseEvent>
+//#include <q3multilineedit.h>
#include <stdlib.h> // rand & srand
extern QRect g_rectManagementDialogGeometry;
-
KviThemeListBoxItem::KviThemeListBoxItem(KviTalListBox * box,KviThemeInfo * inf)
: KviTalListBoxText(box)
{
@@ -245,7 +240,6 @@ void KviThemeManagementDialog::closeClicked()
m_pInstance = 0;
}
-
void KviThemeManagementDialog::display()
{
if(!m_pInstance)
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 9feb2117e..8aee0ce29 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -27,30 +27,23 @@
#include "kvi_optionswidget.h"
#include "kvi_pointerlist.h"
#include "kvi_theme.h"
-
-#include <qdialog.h>
-#ifdef COMPILE_USE_QT4
-#include <q3simplerichtext.h>
-#define KviTalSimpleRichText Q3SimpleRichText
-#else
-#include <qsimplerichtext.h>
-#define KviTalSimpleRichText QSimpleRichText
-#endif
#include "kvi_tal_listbox.h"
-#include <qcombobox.h>
#include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
#include <kvi_tal_wizard.h>
+#include <QDialog>
+#include <QComboBox>
+#include <QCursor>
+
+#include <q3simplerichtext.h>
+#define KviTalSimpleRichText Q3SimpleRichText
class QLineEdit;
-class KviTalTextEdit;
class QPushButton;
class QLabel;
class QCheckBox;
-
-//class QMultiLineEdit;
-
+//class Q3MultiLineEdit;
+class KviTalTextEdit;
class KviDynamicToolTip;
class KviStyledToolButton;
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 036c95434..ec34c13a3 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -25,28 +25,6 @@
#include "packthemedialog.h"
#include "themefunctions.h"
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qcombobox.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qimage.h>
-#include <kvi_tal_textedit.h>
-#ifdef COMPILE_USE_QT4
-#include <q3multilineedit.h>
-#include <QDateTime>
-#else
-#include <qmultilineedit.h>
-#endif
-#include <qbuffer.h>
-#include <qlabel.h>
-#include <qregexp.h>
-
-
#include "kvi_options.h"
#include "kvi_locale.h"
#include "kvi_config.h"
@@ -62,7 +40,23 @@
#include "kvi_selectors.h"
#include "kvi_miscutils.h"
#include "kvi_sourcesdate.h"
+#include <kvi_tal_textedit.h>
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QRegExp>
+#include <QMessageBox>
+#include <QDir>
+#include <QComboBox>
+#include <QPainter>
+#include <QToolTip>
+#include <QImage>
+#include <QDateTime>
+#include <QBuffer>
+#include <QLabel>
+
+#include <q3multilineedit.h>
KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviThemeInfo> * pThemeInfoList)
@@ -333,11 +327,7 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath)
{
QPixmap out;
if(pix.width() > 300 || pix.height() > 225)
-#ifdef COMPILE_USE_QT4
out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio,Qt::SmoothTransformation));
-#else
- out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
-#endif
else
out.convertFromImage(pix);
m_pImageLabel->setPixmap(out);
@@ -351,14 +341,12 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath)
m_pImageLabel->setPixmap(QPixmap());
}
-
void KviPackThemeDialog::accept()
{
if(!packTheme())return;
KviTalWizard::accept();
}
-
bool KviPackThemeDialog::packTheme()
{
m_pImageSelector->commit();
@@ -374,11 +362,7 @@ bool KviPackThemeDialog::packTheme()
if(!pix.isNull())
{
if(pix.width() > 300 || pix.height() > 225)
- #ifdef COMPILE_USE_QT4
out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
- #else
- out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
-#endif
else
out.convertFromImage(pix);
} else {
@@ -407,11 +391,7 @@ bool KviPackThemeDialog::packTheme()
if(!out.isNull())
{
QByteArray * pba = new QByteArray();
-#ifdef COMPILE_USE_QT4
- QBuffer buffer(pba,0);
-#else
- QBuffer buffer(*pba);
-#endif
+ QBuffer buffer(pba,0);
buffer.open(IO_WriteOnly);
out.save(&buffer,"PNG");
buffer.close();
@@ -445,11 +425,8 @@ bool KviPackThemeDialog::packTheme()
{
KviQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
QByteArray * pba = new QByteArray();
-#ifdef COMPILE_USE_QT4
+
QBuffer bufferz(pba,0);
-#else
- QBuffer bufferz(*pba);
-#endif
bufferz.open(IO_WriteOnly);
pixScreenshot.save(&bufferz,"PNG");
bufferz.close();
@@ -486,4 +463,3 @@ bool KviPackThemeDialog::packTheme()
return true;
}
-
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h
index 9834006a2..e28b96c41 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/packthemedialog.h
@@ -27,14 +27,14 @@
#include "kvi_settings.h"
#include "kvi_pointerlist.h"
#include "kvi_theme.h"
-
-#include <qdialog.h>
#include <kvi_tal_wizard.h>
+#include <QDialog>
+
class QLineEdit;
-class KviTalTextEdit;
class QLabel;
-class QMultiLineEdit;
+class Q3MultiLineEdit;
+class KviTalTextEdit;
class KviFileSelector;
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index a98780a7d..0732bd322 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -25,27 +25,6 @@
#include "savethemedialog.h"
#include "themefunctions.h"
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qcombobox.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qimage.h>
-#include <kvi_tal_textedit.h>
-#ifdef COMPILE_USE_QT4
-#include <q3multilineedit.h>
-#include <QDateTime>
-#else
-#include <qmultilineedit.h>
-#endif
-#include <qbuffer.h>
-#include <qlabel.h>
-
-
#include "kvi_options.h"
#include "kvi_locale.h"
#include "kvi_config.h"
@@ -61,7 +40,23 @@
#include "kvi_selectors.h"
#include "kvi_miscutils.h"
#include "kvi_sourcesdate.h"
+#include <kvi_tal_textedit.h>
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QRegExp>
+#include <QMessageBox>
+#include <QDir>
+#include <QComboBox>
+#include <QPainter>
+#include <QToolTip>
+#include <QImage>
+#include <QDateTime>
+#include <QBuffer>
+#include <QLabel>
+
+#include <q3multilineedit.h>
KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
@@ -192,11 +187,7 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
{
QPixmap out;
if(pix.width() > 300 || pix.height() > 225)
- #ifdef COMPILE_USE_QT4
out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
- #else
- out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
-#endif
else
out.convertFromImage(pix);
m_pImageLabel->setPixmap(out);
@@ -210,14 +201,12 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
m_pImageLabel->setPixmap(QPixmap());
}
-
void KviSaveThemeDialog::accept()
{
if(!saveTheme())return;
KviTalWizard::accept();
}
-
void KviSaveThemeDialog::makeScreenshot()
{
QString szFileName;
@@ -298,4 +287,3 @@ bool KviSaveThemeDialog::saveTheme()
return true;
}
-
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h
index 1ab9548ba..120c0f3ba 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/savethemedialog.h
@@ -27,17 +27,16 @@
#include "kvi_settings.h"
#include "kvi_pointerlist.h"
#include "kvi_theme.h"
-
-#include <qdialog.h>
#include <kvi_tal_wizard.h>
+#include <QDialog>
class QLineEdit;
-class KviTalTextEdit;
class QPushButton;
class QCheckBox;
class QLabel;
-class QMultiLineEdit;
+class Q3MultiLineEdit;
+class KviTalTextEdit;
class KviFileSelector;
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index 2afa21f3a..f19fd8360 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -34,13 +34,10 @@
#include "kvi_sourcesdate.h"
#include "kvi_theme.h"
#include "kvi_frame.h"
-#ifdef COMPILE_USE_QT4
-#define KviTalMimeSourceFactory Q3MimeSourceFactory
-#include <q3mimefactory.h>
-#else
-#define KviTalMimeSourceFactory QMimeSourceFactory
-#endif
+
#include <qmime.h>
+#include <q3mimefactory.h>
+#define KviTalMimeSourceFactory Q3MimeSourceFactory
namespace KviThemeFunctions
{
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h
index d3b058865..e35e0c82d 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/themefunctions.h
@@ -27,8 +27,8 @@
#include "kvi_settings.h"
#include "kvi_qstring.h"
-#include <qwidget.h>
-#include <qpixmap.h>
+#include <QWidget>
+#include <QPixmap>
namespace KviThemeFunctions
{