summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/kvilib/core/kvi_string.h3
-rw-r--r--src/kvilib/net/kvi_http.h2
-rw-r--r--src/kvilib/system/kvi_locale.cpp4
-rw-r--r--src/kvirc/kernel/kvi_app.cpp23
-rw-r--r--src/kvirc/kernel/kvi_ircconnection.h2
-rw-r--r--src/kvirc/kvs/kvi_kvs_object.cpp2
-rw-r--r--src/kvirc/kvs/kvi_kvs_object.h2
-rw-r--r--src/kvirc/kvs/kvi_kvs_parser_lside.cpp2
-rw-r--r--src/kvirc/kvs/kvi_kvs_popupmenu.cpp2
-rw-r--r--src/kvirc/sparser/kvi_sp_ctcp.cpp2
-rw-r--r--src/kvirc/ui/kvi_frame.cpp4
-rw-r--r--src/kvirc/ui/kvi_ircview.cpp2
-rw-r--r--src/kvirc/ui/kvi_listview.cpp2
-rw-r--r--src/kvirc/ui/kvi_window.cpp1
-rw-r--r--src/kvirc/ui/kvi_window.h2
-rw-r--r--src/modules/dialog/libkvidialog.cpp4
-rw-r--r--src/modules/setup/setupwizard.cpp2
-rw-r--r--src/modules/snd/libkvisnd.cpp4
-rw-r--r--src/tdeconf_update/Makefile.am7
-rw-r--r--src/tdeconf_update/kvirc_soundsystem.upd2
-rwxr-xr-xsrc/tdeconf_update/kvirc_soundsystem_upd.sh8
22 files changed, 40 insertions, 44 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a3f12af2..6cbcb8f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
# KVirc IRC client Makefile - 16.12.98 Szymon Stefanek <stefanek@tin.it>
###############################################################################
-SUBDIRS = kvilib kvirc modules
+SUBDIRS = kvilib kvirc modules tdeconf_update
headers_HEADERS=kvi_configstatus.h
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
index b1d7a2e0..a42f6e22 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -144,8 +144,7 @@ public:
// Carbon copy :)...fast
KviStr(const KviStr &str);
- // Compat with QT...<br>
- // WARNING : With QT2.x it WILL loose UNICODE data.<br>
+ // Compat with TQt...<br>
// Safe even if the TQString is null.
KviStr(const TQString &str);
diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h
index 39d71b3f..91784f4b 100644
--- a/src/kvilib/net/kvi_http.h
+++ b/src/kvilib/net/kvi_http.h
@@ -45,7 +45,7 @@ class KviHttpRequestThread;
//
// This class implements a HTTP protocol client.
// It's able to send GET, POST and HEAD requests,
-// download stuff to a file or to a qt TQ_SLOT().
+// download stuff to a file or to a tqt TQ_SLOT().
//
class KVILIB_API KviHttpRequest : public TQObject, public KviHeapObject
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index b52fe447..6f083e89 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -1065,13 +1065,13 @@ KviTranslator::~KviTranslator()
TQString KviTranslator::find(const char *context,const char * message) const
{
- // we ignore contexts for qt translations
+ // we ignore contexts for tqt translations
return g_pMainCatalogue->translateToTQString(message);
}
TQTranslatorMessage KviTranslator::findMessage(const char * context,const char * sourceText,const char * comment) const
{
- // we ignore contexts for qt translations
+ // we ignore contexts for tqt translations
return TQTranslatorMessage(context,sourceText,comment,g_pMainCatalogue->translateToTQString(sourceText));
}
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index bf309864..41fba1d5 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -660,7 +660,7 @@ void KviApp::contextSensitiveHelp()
TQWidget * w = g_pApp->focusWidget();
while(w)
{
- //TQVariant v = w->property("contextSensitiveHelp"); <-- this prints a lot of warnings: this is a QT BUG
+ //TQVariant v = w->property("contextSensitiveHelp"); <-- this prints a lot of warnings: this is a TQt BUG
TQMetaObject * o = w->metaObject();
if(o)
{
@@ -700,25 +700,6 @@ void KviApp::loadDefaultScript()
g_pFrame->lineUpDockWindows(); // missing on TQt 4.x
}
-// 07.01.2005 06:01: Got this curious gcc error while writing
-// the functions below...
-// The problem is gone by simply typing make again.
-// Memory/Disk transfer error ?
-//
-// if g++ -DHAVE_CONFIG_H -I. -I. -I../../../src -I/usr/build/kvirccvs/kvirc/src/kvilib/include/ -I/usr/build/kvirccvs/kvirc/src/kvirc/include/ -I/opt/qt/include -I/usr/X11R6/include -I/usr/X11R6/include -I/opt/kde/include -D_REENTRANT -DREENTRANT -I/usr/X11R6/include -DGLOBAL_KVIRC_DIR=\"/usr/local/share/kvirc/3.0.1.99\" -g -MT kvi_ircconnection.o -MD -MP -MF ".deps/kvi_ircconnection.Tpo"
-// -c -o kvi_ircconnection.o `test -f '../kernel/kvi_ircconnection.cpp' || echo './'`../kernel/kvi_ircconnection.cpp;
-// then mv -f ".deps/kvi_ircconnection.Tpo" ".deps/kvi_ircconnection.Po";
-// else rm -f ".deps/kvi_ircconnection.Tpo"; exit 1;
-// fi
-// /opt/qt/include/qstringlist.h:62: sorry, not implemented: `
-// expr_with_file_location' not supported by dump_decl
-// /opt/qt/include/qstringlist.h: In function `<declaration error>':
-// /opt/qt/include/qstringlist.h:62: internal error: Segmentation fault
-// Please submit a full bug report,
-// with preprocessed source if appropriate.
-// See <URL:http://bugzilla.redhat.com/bugzilla/> for instructions.
-
-
void KviApp::checkSuggestRestoreDefaultScript()
{
static bool bSuggestedOnce = false;
@@ -2019,7 +2000,7 @@ void KviApp::timerEvent(TQTimerEvent *e)
heartbeat(tNow);
}
-// qvariant.h uses this , and it is included by the qt generated moc file for TQt >= 3.0.0
+// qvariant.h uses this , and it is included by the tqt generated moc file for TQt >= 3.0.0
#ifdef Bool
#undef Bool
#endif
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index 10277ab7..9e70c3d5 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -240,7 +240,7 @@ protected:
// KviIrcContext interface
//
// this starts an asynchronous connection attempt
- // you must return control to the qt core for the connection
+ // you must return control to the tqt core for the connection
// operations to be initiated
void start();
// kills any running connection or attempt
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 5efa91ec..1eda9172 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -554,7 +554,7 @@
For example, you can find out if the widget accepts drops by calling [classfnc]$property(acceptDrops)[classfnc].[br]
This function will be mainly useful in the [class]wrapper[/class] class.
!fn: $setProperty(<TQt property>,<property value>)
- Sets a qt property for this widget.[br]
+ Sets a tqt property for this widget.[br]
This is for advanced scripting, and can control really many features of the TQt widgets.[br]
For example, the [class]multilineedit[/class] widgets can be set to
the "password" echo mode only by using this function call:[br]
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
index cddbe419..0e9312a2 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/kvi_kvs_object.h
@@ -77,7 +77,7 @@ protected:
kvs_hobject_t m_hSignalSender;
TQString m_szSignalName;
- // if this object wraps a qt one, it is here
+ // if this object wraps a tqt one, it is here
TQObject * m_pObject;
bool m_bObjectOwner; // do we have to destroy it ?
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
index bcca75d4..69202e1e 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
@@ -162,7 +162,7 @@
(We use \\N because KVIrc will first unquote the string when parsing...)[br]
\\0 is a special escape that will be replaced by the entire match (is always valid!).[br]
WARNING: the "capture-text" feature is not available if KVIrc has been compiled
- with qt older than 3.0.0. You can find out if the feature is available by
+ with tqt older than 3.0.0. You can find out if the feature is available by
looking for the string "TQt3" in the array returned by [fnc]$features[/fnc].[br]
[flags] may be a combination of the letters 'g','i' and 'w'.[br]
'g' causes the search to be global and not stop after the first occurence of <search pattern>.[br]
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 5f0293d0..5d511cd1 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -293,7 +293,7 @@ KviKvsPopupMenuItemLabel::~KviKvsPopupMenuItemLabel()
void KviKvsPopupMenuItemLabel::labelDestroyed()
{
- m_pLabel = 0; // someone (maybe qt, maybe us) has destroyed the label
+ m_pLabel = 0; // someone (maybe tqt, maybe us) has destroyed the label
}
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index 002e9b1e..7ed3dc74 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1145,7 +1145,7 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg)
{
TQString szVersion = "KVIrc " KVI_VERSION " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE " - " KVI_BUILD_FLAGS;
szVersion.append(TQString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release()));
- //szVersion.append(TQString(" - QT Version: %1 - %2").arg(tqVersion()).arg(__tr2qs("http://www.kvirc.net/")));
+ //szVersion.append(TQString(" - TQt Version: %1 - %2").arg(tqVersion()).arg(__tr2qs("http://www.kvirc.net/")));
if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty())
{
TQString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix);
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 0fcdac80..5f9fdf1b 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -182,7 +182,7 @@ KviFrame::~KviFrame()
// Now start killing stuff
- // Explicitly kill all the module extension toolbars: qt has NOT to delete them: we must call their "die" method
+ // Explicitly kill all the module extension toolbars: tqt has NOT to delete them: we must call their "die" method
while(KviMexToolBar * t = m_pModuleExtensionToolBarList->first())t->die();
delete m_pModuleExtensionToolBarList;
@@ -1030,7 +1030,7 @@ void KviFrame::toggleStatusBar()
delete m_pStatusBar;
m_pStatusBar = 0;
} else {
- //if(statusBar())delete statusBar(); // kill any existing status bar (QT BUG)
+ //if(statusBar())delete statusBar(); // kill any existing status bar (TQt BUG)
m_pStatusBar = new KviStatusBar(this);
m_pStatusBar->load();
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 3a5b8794..9422296e 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -330,7 +330,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>;
m_pMessagesStoppedWhileSelecting->setAutoDelete(false);
- // say qt to avoid erasing on repaint
+ // say tqt to avoid erasing on repaint
setBackgroundMode(NoBackground);
m_pFm = 0; // will be updated in the first paint event
diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp
index 334086c5..70bf7af7 100644
--- a/src/kvirc/ui/kvi_listview.cpp
+++ b/src/kvirc/ui/kvi_listview.cpp
@@ -183,7 +183,7 @@ void KviListView::resizeEvent(TQResizeEvent * e)
{
KviTalListView::resizeEvent(e);
if(m_pBackgroundOverlayPixmap)
- repaintContents(); // force a full repaint (otherwise qt does not honor static background here)
+ repaintContents(); // force a full repaint (otherwise tqt does not honor static background here)
}
#ifdef COMPILE_ON_WINDOWS
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 29ec742c..5e066ee7 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -1147,7 +1147,6 @@ void KviWindow::updateBackgrounds(TQObject * obj)
for(unsigned int i=0;i<list.count();i++)
{
TQObject * child = list.at(i);
- // FIXME: check if this code can work with qt < 3.0.0 too
if(child->metaObject()->findProperty("TransparencyCapable",true) != -1)
((TQWidget *)child)->update();
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index 940fcf54..dce7bb7c 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -182,7 +182,7 @@ public:
// THIS is the function that should be used
const TQString & windowName(){ return m_szName; };
void setWindowName(const TQString &szName);
- // force QT to set our UNICODE name too... FIXME: this should be removed later...
+ // force TQt to set our UNICODE name too... FIXME: this should be removed later...
virtual void setName(const char * szName);
// Window type management
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index ec482051..1e069716 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -529,7 +529,7 @@ void KviKvsCallbackFileDialog::done(int code)
g_pApp->collectGarbage(this);
// calling dialog.unload here WILL lead to a sigsegv (this is SURE
- // with a lot of qt versions that have the ugly file dialog "accept before this reference" bug)
+ // with a lot of tqt versions that have the ugly file dialog "accept before this reference" bug)
// to avoid it, we can execute the callback triggered by a timer...
// ... umpf ...
execute(&params);
@@ -660,7 +660,7 @@ void KviKvsCallbackImageDialog::done(int code)
g_pApp->collectGarbage(this);
// calling dialog.unload here WILL lead to a sigsegv (this is SURE
- // with a lot of qt versions that have the ugly file dialog "accept before this reference" bug)
+ // with a lot of tqt versions that have the ugly file dialog "accept before this reference" bug)
// to avoid it, we can execute the callback triggered by a timer...
// ... umpf ...
execute(&params);
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 355874ec..207704c9 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -79,7 +79,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
//setBackgroundColor(TQColor(255,0,0));
- // we need this to set localized text on buttons (see QT doc/ KviTalWizard class)
+ // we need this to set localized text on buttons (see TQt doc/ KviTalWizard class)
w->KviTalWizard::backButton()->setText(__tr2qs("< &Back"));
w->KviTalWizard::nextButton()->setText(__tr2qs("&Next >"));
w->KviTalWizard::finishButton()->setText(__tr2qs("Finish"));
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 2449b5b0..255e5dd8 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -104,7 +104,7 @@ KviSoundPlayer::KviSoundPlayer()
#endif //!COMPILE_ON_WINDOWS
if(TQSound::isAvailable())
- m_pSoundSystemDict->insert("qt",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playTQt)));
+ m_pSoundSystemDict->insert("tqt",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playTQt)));
m_pSoundSystemDict->insert("null",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playNull)));
@@ -203,7 +203,7 @@ void KviSoundPlayer::detectSoundSystem()
if(TQSound::isAvailable())
{
- KVI_OPTION_STRING(KviOption_stringSoundSystem) = "qt";
+ KVI_OPTION_STRING(KviOption_stringSoundSystem) = "tqt";
return;
}
diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am
new file mode 100644
index 00000000..349fb72d
--- /dev/null
+++ b/src/tdeconf_update/Makefile.am
@@ -0,0 +1,7 @@
+update_DATA = \
+ kvirc_soundsystem.upd
+
+update_SCRIPTS = \
+ kvirc_soundsystem_upd.sh
+
+updatedir = $(datadir)/apps/tdeconf_update
diff --git a/src/tdeconf_update/kvirc_soundsystem.upd b/src/tdeconf_update/kvirc_soundsystem.upd
new file mode 100644
index 00000000..6a7a3bf3
--- /dev/null
+++ b/src/tdeconf_update/kvirc_soundsystem.upd
@@ -0,0 +1,2 @@
+Id=kvirc_soundsystem_qt_tqt_update
+Script=kvirc_soundsystem_upd.sh,sh
diff --git a/src/tdeconf_update/kvirc_soundsystem_upd.sh b/src/tdeconf_update/kvirc_soundsystem_upd.sh
new file mode 100755
index 00000000..0fe7a9f2
--- /dev/null
+++ b/src/tdeconf_update/kvirc_soundsystem_upd.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Updates kvirc sound system configuration
+KVIRC_CFG_DIR=`sed -n "s/^LocalKvircDirectory=//p" "${HOME}/.trinity/share/config/kvircrc"`
+if [ -n "${KVIRC_CFG_DIR}" ]; then
+ perl -p -i -e "s/^stringSoundSystem=qt$/stringSoundSystem=tqt/" "${KVIRC_CFG_DIR}/config/main.kvc"
+fi
+unset KVIRC_CFG_DIR
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 12:02:08 +0000