summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--konversation/src/alias_preferencesui.ui4
-rw-r--r--konversation/src/autoreplace_preferencesui.ui2
-rw-r--r--konversation/src/channel.cpp10
-rw-r--r--konversation/src/channellistpanel.cpp2
-rw-r--r--konversation/src/channeloptionsui.ui4
-rw-r--r--konversation/src/chatwindow.cpp2
-rw-r--r--konversation/src/chatwindow.h2
-rw-r--r--konversation/src/chatwindowappearance_preferences.ui2
-rw-r--r--konversation/src/chatwindowbehaviour_preferences.ui4
-rw-r--r--konversation/src/colorsappearance_preferences.ui4
-rw-r--r--konversation/src/common.cpp6
-rw-r--r--konversation/src/connectionbehavior_preferences.ui4
-rw-r--r--konversation/src/dcc_preferencesui.ui2
-rw-r--r--konversation/src/dcctransferdetailedinfopanelui.ui2
-rw-r--r--konversation/src/fontappearance_preferences.ui4
-rw-r--r--konversation/src/generalbehavior_preferences.ui4
-rw-r--r--konversation/src/highlight_preferencesui.ui2
-rw-r--r--konversation/src/ignore_preferencesui.ui4
-rw-r--r--konversation/src/inputfilter.cpp4
-rw-r--r--konversation/src/inputfilter.h2
-rw-r--r--konversation/src/irccolorchooserui.ui4
-rw-r--r--konversation/src/joinchannelui.ui4
-rw-r--r--konversation/src/konvdcop.cpp2
-rw-r--r--konversation/src/konvibookmarkmenu.cpp12
-rw-r--r--konversation/src/konvibookmarkmenu.h2
-rw-r--r--konversation/src/linkaddressbook/linkaddressbookui_base.ui4
-rw-r--r--konversation/src/linkaddressbook/nicklisttooltip.cpp2
-rw-r--r--konversation/src/linkaddressbook/nicksonlinetooltip.cpp2
-rw-r--r--konversation/src/log_preferences.ui4
-rw-r--r--konversation/src/nicklistbehavior_preferencesui.ui4
-rw-r--r--konversation/src/osd.cpp6
-rw-r--r--konversation/src/osd_preferencesui.ui4
-rw-r--r--konversation/src/queuetunerbase.ui2
-rw-r--r--konversation/src/quickbuttons_preferencesui.ui2
-rw-r--r--konversation/src/searchbarbase.ui4
-rw-r--r--konversation/src/server.cpp6
-rw-r--r--konversation/src/server.h2
-rw-r--r--konversation/src/servergroupdialogui.ui4
-rw-r--r--konversation/src/tabnotifications_preferences.ui2
-rw-r--r--konversation/src/tabs_preferencesui.ui4
-rw-r--r--konversation/src/theme_preferencesui.ui4
-rw-r--r--konversation/src/viewtree.cpp2
-rw-r--r--konversation/src/warnings_preferencesui.ui2
-rw-r--r--konversation/src/watchednicknames_preferencesui.ui4
44 files changed, 79 insertions, 79 deletions
diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui
index a2374b6..eb53d83 100644
--- a/konversation/src/alias_preferencesui.ui
+++ b/konversation/src/alias_preferencesui.ui
@@ -164,8 +164,8 @@
<tabstop>newButton</tabstop>
<tabstop>removeButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui
index 831cfa4..f617836 100644
--- a/konversation/src/autoreplace_preferencesui.ui
+++ b/konversation/src/autoreplace_preferencesui.ui
@@ -283,7 +283,7 @@
<tabstop>newButton</tabstop>
<tabstop>removeButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp
index 365ae30..e8d9426 100644
--- a/konversation/src/channel.cpp
+++ b/konversation/src/channel.cpp
@@ -2160,7 +2160,7 @@ void Channel::showModeButtons(bool show)
{
topicSplitterHidden = false;
modeBox->show();
- modeBox->tqparentWidget()->show();
+ modeBox->parentWidget()->show();
}
else
{
@@ -2169,7 +2169,7 @@ void Channel::showModeButtons(bool show)
if(topicLine->isHidden())
{
topicSplitterHidden = true;
- modeBox->tqparentWidget()->hide();
+ modeBox->parentWidget()->hide();
}
}
}
@@ -2453,7 +2453,7 @@ void Channel::setAutoUserhost(bool state)
nicknameListView->setColumnWidthMode(2,KListView::Maximum);
nicknameListView->setResizeMode(TQListView::NoColumn);
- // re-add already known hosttqmasks
+ // re-add already known hostmasks
TQListViewItem* item=nicknameListView->itemAtIndex(0);
while(item)
{
@@ -2583,7 +2583,7 @@ void Channel::showTopic(bool show)
topicSplitterHidden = false;
topicLine->show();
m_topicButton->show();
- topicLine->tqparentWidget()->show();
+ topicLine->parentWidget()->show();
}
else
{
@@ -2593,7 +2593,7 @@ void Channel::showTopic(bool show)
if(modeBox->isHidden())
{
topicSplitterHidden = true;
- topicLine->tqparentWidget()->hide();
+ topicLine->parentWidget()->hide();
}
}
}
diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
index 671ce61..59a3932 100644
--- a/konversation/src/channellistpanel.cpp
+++ b/konversation/src/channellistpanel.cpp
@@ -192,7 +192,7 @@ void ChannelListPanel::saveList()
if(!fileName.isEmpty())
{
- // first find the longest channel name and nick number for clean table tqlayouting
+ // first find the longest channel name and nick number for clean table layouting
unsigned int maxChannelWidth=0;
unsigned int maxNicksWidth=0;
diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui
index 43c14df..cb829d4 100644
--- a/konversation/src/channeloptionsui.ui
+++ b/konversation/src/channeloptionsui.ui
@@ -543,8 +543,8 @@ the Free Software Foundation; either version 2 of the License, or
<slot>clear()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>ktextedit.h</includehint>
diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
index db810f6..f214703 100644
--- a/konversation/src/chatwindow.cpp
+++ b/konversation/src/chatwindow.cpp
@@ -35,7 +35,7 @@ ChatWindow::ChatWindow(TQWidget* tqparent) : TQVBox(tqparent)
{
setName("ChatWindowObject");
setTextView(0);
- tqparentWidget=tqparent;
+ parentWidget=tqparent;
firstLog=true;
m_server=0;
m_notificationsEnabled = true;
diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h
index ae2f116..7d2f517 100644
--- a/konversation/src/chatwindow.h
+++ b/konversation/src/chatwindow.h
@@ -82,7 +82,7 @@ class ChatWindow : public TQVBox
bool parseURL = true, bool self = false);
virtual void appendBacklogMessage(const TQString& firstColumn,const TQString& message);
- TQWidget* tqparentWidget;
+ TQWidget* parentWidget;
virtual TQString getTextInLine();
/** Clean up and close this tab. Return false if you want to cancel the close. */
diff --git a/konversation/src/chatwindowappearance_preferences.ui b/konversation/src/chatwindowappearance_preferences.ui
index b651af8..a332268 100644
--- a/konversation/src/chatwindowappearance_preferences.ui
+++ b/konversation/src/chatwindowappearance_preferences.ui
@@ -368,7 +368,7 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_Timestamping</tabstop>
<tabstop>kcfg_ShowBacklog</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/konversation/src/chatwindowbehaviour_preferences.ui b/konversation/src/chatwindowbehaviour_preferences.ui
index 754974d..0e5c779 100644
--- a/konversation/src/chatwindowbehaviour_preferences.ui
+++ b/konversation/src/chatwindowbehaviour_preferences.ui
@@ -369,6 +369,6 @@
<tabstop>kcfg_AutoWhoContinuousEnabled</tabstop>
<tabstop>kcfg_AutoWhoContinuousEnabled</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui
index 717c7a8..54f68ac 100644
--- a/konversation/src/colorsappearance_preferences.ui
+++ b/konversation/src/colorsappearance_preferences.ui
@@ -1345,8 +1345,8 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_IrcColorCode14</tabstop>
<tabstop>kcfg_IrcColorCode15</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp
index 1141799..54f54b1 100644
--- a/konversation/src/common.cpp
+++ b/konversation/src/common.cpp
@@ -128,9 +128,9 @@ namespace Konversation
append = ';';
}
- // Don't consider trailing closing tqparenthesis part of link when
- // there's an opening tqparenthesis preceding the beginning of the
- // URL or there is no opening tqparenthesis in the URL at all.
+ // Don't consider trailing closing parenthesis part of link when
+ // there's an opening parenthesis preceding the beginning of the
+ // URL or there is no opening parenthesis in the URL at all.
if (href.right(1) == ")" && (filteredLine.mid(pos-1,1) == "(" || !href.tqcontains("(")))
{
href.truncate(href.length()-1);
diff --git a/konversation/src/connectionbehavior_preferences.ui b/konversation/src/connectionbehavior_preferences.ui
index 526de9a..8c2f2a1 100644
--- a/konversation/src/connectionbehavior_preferences.ui
+++ b/konversation/src/connectionbehavior_preferences.ui
@@ -176,8 +176,8 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_ReconnectCount</tabstop>
<tabstop>kcfg_RawLog</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui
index c66936c..9ae128a 100644
--- a/konversation/src/dcc_preferencesui.ui
+++ b/konversation/src/dcc_preferencesui.ui
@@ -517,7 +517,7 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_DccChatPortsFirst</tabstop>
<tabstop>kcfg_DccChatPortsLast</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui
index a7dae6a..24f6742 100644
--- a/konversation/src/dcctransferdetailedinfopanelui.ui
+++ b/konversation/src/dcctransferdetailedinfopanelui.ui
@@ -481,7 +481,7 @@
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kprogress.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui
index 75c9a03..389a252 100644
--- a/konversation/src/fontappearance_preferences.ui
+++ b/konversation/src/fontappearance_preferences.ui
@@ -150,8 +150,8 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_FixedMOTD</tabstop>
<tabstop>kcfg_UseBoldNicks</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint>
diff --git a/konversation/src/generalbehavior_preferences.ui b/konversation/src/generalbehavior_preferences.ui
index 36e3fd8..164ca58 100644
--- a/konversation/src/generalbehavior_preferences.ui
+++ b/konversation/src/generalbehavior_preferences.ui
@@ -348,8 +348,8 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_CustomVersionReply</tabstop>
<tabstop>kcfg_UseMultiRowInputBox</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui
index abc3d48..65baf8f 100644
--- a/konversation/src/highlight_preferencesui.ui
+++ b/konversation/src/highlight_preferencesui.ui
@@ -435,7 +435,7 @@
<tabstop>newButton</tabstop>
<tabstop>removeButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui
index a4a37d3..b726d29 100644
--- a/konversation/src/ignore_preferencesui.ui
+++ b/konversation/src/ignore_preferencesui.ui
@@ -208,8 +208,8 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>removeButton</tabstop>
<tabstop>removeAllButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp
index dcb306b..d025b73 100644
--- a/konversation/src/inputfilter.cpp
+++ b/konversation/src/inputfilter.cpp
@@ -121,7 +121,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
TQString sourceNick = prefix.left(pos);
TQString sourceHosttqmask = prefix.mid(pos + 1);
// remember hosttqmask for this nick, it could have changed
- server->addHosttqmaskToNick(sourceNick,sourceHosttqmask);
+ server->addHostmaskToNick(sourceNick,sourceHosttqmask);
TQString trailing = _trailing;
if(command=="privmsg")
@@ -1558,7 +1558,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
}
case RPL_USERHOST:
{
- // iterate over all nick/tqmasks in reply
+ // iterate over all nick/masks in reply
TQStringList uhosts=TQStringList::split(" ",trailing);
for(unsigned int index=0;index<uhosts.count();index++)
diff --git a/konversation/src/inputfilter.h b/konversation/src/inputfilter.h
index fae0834..ea943cc 100644
--- a/konversation/src/inputfilter.h
+++ b/konversation/src/inputfilter.h
@@ -39,7 +39,7 @@ class InputFilter : public TQObject
void reset(); // reset AutomaticRequest, WhoRequestList
- // use this when the client does automatics, like userhost for finding hosttqmasks
+ // use this when the client does automatics, like userhost for finding hostmasks
void setAutomaticRequest(const TQString& command, const TQString& name, bool yes);
int getAutomaticRequest(const TQString& command, const TQString& name);
void addWhoRequest(const TQString& name); // called from Server::send()
diff --git a/konversation/src/irccolorchooserui.ui b/konversation/src/irccolorchooserui.ui
index aa4bb5f..00a3cae 100644
--- a/konversation/src/irccolorchooserui.ui
+++ b/konversation/src/irccolorchooserui.ui
@@ -139,8 +139,8 @@ Choosing the default "&lt;i&gt;None&lt;/i&gt;" will not change the background co
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/konversation/src/joinchannelui.ui b/konversation/src/joinchannelui.ui
index bcb8750..7e88f74 100644
--- a/konversation/src/joinchannelui.ui
+++ b/konversation/src/joinchannelui.ui
@@ -100,8 +100,8 @@ the Free Software Foundation; either version 2 of the License, or
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/konvdcop.cpp b/konversation/src/konvdcop.cpp
index e8384c9..ae9d1a8 100644
--- a/konversation/src/konvdcop.cpp
+++ b/konversation/src/konvdcop.cpp
@@ -102,7 +102,7 @@ void KonvDCOP::say(const TQString& _server,const TQString& _target,const TQStrin
//Sadly, copy on write doesn't exist with TQString::tqreplace
TQString server(_server), target(_target), command(_command);
- // TODO: this just tqmasks a greater problem - Server::addQuery will return a query for '' --argonel
+ // TODO: this just masks a greater problem - Server::addQuery will return a query for '' --argonel
// TODO: other DCOP calls need argument checking too --argonel
if (server.isEmpty() || target.isEmpty() || command.isEmpty())
kdDebug() << "KonvDCOP::say() requires 3 arguments." << endl;
diff --git a/konversation/src/konvibookmarkmenu.cpp b/konversation/src/konvibookmarkmenu.cpp
index a421b96..582685a 100644
--- a/konversation/src/konvibookmarkmenu.cpp
+++ b/konversation/src/konvibookmarkmenu.cpp
@@ -27,8 +27,8 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
KonviBookmarkMenu::KonviBookmarkMenu( KBookmarkManager* mgr,
KonviBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot, bool _add,
-const TQString & tqparentAddress )
-: KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add, tqparentAddress),
+const TQString & parentAddress )
+: KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add, parentAddress),
m_kOwner(_owner)
{
/*
@@ -86,11 +86,11 @@ void KonviBookmarkMenu::fillBookmarkMenu()
addNewFolder();
}
- KBookmarkGroup tqparentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup();
- Q_ASSERT(!tqparentBookmark.isNull());
+ KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup();
+ Q_ASSERT(!parentBookmark.isNull());
bool separatorInserted = false;
- for ( KBookmark bm = tqparentBookmark.first(); !bm.isNull();
- bm = tqparentBookmark.next(bm) )
+ for ( KBookmark bm = parentBookmark.first(); !bm.isNull();
+ bm = parentBookmark.next(bm) )
{
TQString text = bm.text();
text.tqreplace( '&', "&&" );
diff --git a/konversation/src/konvibookmarkmenu.h b/konversation/src/konvibookmarkmenu.h
index 1dfcc7c..6a97926 100644
--- a/konversation/src/konvibookmarkmenu.h
+++ b/konversation/src/konvibookmarkmenu.h
@@ -44,7 +44,7 @@ class KonviBookmarkMenu : public KBookmarkMenu
KonviBookmarkMenu( KBookmarkManager* mgr,
KonviBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot,
- bool _add = true, const TQString & tqparentAddress = "");
+ bool _add = true, const TQString & parentAddress = "");
void fillBookmarkMenu();
diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
index 1847c76..5d630c4 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui
+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
@@ -161,8 +161,8 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kactivelabel.h</includehint>
<includehint>klistview.h</includehint>
diff --git a/konversation/src/linkaddressbook/nicklisttooltip.cpp b/konversation/src/linkaddressbook/nicklisttooltip.cpp
index 502198d..0fbcc24 100644
--- a/konversation/src/linkaddressbook/nicklisttooltip.cpp
+++ b/konversation/src/linkaddressbook/nicklisttooltip.cpp
@@ -38,7 +38,7 @@ namespace Konversation
void KonversationNickListViewToolTip::maybeTip( const TQPoint &pos )
{
- if( !tqparentWidget() || !m_listView )
+ if( !parentWidget() || !m_listView )
return;
TQListViewItem *item = m_listView->itemAt( pos );
diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
index 76b8eb9..5370a40 100644
--- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
+++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
@@ -40,7 +40,7 @@ namespace Konversation
void KonversationNicksOnlineToolTip::maybeTip( const TQPoint &pos )
{
- if( !tqparentWidget() || !m_nicksOnline || !m_nicksOnline->getNickListView() )
+ if( !parentWidget() || !m_nicksOnline || !m_nicksOnline->getNickListView() )
return;
KListView *m_listView = m_nicksOnline->getNickListView();
TQListViewItem *item = m_listView->itemAt( pos );
diff --git a/konversation/src/log_preferences.ui b/konversation/src/log_preferences.ui
index c7fa8cc..0ffdfc7 100644
--- a/konversation/src/log_preferences.ui
+++ b/konversation/src/log_preferences.ui
@@ -106,8 +106,8 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_AddHostnameToLog</tabstop>
<tabstop>kcfg_LogfilePath</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/nicklistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui
index b0ed9b1..3df61f0 100644
--- a/konversation/src/nicklistbehavior_preferencesui.ui
+++ b/konversation/src/nicklistbehavior_preferencesui.ui
@@ -151,8 +151,8 @@ the Free Software Foundation; either version 2 of the License, or
<tabstop>kcfg_SortBytqStatus</tabstop>
<tabstop>sortOrder</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
index 4161eab..81787b0 100644
--- a/konversation/src/osd.cpp
+++ b/konversation/src/osd.cpp
@@ -79,7 +79,7 @@ void OSDWidget::renderOSDText( const TQString &txt )
// Start painting!
TQPainter bufferPainter( &osdBuffer );
- TQPainter tqmaskPainter( &tqmask );
+ TQPainter maskPainter( &tqmask );
// Draw backing rectangle
const uint xround = (METRIC * 200) / textRect.width();
@@ -110,8 +110,8 @@ void OSDWidget::renderOSDText( const TQString &txt )
// Masking for transparency
tqmask.fill( TQt::black );
- tqmaskPainter.setBrush( TQt::white );
- tqmaskPainter.drawRoundRect( textRect, xround, yround );
+ maskPainter.setBrush( TQt::white );
+ maskPainter.drawRoundRect( textRect, xround, yround );
setMask( tqmask );
//do last to reduce noticeable change when showing multiple OSDs in succession
diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui
index 459be19..f854584 100644
--- a/konversation/src/osd_preferencesui.ui
+++ b/konversation/src/osd_preferencesui.ui
@@ -413,8 +413,8 @@
<tabstop>kcfg_OSDScreen</tabstop>
<tabstop>kcfg_OSDUseCustomColors</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui
index d3fb1b3..e81effd 100644
--- a/konversation/src/queuetunerbase.ui
+++ b/konversation/src/queuetunerbase.ui
@@ -763,5 +763,5 @@
</widget>
</hbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui
index 77fe401..91d66a4 100644
--- a/konversation/src/quickbuttons_preferencesui.ui
+++ b/konversation/src/quickbuttons_preferencesui.ui
@@ -213,7 +213,7 @@
<tabstop>newButton</tabstop>
<tabstop>removeButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konversation/src/searchbarbase.ui b/konversation/src/searchbarbase.ui
index f35ef94..64fae5f 100644
--- a/konversation/src/searchbarbase.ui
+++ b/konversation/src/searchbarbase.ui
@@ -121,8 +121,8 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="4"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint"/>
+<layoutdefaults spacing="6" margin="4"/>
+<layoutfunctions spacing="KDialog::spacingHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index b582dee..d280bf5 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -1108,7 +1108,7 @@ int Server::_send_internal(TQString outputLine)
int len=pay.length();
//only encode the actual user text, IRCD *should* desire only ASCII 31 < x < 127 for protocol elements
TQCString payload=codec->fromUnicode(pay, len);
- //aptqparently channel name isn't a protocol element...
+ //apparently channel name isn't a protocol element...
len=outputLineSplit[1].length();
TQCString dest=codec->fromUnicode(outputLineSplit[1], len);
@@ -2566,7 +2566,7 @@ Channel* Server::nickJoinsChannel(const TQString &channelName, const TQString &n
return outChannel;
}
-void Server::addHosttqmaskToNick(const TQString& sourceNick, const TQString& sourceHosttqmask)
+void Server::addHostmaskToNick(const TQString& sourceNick, const TQString& sourceHosttqmask)
{
// Update NickInfo.
NickInfoPtr nickInfo=getNickInfo(sourceNick);
@@ -2685,7 +2685,7 @@ void Server::renameNick(const TQString &nickname, const TQString &newNick)
void Server::userhost(const TQString& nick,const TQString& hosttqmask,bool away,bool /* ircOp */)
{
- addHosttqmaskToNick(nick, hosttqmask);
+ addHostmaskToNick(nick, hosttqmask);
// remember my IP for DCC things
// myself
if (m_ownIpByUserhost.isEmpty() && nick == getNickname())
diff --git a/konversation/src/server.h b/konversation/src/server.h
index 9a6b912..7a3fd69 100644
--- a/konversation/src/server.h
+++ b/konversation/src/server.h
@@ -105,7 +105,7 @@ void resetNickSelection();
void resetNickList(const TQString& channelName);
void addPendingNickList(const TQString& channelName,const TQStringList& nickList);
- void addHosttqmaskToNick(const TQString &sourceNick, const TQString &sourceHosttqmask);
+ void addHostmaskToNick(const TQString &sourceNick, const TQString &sourceHosttqmask);
Channel* nickJoinsChannel(const TQString &channelName, const TQString &nickname, const TQString &hosttqmask);
void renameNick(const TQString &nickname,const TQString &newNick);
Channel* removeNickFromChannel(const TQString &channelName, const TQString &nickname, const TQString &reason, bool quit=false);
diff --git a/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui
index 853568a..4ef4866 100644
--- a/konversation/src/servergroupdialogui.ui
+++ b/konversation/src/servergroupdialogui.ui
@@ -304,8 +304,8 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>klistbox.h</includehint>
diff --git a/konversation/src/tabnotifications_preferences.ui b/konversation/src/tabnotifications_preferences.ui
index 6b979d1..aaf68ac 100644
--- a/konversation/src/tabnotifications_preferences.ui
+++ b/konversation/src/tabnotifications_preferences.ui
@@ -395,7 +395,7 @@
<tabstop>kcfg_TabNotificationsSystemColor</tabstop>
<tabstop>kcfg_TabNotificationsOverride</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui
index e668412..9e8dbbe 100644
--- a/konversation/src/tabs_preferencesui.ui
+++ b/konversation/src/tabs_preferencesui.ui
@@ -187,6 +187,6 @@ the Free Software Foundation; either version 2 of the License, or
</spacer>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
index 28ab7fc..bf7d7ab 100644
--- a/konversation/src/theme_preferencesui.ui
+++ b/konversation/src/theme_preferencesui.ui
@@ -214,8 +214,8 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistbox.h</includehint>
</includehints>
diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp
index ab84d87..8b0e72e 100644
--- a/konversation/src/viewtree.cpp
+++ b/konversation/src/viewtree.cpp
@@ -52,7 +52,7 @@ ViewTree::ToolTip::ToolTip(TQWidget *tqparent, KListView *viewTree)
void ViewTree::ToolTip::maybeTip (const TQPoint &pos)
{
- if (!tqparentWidget() || !viewTree) return;
+ if (!parentWidget() || !viewTree) return;
ViewTreeItem* view = static_cast<ViewTreeItem*>(viewTree->itemAt(pos));
diff --git a/konversation/src/warnings_preferencesui.ui b/konversation/src/warnings_preferencesui.ui
index a65b6c4..b93ecb6 100644
--- a/konversation/src/warnings_preferencesui.ui
+++ b/konversation/src/warnings_preferencesui.ui
@@ -43,7 +43,7 @@
<tabstops>
<tabstop>dialogListView</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui
index 4b6260c..6fbcc36 100644
--- a/konversation/src/watchednicknames_preferencesui.ui
+++ b/konversation/src/watchednicknames_preferencesui.ui
@@ -403,8 +403,8 @@ When the nickname watcher is turned on, you will be notified when the nicknames
<tabstop>newButton</tabstop>
<tabstop>removeButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>