summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/addon/libkviaddon.cpp2
-rw-r--r--src/modules/aliaseditor/aliaseditor.cpp2
-rw-r--r--src/modules/avatar/libkviavatar.cpp12
-rw-r--r--src/modules/dcc/libkvidcc.cpp4
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt3.cpp6
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt4.cpp6
-rw-r--r--src/modules/eventeditor/eventeditor.cpp2
-rw-r--r--src/modules/logview/logviewmdiwindow.cpp2
-rw-r--r--src/modules/logview/logviewwidget.cpp2
-rw-r--r--src/modules/mediaplayer/mp_winampinterface.cpp4
-rw-r--r--src/modules/notifier/notifierwindow.cpp6
-rw-r--r--src/modules/options/optw_connection.cpp6
-rw-r--r--src/modules/options/optw_irc.cpp4
-rw-r--r--src/modules/options/optw_query.h6
-rw-r--r--src/modules/popupeditor/popupeditor.cpp2
-rw-r--r--src/modules/raweditor/raweditor.cpp2
-rw-r--r--src/modules/setup/libkvisetup.cpp2
-rw-r--r--src/modules/setup/setupwizard.cpp6
-rw-r--r--src/modules/spaste/libkvispaste.cpp4
19 files changed, 40 insertions, 40 deletions
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 9d3b0ebc..41b8289d 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -429,7 +429,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
we will adhere to that naming in certain parts of the documentation too.
[/p]
[p]
- Each script-based addon (a set of scripts) is identified by an UNITQUE
+ Each script-based addon (a set of scripts) is identified by an UNIQUE
<id>. Two addons with the same <id> can't co-exist in the same
KVIrc installation (so be sure to choose a token characteristic enough
to avoid collisions with others). The <id> itself is used only for
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index d0201050..ce95e2c3 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -436,7 +436,7 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
m_pContextPopup->insertSeparator();
id = m_pContextPopup->insertItem(
- *(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
+ *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
__tr2qs("Remove Selected"),
this,TQT_SLOT(removeSelectedItems()));
m_pContextPopup->setItemEnabled(id,bHasSelected);
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 8386942b..0ed81a51 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -186,7 +186,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("avatar",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szAvatar)
KVSM_PARAMETERS_END(c)
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
TQString absPath;
@@ -275,7 +275,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
static bool avatar_kvs_cmd_unset(KviKvsModuleCommandCall * c)
{
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
KviIrcUserEntry * e = c->window()->connection()->userDataBase()->find(c->window()->connection()->currentNickName());
if(!e)
@@ -340,7 +340,7 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
KVSM_PARAMETERS_END(c)
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
kvs_int_t iTimeout = (kvs_int_t)KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs);
if(KviKvsVariant * pTimeout = c->switches()->find('t',"timeout"))
@@ -450,7 +450,7 @@ static bool avatar_kvs_fnc_name(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("nick",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick)
KVSM_PARAMETERS_END(c)
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
if(szNick.isEmpty())szNick = c->window()->connection()->currentNickName();
@@ -494,7 +494,7 @@ static bool avatar_kvs_fnc_path(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("path",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick)
KVSM_PARAMETERS_END(c)
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
if(szNick.isEmpty())szNick = c->window()->connection()->currentNickName();
@@ -536,7 +536,7 @@ static bool avatar_kvs_cmd_query(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szName)
KVSM_PARAMETERS_END(c)
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
KviTQCString target = c->window()->connection()->encodeText(szName);
c->window()->connection()->sendFmtData("PRIVMSG %s :%cAVATAR%c",target.data(),0x01,0x01);
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 03f5d304..de818ce4 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -878,7 +878,7 @@ static bool dcc_kvs_cmd_rsend(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szFileName)
KVSM_PARAMETERS_END(c)
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
d->szNick = szTarget;
@@ -943,7 +943,7 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("size",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize)
KVSM_PARAMETERS_END(c)
- KVSM_RETQUIRE_CONNECTION(c)
+ KVSM_REQUIRE_CONNECTION(c)
KviTQString::cutToLast(szFileName,'/');
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index d286d64c..2820ce2f 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -164,7 +164,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
m_pContextPopup->insertSeparator();
id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE);
- id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
+ id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
m_pContextPopup->setAccel(__tr2qs("Ctrl+Q"),id);
connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup()));
}
@@ -554,7 +554,7 @@ void KviDockWidget::grabActivityInfo()
case KVI_WINDOW_TYPE_CHANNEL:
if(m_iChannels < iLevel) m_iChannels = iLevel;
break;
- case KVI_WINDOW_TYPE_TQUERY:
+ case KVI_WINDOW_TYPE_QUERY:
if(m_iQueries < iLevel) m_iQueries = iLevel;
break;
default:
@@ -581,7 +581,7 @@ void KviDockWidget::grabActivityInfo()
case KVI_WINDOW_TYPE_CHANNEL:
if(m_iChannels < iLevel) m_iChannels = iLevel;
break;
- case KVI_WINDOW_TYPE_TQUERY:
+ case KVI_WINDOW_TYPE_QUERY:
if(m_iQueries < iLevel) m_iQueries = iLevel;
break;
default:
diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
index 54033af5..48555c7a 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
@@ -108,7 +108,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm)
m_pContextPopup->insertSeparator();
id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE);
- id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
+ id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
m_pContextPopup->setAccel(__tr2qs("Ctrl+Q"),id);
connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup()));
@@ -412,7 +412,7 @@ void KviDockWidget::grabActivityInfo()
case KVI_WINDOW_TYPE_CHANNEL:
if(m_iChannels < iLevel) m_iChannels = iLevel;
break;
- case KVI_WINDOW_TYPE_TQUERY:
+ case KVI_WINDOW_TYPE_QUERY:
if(m_iQueries < iLevel) m_iQueries = iLevel;
break;
default:
@@ -439,7 +439,7 @@ void KviDockWidget::grabActivityInfo()
case KVI_WINDOW_TYPE_CHANNEL:
if(m_iChannels < iLevel) m_iChannels = iLevel;
break;
- case KVI_WINDOW_TYPE_TQUERY:
+ case KVI_WINDOW_TYPE_QUERY:
if(m_iQueries < iLevel) m_iQueries = iLevel;
break;
default:
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 3a6b6b24..8c13eac4 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -156,7 +156,7 @@ void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
//m_pContextPopup->setItemChecked(id,((KviEventHandlerListViewItem *)it)->m_bEnabled);
m_pContextPopup->insertItem(
- *(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
+ *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
__tr2qs("Re&move Handler"),
this,TQT_SLOT(removeCurrentHandler()));
m_pContextPopup->insertItem(
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 84a67118..7efa17f0 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -378,7 +378,7 @@ void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const TQ
if(!it) return;
if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;
KviTalPopupMenu* popup = new KviTalPopupMenu(this);
- popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Remove file","logview"),this,TQT_SLOT(deleteCurrent()));
+ popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,TQT_SLOT(deleteCurrent()));
popup->exec( TQCursor::pos() );
}
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index 31da5033..11070b5a 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -45,7 +45,7 @@ const TQPixmap * KviLogListViewItemType::pixmap(int col) const
case KviLogFile::Channel:
return g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL);
case KviLogFile::Query:
- return g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUERY);
+ return g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY);
case KviLogFile::DccChat:
return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG);
case KviLogFile::Console:
diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp
index 7820dbbf..c41b1ba6 100644
--- a/src/modules/mediaplayer/mp_winampinterface.cpp
+++ b/src/modules/mediaplayer/mp_winampinterface.cpp
@@ -156,7 +156,7 @@
#define WINAMP_CMD_STOP WINAMP_BUTTON4
#define WINAMP_CMD_NEXT WINAMP_BUTTON5
-#define WINAMP_CMD_TQUIT 40001
+#define WINAMP_CMD_QUIT 40001
#define KVIRC_WM_USER 63112
@@ -237,7 +237,7 @@ MP_WINAMP_WM_COMMAND(stop,WINAMP_CMD_STOP)
MP_WINAMP_WM_COMMAND(next,WINAMP_CMD_NEXT)
MP_WINAMP_WM_COMMAND(prev,WINAMP_CMD_PREV)
MP_WINAMP_WM_COMMAND(pause,WINAMP_CMD_PAUSE)
-MP_WINAMP_WM_COMMAND(quit,WINAMP_CMD_TQUIT)
+MP_WINAMP_WM_COMMAND(quit,WINAMP_CMD_QUIT)
int KviWinampInterface::length()
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index bbc12987..69989127 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -1253,10 +1253,10 @@ void KviNotifierWindow::fillContextPopup()
m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQT_SLOT(disableFor30Minutes()));
m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQT_SLOT(disableFor60Minutes()));
m_pDisablePopup->insertSeparator();
- m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQT_SLOT(disableUntilKVIrcRestarted()));
- m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQT_SLOT(disablePermanently()));
+ m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQT_SLOT(disableUntilKVIrcRestarted()));
+ m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQT_SLOT(disablePermanently()));
- m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup);
+ m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup);
}
void KviNotifierWindow::disableFor15Minutes()
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index d6990c9f..21c1192c 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -76,11 +76,11 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent)
#ifdef COMPILE_INFO_TIPS
mergeTip(b,__tr2qs_ctx("<center>This option will enable auto-reconnecting after an unexpected disconnect. " \
"An unexpected disconnect is the <b>termination</b> of a <b>fully connected IRC session</b> " \
- "that was <b>not requested by the user</b> by the means of the TQUIT message." \
- "<p><b>Warning:</b> If you use /RAW to send a TQUIT message to the server, " \
+ "that was <b>not requested by the user</b> by the means of the QUIT message." \
+ "<p><b>Warning:</b> If you use /RAW to send a QUIT message to the server, " \
"this option will not behave correctly, since does not detect the outgoing " \
"QUIT message and will attempt to reconnect after the server has closed the connection. " \
- "For this reason, always use the /TQUIT command to close your connections. " \
+ "For this reason, always use the /QUIT command to close your connections. " \
"This option may also behave incorrectly with bouncers that support " \
"detaching, in this case a solution could be to prepare an alias that sends the " \
"bouncer \"detach\" command immediately before the \"quit\" command.<br>" \
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index a6cee9d0..71b60956 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -76,10 +76,10 @@ KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * parent)
#ifdef COMPILE_INFO_TIPS
mergeTip(b,
__tr2qs_ctx("<center>This option causes KVIrc to close " \
- "the connection immediately after sending the TQUIT message.<br>" \
+ "the connection immediately after sending the QUIT message.<br>" \
"When this option is disabled, KVIrc will wait for the server " \
"to close the connection.<br>" \
- "Note that if you use this, your TQUIT message may be not displayed.</center>","options"));
+ "Note that if you use this, your QUIT message may be not displayed.</center>","options"));
#endif
addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to realname","options"),KviOption_boolPrependGenderInfoToRealname);
}
diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
index 215ba377..dde374f5 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/optw_query.h
@@ -1,5 +1,5 @@
-#ifndef _OPTW_TQUERY_H_
-#define _OPTW_TQUERY_H_
+#ifndef _OPTW_QUERY_H_
+#define _OPTW_QUERY_H_
//
// File : optw_query.h
// Creation date : Tue Mar 05 22:31:18 2002 GMT by Szymon Stefanek
@@ -24,7 +24,7 @@
#include "kvi_optionswidget.h"
-#define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_TQUERY
+#define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_QUERY
#define KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget __tr2qs_no_lookup("Query")
#define KVI_OPTIONS_WIDGET_PARENT_KviQueryOptionsWidget KviIrcOptionsWidget
#define KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget __tr2qs_no_lookup("chat")
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index dd1cf24a..34026814 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -1101,7 +1101,7 @@ void KviPopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
m_pContextPopup->setItemEnabled(
m_pContextPopup->insertItem(
- *(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
+ *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
__tr2qs("Re&move Popup"),
this,TQT_SLOT(removeCurrentPopup())),
it);
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 123675b6..49787263 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -158,7 +158,7 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col
__tr2qs("&Disable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled()));
m_pContextPopup->insertItem(
- *(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
+ *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
__tr2qs("Re&move Handler"),
this,TQT_SLOT(removeCurrentHandler()));
m_pContextPopup->insertItem(
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index d5989c98..0fc04952 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -77,7 +77,7 @@ KVIMODULEEXPORTFUNC void setup_finish()
// Reset the quit message and the real name... if they contain the KVIrc version
// then probably the user hasn't even edited them.
if(KVI_OPTION_STRING(KviOption_stringQuitMessage).find("KVIrc",0,false) != -1)
- KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_TQUIT_MESSAGE;
+ KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_QUIT_MESSAGE;
// We deserve to change the user's part message in something nice :)
KVI_OPTION_STRING(KviOption_stringPartMessage) = KVI_DEFAULT_PART_MESSAGE;
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index dd0e8a9b..20ca97be 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -588,9 +588,9 @@ KviSetupWizard::KviSetupWizard()
}
//mIRC import
- #define TQUERY_BUFFER 2048
+ #define QUERY_BUFFER 2048
char* buffer;
- DWORD len = TQUERY_BUFFER;
+ DWORD len = QUERY_BUFFER;
buffer = (char*)malloc(len*sizeof(char));
HKEY hKey;
TQString szMircDir;
@@ -796,7 +796,7 @@ void KviSetupWizard::makeLink()
// Dig in the registry looking up the Desktop path
if(RegOpenKeyEx(HKEY_CURRENT_USER,
"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",
- 0,KEY_TQUERY_VALUE,&hCU) == ERROR_SUCCESS)
+ 0,KEY_QUERY_VALUE,&hCU) == ERROR_SUCCESS)
{
RegQueryValueEx(hCU,"Desktop",NULL,&lpType,
(unsigned char *)&szLink,&ulSize);
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index d22fbb70..92a28a31 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -63,7 +63,7 @@ static KviWindow * spaste_kvs_find_window(TQString &win, KviKvsModuleCommandCall
c->warning(__tr("Window with ID '%Q' not found"),&win);
return 0;
}
- if((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_TQUERY) || (w->type() == KVI_WINDOW_TYPE_DCCCHAT))return w;
+ if((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_QUERY) || (w->type() == KVI_WINDOW_TYPE_DCCCHAT))return w;
c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"),&win);
return 0;
}
@@ -212,7 +212,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
if(!iId) //Delete all spaste's from the current window
{
- if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_TQUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
+ if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
{
TQString szWinId = c->window()->id();
c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 22:40:23 +0000