summaryrefslogtreecommitdiffstats
path: root/src/modules/theme
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-24 21:28:39 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-31 16:31:47 +0900
commit7c3b44b81086c6b99f91e294c3b438dc808b47e2 (patch)
treed92d61649487df1a2fbd200d4ead11a7f16ba63f /src/modules/theme
parentcafbffba66b6ce809783ed1eb4d24aac6fe9701f (diff)
downloadkvirc-7c3b44b81086c6b99f91e294c3b438dc808b47e2.tar.gz
kvirc-7c3b44b81086c6b99f91e294c3b438dc808b47e2.zip
Drop USE_QT4 code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 030a2248f3630fd0404df98beffc78b5b5ca4c31)
Diffstat (limited to 'src/modules/theme')
-rw-r--r--src/modules/theme/managementdialog.cpp3
-rw-r--r--src/modules/theme/managementdialog.h5
-rw-r--r--src/modules/theme/packthemedialog.cpp21
-rw-r--r--src/modules/theme/savethemedialog.cpp9
-rw-r--r--src/modules/theme/themefunctions.cpp5
5 files changed, 0 insertions, 43 deletions
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 839f0f74..48b60869 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -55,9 +55,6 @@
#include <tqimage.h>
#include <kvi_tal_textedit.h>
//#include <tqmultilineedit.h>
-#ifdef COMPILE_USE_QT4
-#include <TQCloseEvent>
-#endif
#include <tqbuffer.h>
#include "kvi_options.h"
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 9d8967b0..cdb15705 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -29,13 +29,8 @@
#include "kvi_theme.h"
#include <tqdialog.h>
-#ifdef COMPILE_USE_QT4
-#include <tq3simplerichtext.h>
-#define KviTalSimpleRichText Q3SimpleRichText
-#else
#include <tqsimplerichtext.h>
#define KviTalSimpleRichText TQSimpleRichText
-#endif
#include "kvi_tal_listbox.h"
#include <tqcombobox.h>
#include "kvi_tal_popupmenu.h"
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 269fbfe9..7ae09b77 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -36,12 +36,7 @@
#include <tqtooltip.h>
#include <tqimage.h>
#include <kvi_tal_textedit.h>
-#ifdef COMPILE_USE_QT4
-#include <tq3multilineedit.h>
-#include <TQDateTime>
-#else
#include <tqmultilineedit.h>
-#endif
#include <tqbuffer.h>
#include <tqlabel.h>
#include <tqregexp.h>
@@ -333,11 +328,7 @@ void KviPackThemeDialog::imageSelectionChanged(const TQString &szImagePath)
{
TQPixmap out;
if(pix.width() > 300 || pix.height() > 225)
-#ifdef COMPILE_USE_QT4
- out.convertFromImage(pix.scaled(300,225,TQt::KeepAspectRatio,TQt::SmoothTransformation));
-#else
out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin));
-#endif
else
out.convertFromImage(pix);
m_pImageLabel->setPixmap(out);
@@ -374,11 +365,7 @@ bool KviPackThemeDialog::packTheme()
if(!pix.isNull())
{
if(pix.width() > 300 || pix.height() > 225)
- #ifdef COMPILE_USE_QT4
- out.convertFromImage(pix.scaled(300,225,TQt::KeepAspectRatio));
- #else
out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin));
-#endif
else
out.convertFromImage(pix);
} else {
@@ -407,11 +394,7 @@ bool KviPackThemeDialog::packTheme()
if(!out.isNull())
{
TQByteArray * pba = new TQByteArray();
-#ifdef COMPILE_USE_QT4
- TQBuffer buffer(pba,0);
-#else
TQBuffer buffer(*pba);
-#endif
buffer.open(IO_WriteOnly);
out.save(&buffer,"PNG");
buffer.close();
@@ -445,11 +428,7 @@ bool KviPackThemeDialog::packTheme()
{
KviTQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
TQByteArray * pba = new TQByteArray();
-#ifdef COMPILE_USE_QT4
- TQBuffer bufferz(pba,0);
-#else
TQBuffer bufferz(*pba);
-#endif
bufferz.open(IO_WriteOnly);
pixScreenshot.save(&bufferz,"PNG");
bufferz.close();
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index b6a93a0d..8e015309 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -36,12 +36,7 @@
#include <tqtooltip.h>
#include <tqimage.h>
#include <kvi_tal_textedit.h>
-#ifdef COMPILE_USE_QT4
-#include <tq3multilineedit.h>
-#include <TQDateTime>
-#else
#include <tqmultilineedit.h>
-#endif
#include <tqbuffer.h>
#include <tqlabel.h>
@@ -192,11 +187,7 @@ void KviSaveThemeDialog::imageSelectionChanged(const TQString &szImagePath)
{
TQPixmap out;
if(pix.width() > 300 || pix.height() > 225)
- #ifdef COMPILE_USE_QT4
- out.convertFromImage(pix.scaled(300,225,TQt::KeepAspectRatio));
- #else
out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin));
-#endif
else
out.convertFromImage(pix);
m_pImageLabel->setPixmap(out);
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index 280d0192..654f30bf 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -34,12 +34,7 @@
#include "kvi_sourcesdate.h"
#include "kvi_theme.h"
#include "kvi_frame.h"
-#ifdef COMPILE_USE_QT4
-#define KviTalMimeSourceFactory Q3MimeSourceFactory
-#include <tq3mimefactory.h>
-#else
#define KviTalMimeSourceFactory TQMimeSourceFactory
-#endif
#include <tqmime.h>
namespace KviThemeFunctions