summaryrefslogtreecommitdiffstats
path: root/src/kvirc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvirc/kernel')
-rw-r--r--src/kvirc/kernel/kvi_action.cpp3
-rw-r--r--src/kvirc/kernel/kvi_app.cpp46
-rw-r--r--src/kvirc/kernel/kvi_coreactions.cpp20
-rw-r--r--src/kvirc/kernel/kvi_iconmanager.cpp14
-rw-r--r--src/kvirc/kernel/kvi_ipc.cpp6
-rw-r--r--src/kvirc/kernel/kvi_ipc.h5
-rw-r--r--src/kvirc/kernel/kvi_lagmeter.cpp2
-rw-r--r--src/kvirc/kernel/kvi_options.h12
-rw-r--r--src/kvirc/kernel/kvi_theme.cpp4
9 files changed, 1 insertions, 111 deletions
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index 490a1ac..91da5b4 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -418,9 +418,6 @@ TQWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar)
visibleName(),
visibleName(),
this,TQT_SLOT(activate()),pParentToolBar,m_szName);
-#ifdef COMPILE_USE_QT4
- pParentToolBar->addWidget(b);
-#endif
if(!isEnabled())b->setEnabled(false);
registerWidget(b);
return b;
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index a908023..0cfc7b7 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -90,9 +90,6 @@
#include <tqstringlist.h>
#include "kvi_pointerhashtable.h"
#include <tqmime.h>
-#ifdef COMPILE_USE_QT4
- #include <tq3mimefactory.h>
-#endif
#include "kvi_tal_listbox.h"
#include <tqclipboard.h>
#include <tqmessagebox.h>
@@ -103,17 +100,8 @@
#include "kvi_ssl.h"
#endif
-#ifdef COMPILE_USE_QT4
-#ifdef COMPILE_ON_WINDOWS
-#include <TQPluginLoader>
-#endif
-#endif
-#ifdef COMPILE_USE_QT4
- #include <TQTextDocument>
-#else
#include <tqstylesheet.h>
-#endif
KVIRC_API KviApp * g_pApp = 0; // global application pointer
@@ -223,16 +211,6 @@ void KviApp::setup()
loadDirectories();
KviStringConversion::init(m_szGlobalKvircDir,m_szLocalKvircDir);
-#ifdef COMPILE_USE_QT4
-#ifdef COMPILE_ON_WINDOWS
- //need to load image plugins:(
- TQString szPluginsDir;
- getGlobalKvircDirectory(szPluginsDir,None,"qt-plugins/");
- setLibraryPaths(TQStringList(szPluginsDir));
- //KviMessageBox::information(libraryPaths().join(";"));
- //tqDebug("%1",loader.isLoaded());
-#endif
-#endif
// check if we want to permanently disable the splash screen
// we do it once for every version: the user should see the new splash screens at least once
@@ -269,11 +247,7 @@ void KviApp::setup()
list.append(tmp);
getGlobalKvircDirectory(tmp,HelpNoIntl);
list.append(tmp);
-#ifdef COMPILE_USE_QT4
- Q3MimeSourceFactory::defaultFactory()->setFilePath(list);
-#else
TQMimeSourceFactory::defaultFactory()->setFilePath(list);
-#endif
KVI_SPLASH_SET_PROGRESS(1)
@@ -475,18 +449,6 @@ void KviApp::setup()
KviDoubleBuffer::init();
-#ifdef COMPILE_USE_QT4
- TQString szStylesheetFile;
- getGlobalKvircDirectory(szStylesheetFile,Config,"style.css");
- if(KviFileUtils::fileExists(szStylesheetFile))
- {
- TQString szStyleData;
- KviFileUtils::readFile(szStylesheetFile,szStyleData);
- szStyleData.replace("global://",m_szGlobalKvircDir);
- szStyleData.replace("local://",m_szLocalKvircDir);
- setStyleSheet(szStyleData);
- }
-#endif
// create the frame window, we're almost up and running...
createFrame();
@@ -693,7 +655,6 @@ TQTextCodec * KviApp::defaultTextCodec()
void KviApp::contextSensitiveHelp()
{
// this stuff doesn't work with TQt 4.x
-#ifndef COMPILE_USE_QT4
// the F1 Key has been pressed
// try to pass it to the active widget or one of its parents
TQWidget * w = g_pApp->focusWidget();
@@ -716,7 +677,6 @@ void KviApp::contextSensitiveHelp()
// no way
// FIXME: just show up simple plain online help
//tqDebug("No way: found no focus widget for that...");
-#endif
}
@@ -737,9 +697,7 @@ void KviApp::loadDefaultScript()
#endif
KviKvsScript::run(cmd,g_pFrame->firstConsole());
// now line up the toolbars (they may get messed while loading the script)
-#ifndef COMPILE_USE_QT4
g_pFrame->lineUpDockWindows(); // missing on TQt 4.x
-#endif
}
// 07.01.2005 06:01: Got this curious gcc error while writing
@@ -1054,11 +1012,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
szMsg += szLocalFileName;
szMsg += ")";
}
-#ifdef COMPILE_USE_QT4
- notifierMessage(0,iIconId,TQt::escape(szMsg),30);
-#else
notifierMessage(0,iIconId,TQStyleSheet::escape(szMsg),30);
-#endif
}
return;
}
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 8a66430..9650e6d 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -466,13 +466,10 @@ void KviIrcContextDisplayAction::setup()
bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *p)
{
- // QT4SUX: Widgets can be no longer added to popup menus.. what about labels ?
-#ifndef COMPILE_USE_QT4
if(!setupDone())setup();
KviIrcContextDisplay * w = new KviIrcContextDisplay(p,"kvirc.irccontextdisplay");
registerWidget(w);
p->insertItem(w);
-#endif
return true;
}
@@ -480,9 +477,6 @@ TQWidget * KviIrcContextDisplayAction::addToCustomToolBar(KviCustomToolBar *t)
{
if(!setupDone())setup();
KviIrcContextDisplay * w = new KviIrcContextDisplay(t,"kvirc.irccontextdisplay");
-#ifdef COMPILE_USE_QT4
- t->addWidget(w);
-#endif
registerWidget(w);
return w;
}
@@ -538,9 +532,6 @@ TQWidget * KviSeparatorAction::addToCustomToolBar(KviCustomToolBar *t)
if(!setupDone())setup();
TQWidget * w = new KviCustomToolBarSeparator(t,"kvirc.separator");
registerWidget(w);
-#ifdef COMPILE_USE_QT4
- t->addWidget(w);
-#endif
return w;
}
@@ -689,9 +680,6 @@ TQWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t)
m_szConnectString,
this,TQT_SLOT(activate()),t,name());
registerWidget(b);
-#ifdef COMPILE_USE_QT4
- t->addWidget(b);
-#endif
activeContextStateChanged();
return b;
}
@@ -766,13 +754,8 @@ TQWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t)
this,TQT_SLOT(activate()),t,name());
b->setPopup(m_pPopup);
-#ifdef COMPILE_USE_QT4
- b->setPopupMode( scriptCode().isEmpty() ? TQToolButton::InstantPopup : TQToolButton::MenuButtonPopup);
- t->addWidget(b);
-#else
b->setShowSubmenuIndicator(true);
b->setPopupDelay(1);
-#endif
registerWidget(b);
if(!isEnabled())b->setEnabled(false);
return b;
@@ -1113,9 +1096,6 @@ TQWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t)
m_szAwayString,
this,TQT_SLOT(activate()),t,name());
registerWidget(b);
-#ifdef COMPILE_USE_QT4
- t->addWidget(b);
-#endif
activeContextStateChanged();
return b;
}
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index 44d1788..3bc1c36 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -39,15 +39,9 @@
#include <tqlayout.h>
#include <tqlabel.h>
-#ifndef COMPILE_USE_QT4
- // In TQt.4 we need to use TQMimeData ?
- #include <tqdragobject.h>
-#endif
+#include <tqdragobject.h>
#include <tqcursor.h>
-#ifdef COMPILE_USE_QT4
- #include <tqevent.h>
-#endif
// kvi_app.cpp
extern TQPixmap * g_pUserChanStatePixmap;
@@ -352,11 +346,7 @@ static const char * g_szIconNames[KVI_NUM_SMALL_ICONS]=
};
KviIconWidget::KviIconWidget()
-#ifdef COMPILE_USE_QT4
-: TQWidget(0,"global_icon_widget" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_SysMenu | WStyle_Minimize*/)
-#else
: TQWidget(0,"global_icon_widget",WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_SysMenu | WStyle_Minimize)
-#endif
{
init();
}
@@ -428,11 +418,9 @@ bool KviIconWidget::eventFilter(TQObject * o,TQEvent *e)
if(const TQPixmap * pix = ((TQLabel *)o)->pixmap())
{
// FIXME: In TQt 4.x this stuff needs to be ported to a different api.. which one ?
-#ifndef COMPILE_USE_QT4
TQDragObject * drobj = new TQTextDrag(o->name(),this);
drobj->setPixmap(*pix,((TQLabel *)o)->mapFromGlobal(TQCursor::pos()));
drobj->dragCopy();
-#endif
return true;
}
}
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index 7e61fe9..c4b15db 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -54,14 +54,8 @@
#include <unistd.h> // for getuid
#include <sys/types.h> // for getuid
- #ifdef COMPILE_USE_QT4
- #include <tqx11info_x11.h>
- #define kvi_ipc_get_xdisplay QX11Info::display
- #define kvi_ipc_get_xrootwin QX11Info::appRootWindow
- #else
#define kvi_ipc_get_xdisplay tqt_xdisplay
#define kvi_ipc_get_xrootwin tqt_xrootwin
- #endif
static Atom kvi_atom_ipc_sentinel_window;
static Atom kvi_atom_ipc_remote_command;
diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/kvi_ipc.h
index 39745eb..26c50ef 100644
--- a/src/kvirc/kernel/kvi_ipc.h
+++ b/src/kvirc/kernel/kvi_ipc.h
@@ -38,11 +38,6 @@
#include <windows.h>
#else //!COMPILE_ON_WINDOWS
#ifndef COMPILE_NO_X
- #ifdef COMPILE_USE_QT4
- // We need this to be included BEFORE X11/Xlib.h
- // because of preprocessor constant collisions...
- #include <tqcoreevent.h>
- #endif
#include "kvi_xlib.h" // for XEvent
#endif //!COMPILE_NO_X
#endif //!COMPILE_ON_WINDOWS
diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp
index 43b3fa1..8d8d2ae 100644
--- a/src/kvirc/kernel/kvi_lagmeter.cpp
+++ b/src/kvirc/kernel/kvi_lagmeter.cpp
@@ -66,9 +66,7 @@ KviLagMeter::KviLagMeter(KviIrcConnection * c)
KviLagMeter::~KviLagMeter()
{
if(m_pDeletionSignal)*m_pDeletionSignal = true;
-#ifndef COMPILE_USE_QT4
killTimers();
-#endif
delete m_pCheckList;
}
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 881042c..3739b0e 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -312,7 +312,6 @@ DECLARE_OPTION_STRUCT(KviStringListOption,TQStringList)
#define KviOption_boolUseSystemUrlHandlers 218 /* Windoze only*/
#define KviOption_boolScaleAvatarsOnLoad 219
#define KviOption_boolDisableNotifierFadein 220 /* interface::notifier */
-#define KviOption_boolUseAntiAliasing 221 /* qt4 only! */
#define KVI_NUM_BOOL_OPTIONS 222
@@ -651,16 +650,6 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
#define _OUTPUT_QUIET (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_QUIET)
#define _OUTPUT_MUTE (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_MUTE)
-#ifdef COMPILE_USE_QT4
- #define START_TABLE_BOLD_ROW "<tr><td style=\"background-color: rgb(0,0,0); font-weight: bold; color: rgb(200,200,255); text-indent: 5px;\"><nobr>"
- #define END_TABLE_BOLD_ROW "</nobr></td></tr>"
-
- #define START_TABLE_NORMAL_ROW "<tr><td>"
-
- #define SET_ANTI_ALIASING(p) \
- (p).setRenderHint(TQPainter::Antialiasing, KVI_OPTION_BOOL(KviOption_boolUseAntiAliasing)); \
- (p).setRenderHint(TQPainter::TextAntialiasing, KVI_OPTION_BOOL(KviOption_boolUseAntiAliasing));
-#else
#define START_TABLE_BOLD_ROW "<tr><td bgcolor=\"#303030\">" \
"<font color=\"#FFFFFF\"><nobr><b>"
#define END_TABLE_BOLD_ROW "</b></nobr></font></td></tr>"
@@ -668,7 +657,6 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
#define START_TABLE_NORMAL_ROW "<tr><td bgcolor=\"#F0F0F0\">"
#define SET_ANTI_ALIASING(p)
-#endif
#if defined(_KVI_OPTIONS_CPP_) || defined(_WANT_OPTION_FLAGS_)
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp
index 4d1d06f..30b1932 100644
--- a/src/kvirc/kernel/kvi_theme.cpp
+++ b/src/kvirc/kernel/kvi_theme.cpp
@@ -36,11 +36,7 @@
#define KVI_THEME_MEDIUM_SCREENSHOT_NAME "screenshot_medium.png"
#define KVI_THEME_LARGE_SCREENSHOT_NAME "screenshot.png"
-#ifdef COMPILE_USE_QT4
- #define TQIMAGE_SCALE_MIN TQt::KeepAspectRatio
-#else
#define TQIMAGE_SCALE_MIN TQ_ScaleMin
-#endif
KviThemeInfo::KviThemeInfo()
: KviHeapObject()
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 00:58:21 +0000