summaryrefslogtreecommitdiffstats
path: root/kopete/kopete/chatwindow
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/kopete/chatwindow')
-rw-r--r--kopete/kopete/chatwindow/chatmessagepart.cpp2
-rw-r--r--kopete/kopete/chatwindow/emoticonselector.cpp6
-rw-r--r--kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 53e318bf..e91c49fe 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -700,7 +700,7 @@ Kopete::Contact *ChatMessagePart::contactFromNode( const DOM::Node &n ) const
void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
{
- // look through tqparents until we find an Element
+ // look through parents until we find an Element
DOM::Node activeNode = nodeUnderMouse();
while ( !activeNode.isNull() && activeNode.nodeType() != DOM::Node::ELEMENT_NODE )
activeNode = activeNode.parentNode();
diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp
index 015f2f5c..7d446e6f 100644
--- a/kopete/kopete/chatwindow/emoticonselector.cpp
+++ b/kopete/kopete/chatwindow/emoticonselector.cpp
@@ -108,10 +108,10 @@ void EmoticonSelector::emoticonClicked(const TQString &str)
// kdDebug(14000) << "selected emoticon '" << str << "'" << endl;
// KDE4/TQt TODO: use qobject_cast instead.
emit ItemSelected ( str );
- if ( isVisible() && tqparentWidget() &&
- tqparentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+ if ( isVisible() && parentWidget() &&
+ parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
{
- tqparentWidget()->close();
+ parentWidget()->close();
}
}
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 6649f6b3..53f6ec71 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -96,7 +96,7 @@ FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *n
}
-bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*tqparentContact*/ )
+bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ )
{
return true;
}