From 7c3b44b81086c6b99f91e294c3b438dc808b47e2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 24 Aug 2023 21:28:39 +0900 Subject: Drop USE_QT4 code Signed-off-by: Michele Calgaro (cherry picked from commit 030a2248f3630fd0404df98beffc78b5b5ca4c31) --- src/modules/theme/managementdialog.cpp | 3 --- src/modules/theme/managementdialog.h | 5 ----- src/modules/theme/packthemedialog.cpp | 21 --------------------- src/modules/theme/savethemedialog.cpp | 9 --------- src/modules/theme/themefunctions.cpp | 5 ----- 5 files changed, 43 deletions(-) (limited to 'src/modules/theme') 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 #include //#include -#ifdef COMPILE_USE_QT4 -#include -#endif #include #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 -#ifdef COMPILE_USE_QT4 -#include -#define KviTalSimpleRichText Q3SimpleRichText -#else #include #define KviTalSimpleRichText TQSimpleRichText -#endif #include "kvi_tal_listbox.h" #include #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 #include #include -#ifdef COMPILE_USE_QT4 -#include -#include -#else #include -#endif #include #include #include @@ -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 #include #include -#ifdef COMPILE_USE_QT4 -#include -#include -#else #include -#endif #include #include @@ -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 -#else #define KviTalMimeSourceFactory TQMimeSourceFactory -#endif #include namespace KviThemeFunctions -- cgit v1.2.1