TDE
/
konversation
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/konversation
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename old tq methods that no longer need a unique name

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 553b2c7f80
commit 01f5ea8375
76 changed files with 350 additions and 350 deletions
Show Stats Download Patch File Download Diff File

2
konversation/src/alias_preferencesui.ui
Unescape View File

@ -146,7 +146,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>350</height> <height>350</height>

2
konversation/src/autoreplace_preferencesui.ui
Unescape View File

@ -54,7 +54,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>506</height> <height>506</height>

50
konversation/src/channel.cpp
Unescape View File

@ -139,7 +139,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
// The box holding the channel modes // The box holding the channel modes
modeBox = new TQHBox(topicWidget); modeBox = new TQHBox(topicWidget);
modeBox->tqsetSizePolicy(hfixed); modeBox->setSizePolicy(hfixed);
modeT = new ModeButton("T",modeBox,0); modeT = new ModeButton("T",modeBox,0);
modeN = new ModeButton("N",modeBox,1); modeN = new ModeButton("N",modeBox,1);
modeS = new ModeButton("S",modeBox,2); modeS = new ModeButton("S",modeBox,2);
@ -240,33 +240,33 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
channelInput->installEventFilter(this); channelInput->installEventFilter(this);
// Set the widgets size policies // Set the widgets size policies
m_topicButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_topicButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
topicLine->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum)); topicLine->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
commandLineBox->tqsetSizePolicy(vfixed); commandLineBox->setSizePolicy(vfixed);
limit->setMaximumSize(40,100); limit->setMaximumSize(40,100);
limit->tqsetSizePolicy(hfixed); limit->setSizePolicy(hfixed);
modeT->setMaximumSize(20,100); modeT->setMaximumSize(20,100);
modeT->tqsetSizePolicy(hfixed); modeT->setSizePolicy(hfixed);
modeN->setMaximumSize(20,100); modeN->setMaximumSize(20,100);
modeN->tqsetSizePolicy(hfixed); modeN->setSizePolicy(hfixed);
modeS->setMaximumSize(20,100); modeS->setMaximumSize(20,100);
modeS->tqsetSizePolicy(hfixed); modeS->setSizePolicy(hfixed);
modeI->setMaximumSize(20,100); modeI->setMaximumSize(20,100);
modeI->tqsetSizePolicy(hfixed); modeI->setSizePolicy(hfixed);
modeP->setMaximumSize(20,100); modeP->setMaximumSize(20,100);
modeP->tqsetSizePolicy(hfixed); modeP->setSizePolicy(hfixed);
modeM->setMaximumSize(20,100); modeM->setMaximumSize(20,100);
modeM->tqsetSizePolicy(hfixed); modeM->setSizePolicy(hfixed);
modeK->setMaximumSize(20,100); modeK->setMaximumSize(20,100);
modeK->tqsetSizePolicy(hfixed); modeK->setSizePolicy(hfixed);
modeL->setMaximumSize(20,100); modeL->setMaximumSize(20,100);
modeL->tqsetSizePolicy(hfixed); modeL->setSizePolicy(hfixed);
getTextView()->tqsetSizePolicy(greedy); getTextView()->setSizePolicy(greedy);
nicknameListView->tqsetSizePolicy(hmodest); nicknameListView->setSizePolicy(hmodest);
connect(channelInput,TQT_SIGNAL (submit()),this,TQT_SLOT (channelTextEntered()) ); connect(channelInput,TQT_SIGNAL (submit()),this,TQT_SLOT (channelTextEntered()) );
connect(channelInput,TQT_SIGNAL (envelopeCommand()),this,TQT_SLOT (channelPassthroughCommand()) ); connect(channelInput,TQT_SIGNAL (envelopeCommand()),this,TQT_SLOT (channelPassthroughCommand()) );
@ -568,7 +568,7 @@ void Channel::popupCommand(int id)
break; break;
case Konversation::Ping: case Konversation::Ping:
{ {
unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t(); unsigned int time_t = TQDateTime::currentDateTime().toTime_t();
pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t); pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t);
} }
break; break;
@ -796,7 +796,7 @@ void Channel::completeNick()
{ {
nick = it.current(); nick = it.current();
if(nick->getChannelNick()->getNickname().tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive()) && if(nick->getChannelNick()->getNickname().startsWith(pattern, Preferences::nickCompletionCaseSensitive()) &&
(nick->getChannelNick()->timeStamp() > timeStamp)) (nick->getChannelNick()->timeStamp() > timeStamp))
{ {
timeStamp = nick->getChannelNick()->timeStamp(); timeStamp = nick->getChannelNick()->timeStamp();
@ -822,7 +822,7 @@ void Channel::completeNick()
lookNick = lookNick.section( prefixCharacter,1 ); lookNick = lookNick.section( prefixCharacter,1 );
} }
if(lookNick.tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive())) if(lookNick.startsWith(pattern, Preferences::nickCompletionCaseSensitive()))
{ {
foundNick = lookNick; foundNick = lookNick;
} }
@ -1521,7 +1521,7 @@ void Channel::setTopic(const TQString &newTopic)
if(m_topicHistory.first().section(' ', 2) != newTopic) if(m_topicHistory.first().section(' ', 2) != newTopic)
{ {
m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(newTopic)); m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(newTopic));
emit topicHistoryChanged(); emit topicHistoryChanged();
} }
} }
@ -1537,7 +1537,7 @@ void Channel::setTopic(const TQString &nickname, const TQString &newTopic) // Ov
appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic)); appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic));
} }
m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic)); m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic));
TQString topic = Konversation::removeIrcMarkup(newTopic); TQString topic = Konversation::removeIrcMarkup(newTopic);
topicLine->setText(topic); topicLine->setText(topic);
@ -1557,7 +1557,7 @@ TQString Channel::getTopic()
void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time) void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time)
{ {
if (time.isNull() || !time.isValid()) if (time.isNull() || !time.isValid())
time=TQDateTime::tqcurrentDateTime(); time=TQDateTime::currentDateTime();
if(topicAuthorUnknown) if(topicAuthorUnknown)
{ {
@ -2253,8 +2253,8 @@ void Channel::updateAppearance()
} }
else else
{ {
fg=tqcolorGroup().foreground(); fg=colorGroup().foreground();
bg=tqcolorGroup().base(); bg=colorGroup().base();
abg=KGlobalSettings::alternateBackgroundColor(); abg=KGlobalSettings::alternateBackgroundColor();
} }
@ -2797,7 +2797,7 @@ void Channel::append(const TQString& nickname, const TQString& message)
Nick* nick = getNickByName(nickname); Nick* nick = getNickByName(nickname);
if(nick) { if(nick) {
nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t()); nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t());
} }
} }
@ -2811,7 +2811,7 @@ void Channel::appendAction(const TQString& nickname, const TQString& message)
Nick* nick = getNickByName(nickname); Nick* nick = getNickByName(nickname);
if(nick) { if(nick) {
nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t()); nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t());
} }
} }

2
konversation/src/channellistpanel.cpp
Unescape View File

@ -223,7 +223,7 @@ void ChannelListPanel::saveList()
TQString header(i18n("Konversation Channel List: %1 - %2\n\n") TQString header(i18n("Konversation Channel List: %1 - %2\n\n")
.tqarg(m_server->getServerName()) .tqarg(m_server->getServerName())
.tqarg(TQDateTime::tqcurrentDateTime().toString())); .tqarg(TQDateTime::currentDateTime().toString()));
// send header to stream // send header to stream
stream << header; stream << header;

6
konversation/src/channeloptionsui.ui
Unescape View File

@ -267,7 +267,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>211</width> <width>211</width>
<height>20</height> <height>20</height>
@ -319,7 +319,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>301</width> <width>301</width>
<height>31</height> <height>31</height>
@ -383,7 +383,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

8
konversation/src/chatwindow.cpp
Unescape View File

@ -219,7 +219,7 @@ void ChatWindow::setLogfileName(const TQString& name)
if(firstLog) if(firstLog)
{ {
// status panels get special treatment here, since they have no server at the beginning // status panels get special treatment here, since they have no server at the beginning
if (getType() == tqStatus || getType() == DccChat) if (getType() == Status || getType() == DccChat)
{ {
logName = name + ".log"; logName = name + ".log";
} }
@ -236,7 +236,7 @@ void ChatWindow::setLogfileName(const TQString& name)
cdIntoLogPath(); cdIntoLogPath();
// Show last log lines. This idea was stole ... um ... inspired by PMP :) // Show last log lines. This idea was stole ... um ... inspired by PMP :)
// Don't do this for the server status windows, though // Don't do this for the server status windows, though
if((getType() != tqStatus) && logfile.open(IO_ReadOnly)) if((getType() != Status) && logfile.open(IO_ReadOnly))
{ {
unsigned long filePosition; unsigned long filePosition;
@ -343,13 +343,13 @@ void ChatWindow::logText(const TQString& text)
if(firstLog) if(firstLog)
{ {
TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::tqcurrentDateTime().toString())); TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::currentDateTime().toString()));
logStream << intro; logStream << intro;
firstLog=false; firstLog=false;
} }
TQTime time=TQTime::currentTime(); TQTime time=TQTime::currentTime();
TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::tqcurrentDate(Qt::LocalTime).toString()). TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::currentDate(Qt::LocalTime).toString()).
tqarg(time.toString("hh:mm:ss")).tqarg(text)); tqarg(time.toString("hh:mm:ss")).tqarg(text));
logStream << logLine; logStream << logLine;

2
konversation/src/chatwindow.h
Unescape View File

@ -35,7 +35,7 @@ class ChatWindow : public TQVBox
enum WindowType enum WindowType
{ {
tqStatus=0, Status=0,
Channel, Channel,
Query, Query,
DccChat, DccChat,

12
konversation/src/chatwindowappearance_preferences.ui
Unescape View File

@ -74,7 +74,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>191</width> <width>191</width>
<height>20</height> <height>20</height>
@ -129,7 +129,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>251</width> <width>251</width>
<height>20</height> <height>20</height>
@ -205,7 +205,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -233,7 +233,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -269,7 +269,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -320,7 +320,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

12
konversation/src/chatwindowbehaviour_preferences.ui
Unescape View File

@ -92,7 +92,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>410</width> <width>410</width>
<height>20</height> <height>20</height>
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>230</width> <width>230</width>
<height>20</height> <height>20</height>
@ -200,7 +200,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -236,7 +236,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>170</width> <width>170</width>
<height>20</height> <height>20</height>
@ -253,7 +253,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>190</width> <width>190</width>
<height>20</height> <height>20</height>
@ -331,7 +331,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>20</height> <height>20</height>

60
konversation/src/colorsappearance_preferences.ui
Unescape View File

@ -141,7 +141,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -158,7 +158,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -175,7 +175,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -192,7 +192,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -209,7 +209,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -226,7 +226,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -243,7 +243,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -260,7 +260,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -277,7 +277,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -294,7 +294,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -536,7 +536,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -553,7 +553,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -570,7 +570,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -587,7 +587,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -652,7 +652,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -669,7 +669,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -761,7 +761,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>271</width> <width>271</width>
<height>20</height> <height>20</height>
@ -962,7 +962,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -979,7 +979,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -996,7 +996,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1013,7 +1013,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1030,7 +1030,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1047,7 +1047,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1064,7 +1064,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1081,7 +1081,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1162,7 +1162,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1179,7 +1179,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1196,7 +1196,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1213,7 +1213,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -1296,7 +1296,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

2
konversation/src/common.cpp
Unescape View File

@ -144,7 +144,7 @@ namespace Konversation
continue; continue;
} }
if (urlPattern.cap(1).tqstartsWith("www.", false)) if (urlPattern.cap(1).startsWith("www.", false))
protocol = "http://"; protocol = "http://";
else if (urlPattern.cap(1).isEmpty()) else if (urlPattern.cap(1).isEmpty())
protocol = "mailto:"; protocol = "mailto:";

6
konversation/src/connectionbehavior_preferences.ui
Unescape View File

@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>278</width> <width>278</width>
<height>20</height> <height>20</height>
@ -119,7 +119,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>280</width> <width>280</width>
<height>20</height> <height>20</height>
@ -138,7 +138,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>60</height> <height>60</height>

12
konversation/src/dcc_preferencesui.ui
Unescape View File

@ -114,7 +114,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -214,7 +214,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>20</height> <height>20</height>
@ -231,7 +231,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>20</height> <height>20</height>
@ -248,7 +248,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>20</height> <height>20</height>
@ -329,7 +329,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>
@ -396,7 +396,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>

6
konversation/src/dccchat.cpp
Unescape View File

@ -418,7 +418,7 @@ void DccChat::showEvent(TQShowEvent* /* event */)
if(m_initialShow) { if(m_initialShow) {
m_initialShow = false; m_initialShow = false;
TQValueList<int> sizes; TQValueList<int> sizes;
sizes << m_sourceLine->tqsizeHint().height() << (height() - m_sourceLine->tqsizeHint().height()); sizes << m_sourceLine->sizeHint().height() << (height() - m_sourceLine->sizeHint().height());
m_headerSplitter->setSizes(sizes); m_headerSplitter->setSizes(sizes);
} }
} }
@ -435,8 +435,8 @@ void DccChat::updateAppearance()
} }
else else
{ {
fg=tqcolorGroup().foreground(); fg=colorGroup().foreground();
bg=tqcolorGroup().base(); bg=colorGroup().base();
} }
m_dccChatInput->unsetPalette(); m_dccChatInput->unsetPalette();

2
konversation/src/dccresumedialog.cpp
Unescape View File

@ -97,7 +97,7 @@ DccResumeDialog::DccResumeDialog(DccTransferRecv* item, const TQString& caption,
} }
updateDialogButtons(); updateDialogButtons();
setInitialSize(TQSize(500, tqsizeHint().height())); setInitialSize(TQSize(500, sizeHint().height()));
} }

28
konversation/src/dcctransfer.cpp
Unescape View File

@ -43,7 +43,7 @@ DccTransfer::DccTransfer( DccType dccType, TQObject* parent ) : TQObject(parent)
connect( &m_loggerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( logTransfer() ) ); connect( &m_loggerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( logTransfer() ) );
m_timeOffer = TQDateTime::tqcurrentDateTime(); m_timeOffer = TQDateTime::currentDateTime();
} }
DccTransfer::~DccTransfer() DccTransfer::~DccTransfer()
@ -60,7 +60,7 @@ DccTransfer::DccTransfer( const DccTransfer& obj )
m_bufferSize = 0; m_bufferSize = 0;
m_averageSpeed = obj.getAverageSpeed(); m_averageSpeed = obj.getAverageSpeed();
m_currentSpeed = obj.getCurrentSpeed(); m_currentSpeed = obj.getCurrentSpeed();
m_status = obj.gettqStatus(); m_status = obj.getStatus();
m_statusDetail = obj.getStatusDetail(); m_statusDetail = obj.getStatusDetail();
m_type = obj.getType(); m_type = obj.getType();
m_fileName = obj.getFileName(); m_fileName = obj.getFileName();
@ -88,20 +88,20 @@ DccTransfer::DccTransfer( const DccTransfer& obj )
void DccTransfer::setConnectionId( int id ) void DccTransfer::setConnectionId( int id )
{ {
if ( gettqStatus() == Configuring || gettqStatus() == Queued ) if ( getStatus() == Configuring || getStatus() == Queued )
m_connectionId = id; m_connectionId = id;
} }
void DccTransfer::setPartnerNick( const TQString& nick ) void DccTransfer::setPartnerNick( const TQString& nick )
{ {
if ( gettqStatus() == Configuring || gettqStatus() == Queued ) if ( getStatus() == Configuring || getStatus() == Queued )
m_partnerNick = nick; m_partnerNick = nick;
} }
bool DccTransfer::queue() bool DccTransfer::queue()
{ {
kdDebug() << "DccTransfer::queue()" << endl; kdDebug() << "DccTransfer::queue()" << endl;
if ( gettqStatus() != Configuring ) if ( getStatus() != Configuring )
return false; return false;
if ( m_fileName.isEmpty() ) if ( m_fileName.isEmpty() )
@ -110,13 +110,13 @@ bool DccTransfer::queue()
if ( m_connectionId == -1 || m_partnerNick.isEmpty() ) if ( m_connectionId == -1 || m_partnerNick.isEmpty() )
return false; return false;
settqStatus( Queued ); setStatus( Queued );
return true; return true;
} }
void DccTransfer::startTransferLogger() void DccTransfer::startTransferLogger()
{ {
m_timeTransferStarted = TQDateTime::tqcurrentDateTime(); m_timeTransferStarted = TQDateTime::currentDateTime();
m_loggerBaseTime.start(); m_loggerBaseTime.start();
m_loggerTimer.start( 100 ); m_loggerTimer.start( 100 );
} }
@ -124,7 +124,7 @@ void DccTransfer::startTransferLogger()
void DccTransfer::finishTransferLogger() void DccTransfer::finishTransferLogger()
{ {
if ( m_timeTransferFinished.isNull() ) if ( m_timeTransferFinished.isNull() )
m_timeTransferFinished = TQDateTime::tqcurrentDateTime(); m_timeTransferFinished = TQDateTime::currentDateTime();
m_loggerTimer.stop(); m_loggerTimer.stop();
updateTransferMeters(); updateTransferMeters();
} }
@ -137,21 +137,21 @@ void DccTransfer::logTransfer()
updateTransferMeters(); updateTransferMeters();
} }
void DccTransfer::settqStatus( DcctqStatus status, const TQString& statusDetail ) void DccTransfer::setStatus( DccStatus status, const TQString& statusDetail )
{ {
bool changed = ( status != m_status ); bool changed = ( status != m_status );
DcctqStatus oldtqStatus = m_status; DccStatus oldStatus = m_status;
m_status = status; m_status = status;
m_statusDetail = statusDetail; m_statusDetail = statusDetail;
if ( changed ) if ( changed )
emit statusChanged( this, m_status, oldtqStatus ); emit statusChanged( this, m_status, oldStatus );
} }
void DccTransfer::updateTransferMeters() void DccTransfer::updateTransferMeters()
{ {
const int timeToCalc = 5; const int timeToCalc = 5;
if ( gettqStatus() == Transferring ) if ( getStatus() == Transferring )
{ {
// update CurrentSpeed // update CurrentSpeed
@ -174,7 +174,7 @@ void DccTransfer::updateTransferMeters()
if ( m_transferLogTime.count() >= 2 ) if ( m_transferLogTime.count() >= 2 )
{ {
// FIXME: precision of average speed is too bad // FIXME: precision of average speed is too bad
m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::tqcurrentDateTime() ); m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::currentDateTime() );
m_currentSpeed = (double)( m_transferLogPosition.last() - m_transferLogPosition.front() ) / (double)( m_transferLogTime.last() - m_transferLogTime.front() ) * 1000; m_currentSpeed = (double)( m_transferLogPosition.last() - m_transferLogPosition.front() ) / (double)( m_transferLogTime.last() - m_transferLogTime.front() ) * 1000;
} }
else // avoid zero devision else // avoid zero devision
@ -240,7 +240,7 @@ DccTransfer::DccType DccTransfer::getType() const
return m_type; return m_type;
} }
DccTransfer::DcctqStatus DccTransfer::gettqStatus() const DccTransfer::DccStatus DccTransfer::getStatus() const
{ {
return m_status; return m_status;
} }

12
konversation/src/dcctransfer.h
Unescape View File

@ -39,7 +39,7 @@ class DccTransfer : public TQObject
Send Send
}; };
enum DcctqStatus enum DccStatus
{ {
Configuring = 0, // Not queud yet (this means that user can't see the item at this time) Configuring = 0, // Not queud yet (this means that user can't see the item at this time)
Queued, // Newly added DCC, waiting user's response Queued, // Newly added DCC, waiting user's response
@ -52,7 +52,7 @@ class DccTransfer : public TQObject
Aborted Aborted
}; };
enum UnavailabletqStatus enum UnavailableStatus
{ {
Calculating = -1, Calculating = -1,
NotInTransfer = -2, NotInTransfer = -2,
@ -66,7 +66,7 @@ class DccTransfer : public TQObject
DccTransfer( const DccTransfer& obj ); DccTransfer( const DccTransfer& obj );
DccType getType() const; DccType getType() const;
DcctqStatus gettqStatus() const; DccStatus getStatus() const;
const TQString& getStatusDetail() const; const TQString& getStatusDetail() const;
TQDateTime getTimeOffer() const; TQDateTime getTimeOffer() const;
int getConnectionId() const; int getConnectionId() const;
@ -100,7 +100,7 @@ class DccTransfer : public TQObject
signals: signals:
void transferStarted( DccTransfer* item ); void transferStarted( DccTransfer* item );
void done( DccTransfer* item ); void done( DccTransfer* item );
void statusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ); void statusChanged( DccTransfer* item, int newStatus, int oldStatus );
public slots: public slots:
virtual bool queue(); virtual bool queue();
@ -108,7 +108,7 @@ class DccTransfer : public TQObject
virtual void abort() {}; virtual void abort() {};
protected: protected:
void settqStatus( DcctqStatus status, const TQString& statusDetail = TQString() ); void setStatus( DccStatus status, const TQString& statusDetail = TQString() );
void startTransferLogger(); void startTransferLogger();
void finishTransferLogger(); void finishTransferLogger();
@ -122,7 +122,7 @@ class DccTransfer : public TQObject
protected: protected:
// transfer information // transfer information
DccType m_type; DccType m_type;
DcctqStatus m_status; DccStatus m_status;
TQString m_statusDetail; TQString m_statusDetail;
bool m_resumed; bool m_resumed;
bool m_reverse; bool m_reverse;

26
konversation/src/dcctransferdetailedinfopanel.cpp
Unescape View File

@ -61,7 +61,7 @@ void DccTransferDetailedInfoPanel::setItem( DccTransferPanelItem* item )
// If the file is already being transferred, the timer must be started here, // If the file is already being transferred, the timer must be started here,
// otherwise the information will not be updated every 0.5sec // otherwise the information will not be updated every 0.5sec
if (m_item->transfer()->gettqStatus() == DccTransfer::Transferring) if (m_item->transfer()->getStatus() == DccTransfer::Transferring)
m_autoViewUpdateTimer->start(500, false); m_autoViewUpdateTimer->start(500, false);
connect( m_item->transfer(), TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) ); connect( m_item->transfer(), TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) );
@ -83,10 +83,10 @@ void DccTransferDetailedInfoPanel::updateView()
// Location: // Location:
m_urlreqLocation->setURL( transfer->getFileURL().prettyURL() ); m_urlreqLocation->setURL( transfer->getFileURL().prettyURL() );
//m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->gettqStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus ); //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->getStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus );
m_urlreqLocation->lineEdit()->setReadOnly( transfer->gettqStatus() != DccTransfer::Queued ); m_urlreqLocation->lineEdit()->setReadOnly( transfer->getStatus() != DccTransfer::Queued );
m_urlreqLocation->lineEdit()->setFrame( transfer->gettqStatus() == DccTransfer::Queued ); m_urlreqLocation->lineEdit()->setFrame( transfer->getStatus() == DccTransfer::Queued );
m_urlreqLocation->button()->setEnabled( transfer->gettqStatus() == DccTransfer::Queued ); m_urlreqLocation->button()->setEnabled( transfer->getStatus() == DccTransfer::Queued );
m_buttonOpenFolder->setEnabled( !m_urlreqLocation->lineEdit()->text().isEmpty() ); m_buttonOpenFolder->setEnabled( !m_urlreqLocation->lineEdit()->text().isEmpty() );
// Partner: // Partner:
@ -110,11 +110,11 @@ void DccTransferDetailedInfoPanel::updateView()
else else
m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) ); m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) );
// tqStatus: // Status:
if ( transfer->gettqStatus() == DccTransfer::Transferring ) if ( transfer->getStatus() == DccTransfer::Transferring )
m_labeltqStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" ); m_labelStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" );
else else
m_labeltqStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' ); m_labelStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' );
// Progress: // Progress:
m_progress->setProgress( transfer->getProgress() ); m_progress->setProgress( transfer->getProgress() );
@ -146,7 +146,7 @@ void DccTransferDetailedInfoPanel::updateView()
// The transfer is still in progress // The transfer is still in progress
if ( transfer->getTimeTransferFinished().isNull() ) if ( transfer->getTimeTransferFinished().isNull() )
transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::tqcurrentDateTime() ); transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::currentDateTime() );
// The transfer has finished // The transfer has finished
else else
transferringTime = transfer->getTimeTransferStarted().secsTo( transfer->getTimeTransferFinished() ); transferringTime = transfer->getTimeTransferStarted().secsTo( transfer->getTimeTransferFinished() );
@ -176,15 +176,15 @@ void DccTransferDetailedInfoPanel::updateView()
m_labelTimeFinished->setText( "" ); m_labelTimeFinished->setText( "" );
} }
void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int oldtqStatus ) void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newStatus, int oldStatus )
{ {
updateView(); updateView();
if ( newtqStatus == DccTransfer::Transferring ) if ( newStatus == DccTransfer::Transferring )
{ {
// start auto view-update timer // start auto view-update timer
m_autoViewUpdateTimer->start( 500, false ); m_autoViewUpdateTimer->start( 500, false );
} }
else if ( oldtqStatus == DccTransfer::Transferring ) else if ( oldStatus == DccTransfer::Transferring )
{ {
// stop auto view-update timer // stop auto view-update timer
m_autoViewUpdateTimer->stop(); m_autoViewUpdateTimer->stop();

2
konversation/src/dcctransferdetailedinfopanel.h
Unescape View File

@ -33,7 +33,7 @@ class DccTransferDetailedInfoPanel : public DccTransferDetailedInfoPanelUI
private slots: private slots:
void updateView(); void updateView();
void slotTransferStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus ); void slotTransferStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus );
void slotLocationChanged( const TQString& url ); void slotLocationChanged( const TQString& url );
void slotOpenFolderButtonClicked(); void slotOpenFolderButtonClicked();

20
konversation/src/dcctransferdetailedinfopanelui.ui
Unescape View File

@ -71,7 +71,7 @@
<cstring>textLabel10</cstring> <cstring>textLabel10</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>tqStatus:</string> <string>Status:</string>
</property> </property>
</widget> </widget>
<widget class="TQLabel" row="6" column="0"> <widget class="TQLabel" row="6" column="0">
@ -92,7 +92,7 @@
</widget> </widget>
<widget class="TQLabel" row="4" column="1"> <widget class="TQLabel" row="4" column="1">
<property name="name"> <property name="name">
<cstring>m_labeltqStatus</cstring> <cstring>m_labelStatus</cstring>
</property> </property>
</widget> </widget>
<widget class="TQLabel" row="2" column="1"> <widget class="TQLabel" row="2" column="1">
@ -188,7 +188,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>130</width> <width>130</width>
<height>0</height> <height>0</height>
@ -218,7 +218,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>130</width> <width>130</width>
<height>0</height> <height>0</height>
@ -240,7 +240,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>130</width> <width>130</width>
<height>0</height> <height>0</height>
@ -278,7 +278,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>130</width> <width>130</width>
<height>0</height> <height>0</height>
@ -316,7 +316,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>130</width> <width>130</width>
<height>0</height> <height>0</height>
@ -386,7 +386,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>130</width> <width>130</width>
<height>0</height> <height>0</height>
@ -424,7 +424,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>130</width> <width>130</width>
<height>0</height> <height>0</height>
@ -470,7 +470,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>110</width> <width>110</width>
<height>20</height> <height>20</height>

22
konversation/src/dcctransfermanager.cpp
Unescape View File

@ -62,7 +62,7 @@ DccTransferRecv* DccTransferManager::resumeDownload( int connectionId, const TQS
TQValueListConstIterator< DccTransferRecv* > it; TQValueListConstIterator< DccTransferRecv* > it;
for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it )
{ {
if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) && if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) &&
(*it)->getConnectionId() == connectionId && (*it)->getConnectionId() == connectionId &&
(*it)->getPartnerNick() == partnerNick && (*it)->getPartnerNick() == partnerNick &&
(*it)->getFileName() == fileName && (*it)->getFileName() == fileName &&
@ -92,7 +92,7 @@ DccTransferSend* DccTransferManager::resumeUpload( int connectionId, const TQStr
TQValueListConstIterator< DccTransferSend* > it; TQValueListConstIterator< DccTransferSend* > it;
for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it )
{ {
if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) && if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) &&
(*it)->getConnectionId() == connectionId && (*it)->getConnectionId() == connectionId &&
(*it)->getPartnerNick() == partnerNick && (*it)->getPartnerNick() == partnerNick &&
(*it)->getFileName() == fileName && (*it)->getFileName() == fileName &&
@ -124,7 +124,7 @@ DccTransferSend* DccTransferManager::startReverseSending( int connectionId, cons
for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it )
{ {
if ( if (
(*it)->gettqStatus() == DccTransfer::WaitingRemote && (*it)->getStatus() == DccTransfer::WaitingRemote &&
(*it)->getConnectionId() == connectionId && (*it)->getConnectionId() == connectionId &&
(*it)->getPartnerNick() == partnerNick && (*it)->getPartnerNick() == partnerNick &&
(*it)->getFileName() == fileName && (*it)->getFileName() == fileName &&
@ -155,8 +155,8 @@ bool DccTransferManager::isLocalFileInWritingProcess( const KURL& url ) const
TQValueListConstIterator< DccTransferRecv* > it; TQValueListConstIterator< DccTransferRecv* > it;
for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it )
{ {
if ( ( (*it)->gettqStatus() == DccTransfer::Connecting || if ( ( (*it)->getStatus() == DccTransfer::Connecting ||
(*it)->gettqStatus() == DccTransfer::Transferring ) && (*it)->getStatus() == DccTransfer::Transferring ) &&
(*it)->getFileURL() == url ) (*it)->getFileURL() == url )
{ {
return true; return true;
@ -175,25 +175,25 @@ bool DccTransferManager::hasActiveTransfers()
TQValueListConstIterator< DccTransferSend* > it; TQValueListConstIterator< DccTransferSend* > it;
for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it )
{ {
if ((*it)->gettqStatus() == DccTransfer::Transferring) if ((*it)->getStatus() == DccTransfer::Transferring)
return true; return true;
} }
TQValueListConstIterator< DccTransferRecv* > it2; TQValueListConstIterator< DccTransferRecv* > it2;
for ( it2 = m_recvItems.begin() ; it2 != m_recvItems.end() ; ++it2 ) for ( it2 = m_recvItems.begin() ; it2 != m_recvItems.end() ; ++it2 )
{ {
if ((*it2)->gettqStatus() == DccTransfer::Transferring) if ((*it2)->getStatus() == DccTransfer::Transferring)
return true; return true;
} }
return false; return false;
} }
void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ) void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus )
{ {
kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldtqStatus << " -> " << newtqStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl; kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldStatus << " -> " << newStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl;
if ( newtqStatus == DccTransfer::Queued ) if ( newStatus == DccTransfer::Queued )
emit newTransferQueued( item ); emit newTransferQueued( item );
} }
@ -205,7 +205,7 @@ void DccTransferManager::slotSettingsChanged()
TQValueListConstIterator< DccTransferRecv* > it; TQValueListConstIterator< DccTransferRecv* > it;
for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it )
{ {
if ( (*it)->gettqStatus() == DccTransfer::Queued && if ( (*it)->getStatus() == DccTransfer::Queued &&
(*it)->getFileURL().directory() == m_defaultIncomingFolder ) (*it)->getFileURL().directory() == m_defaultIncomingFolder )
{ {
KURL url; KURL url;

2
konversation/src/dcctransfermanager.h
Unescape View File

@ -79,7 +79,7 @@ class DccTransferManager : public TQObject
void initTransfer( DccTransfer* transfer ); void initTransfer( DccTransfer* transfer );
private slots: private slots:
void slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ); void slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus );
void removeSendItem( DccTransfer* item ); void removeSendItem( DccTransfer* item );
void removeRecvItem( DccTransfer* item ); void removeRecvItem( DccTransfer* item );

18
konversation/src/dcctransferpanel.cpp
Unescape View File

@ -76,7 +76,7 @@ void DccTransferPanel::initGUI()
//m_listView->setColumnText(Column::TypeIcon, ""); //m_listView->setColumnText(Column::TypeIcon, "");
m_listView->setColumnText(Column::OfferDate, i18n("Started at")); m_listView->setColumnText(Column::OfferDate, i18n("Started at"));
m_listView->setColumnText(Column::tqStatus, i18n("Status")); m_listView->setColumnText(Column::Status, i18n("Status"));
m_listView->setColumnText(Column::FileName, i18n("File")); m_listView->setColumnText(Column::FileName, i18n("File"));
m_listView->setColumnText(Column::PartnerNick, i18n("Partner")); m_listView->setColumnText(Column::PartnerNick, i18n("Partner"));
m_listView->setColumnText(Column::Progress, i18n("Progress")); m_listView->setColumnText(Column::Progress, i18n("Progress"));
@ -201,7 +201,7 @@ void DccTransferPanel::updateButton()
DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() );
DccTransfer::DccType type = item->transfer()->getType(); DccTransfer::DccType type = item->transfer()->getType();
DccTransfer::DcctqStatus status = item->transfer()->gettqStatus(); DccTransfer::DccStatus status = item->transfer()->getStatus();
selectAll = true; selectAll = true;
selectAllCompleted |= ( status >= DccTransfer::Done ); selectAllCompleted |= ( status >= DccTransfer::Done );
@ -276,7 +276,7 @@ void DccTransferPanel::acceptDcc()
{ {
DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
DccTransfer* transfer = item->transfer(); DccTransfer* transfer = item->transfer();
if( transfer->getType() == DccTransfer::Receive && transfer->gettqStatus() == DccTransfer::Queued ) if( transfer->getType() == DccTransfer::Receive && transfer->getStatus() == DccTransfer::Queued )
transfer->start(); transfer->start();
} }
++it; ++it;
@ -292,7 +292,7 @@ void DccTransferPanel::abortDcc()
{ {
DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
DccTransfer* transfer = item->transfer(); DccTransfer* transfer = item->transfer();
if( transfer->gettqStatus() < DccTransfer::Done ) if( transfer->getStatus() < DccTransfer::Done )
transfer->abort(); transfer->abort();
} }
++it; ++it;
@ -308,7 +308,7 @@ void DccTransferPanel::resendFile()
{ {
DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
DccTransfer* transfer = item->transfer(); DccTransfer* transfer = item->transfer();
if( transfer->getType() == DccTransfer::Send && transfer->gettqStatus() >= DccTransfer::Done ) if( transfer->getType() == DccTransfer::Send && transfer->getStatus() >= DccTransfer::Done )
{ {
DccTransferSend* newTransfer = KonversationApplication::instance()->getDccTransferManager()->newUpload(); DccTransferSend* newTransfer = KonversationApplication::instance()->getDccTransferManager()->newUpload();
@ -335,7 +335,7 @@ void DccTransferPanel::clearDcc()
{ {
DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() );
// should we check that [item] is not null? // should we check that [item] is not null?
if( it.current()->isSelected() && item->transfer()->gettqStatus() >= DccTransfer::Done ) if( it.current()->isSelected() && item->transfer()->getStatus() >= DccTransfer::Done )
lst.append( it.current() ); lst.append( it.current() );
++it; ++it;
} }
@ -377,7 +377,7 @@ void DccTransferPanel::runDcc()
{ {
DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
DccTransfer* transfer = item->transfer(); DccTransfer* transfer = item->transfer();
if( transfer->getType() == DccTransfer::Send || transfer->gettqStatus() == DccTransfer::Done ) if( transfer->getType() == DccTransfer::Send || transfer->getStatus() == DccTransfer::Done )
item->runFile(); item->runFile();
} }
++it; ++it;
@ -392,7 +392,7 @@ void DccTransferPanel::showFileInfo()
if( it.current()->isSelected() ) if( it.current()->isSelected() )
{ {
DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->gettqStatus() == DccTransfer::Done ) if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->getStatus() == DccTransfer::Done )
item->openFileInfoDialog(); item->openFileInfoDialog();
} }
++it; ++it;
@ -416,7 +416,7 @@ void DccTransferPanel::selectAllCompleted()
while ( it.current() ) while ( it.current() )
{ {
DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
m_listView->setSelected( *it, item->transfer()->gettqStatus() >= DccTransfer::Done ); m_listView->setSelected( *it, item->transfer()->getStatus() >= DccTransfer::Done );
++it; ++it;
} }
updateButton(); updateButton();

2
konversation/src/dcctransferpanel.h
Unescape View File

@ -39,7 +39,7 @@ class DccTransferPanel : public ChatWindow
{ {
TypeIcon, TypeIcon,
OfferDate, OfferDate,
tqStatus, Status,
FileName, FileName,
PartnerNick, PartnerNick,
Progress, Progress,

24
konversation/src/dcctransferpanelitem.cpp
Unescape View File

@ -67,10 +67,10 @@ DccTransferPanelItem::~DccTransferPanelItem()
void DccTransferPanelItem::updateView() void DccTransferPanelItem::updateView()
{ {
setPixmap( DccTransferPanel::Column::TypeIcon, getTypeIcon() ); setPixmap( DccTransferPanel::Column::TypeIcon, getTypeIcon() );
setPixmap( DccTransferPanel::Column::tqStatus, getStatusIcon() ); setPixmap( DccTransferPanel::Column::Status, getStatusIcon() );
setText( DccTransferPanel::Column::OfferDate, m_transfer->getTimeOffer().toString( "hh:mm:ss" ) ); setText( DccTransferPanel::Column::OfferDate, m_transfer->getTimeOffer().toString( "hh:mm:ss" ) );
setText( DccTransferPanel::Column::tqStatus, getStatusText() ); setText( DccTransferPanel::Column::Status, getStatusText() );
setText( DccTransferPanel::Column::FileName, m_transfer->getFileName() ); setText( DccTransferPanel::Column::FileName, m_transfer->getFileName() );
setText( DccTransferPanel::Column::PartnerNick, m_transfer->getPartnerNick() ); setText( DccTransferPanel::Column::PartnerNick, m_transfer->getPartnerNick() );
setText( DccTransferPanel::Column::Position, getPositionPrettyText() ); setText( DccTransferPanel::Column::Position, getPositionPrettyText() );
@ -104,9 +104,9 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending )
if ( m_transfer->getTimeOffer() < item->transfer()->getTimeOffer() ) return -1; if ( m_transfer->getTimeOffer() < item->transfer()->getTimeOffer() ) return -1;
return 0; return 0;
break; break;
case DccTransferPanel::Column::tqStatus: case DccTransferPanel::Column::Status:
if ( m_transfer->gettqStatus() > item->transfer()->gettqStatus() ) return 1; if ( m_transfer->getStatus() > item->transfer()->getStatus() ) return 1;
if ( m_transfer->gettqStatus() < item->transfer()->gettqStatus() ) return -1; if ( m_transfer->getStatus() < item->transfer()->getStatus() ) return -1;
return 0; return 0;
break; break;
case DccTransferPanel::Column::Position: case DccTransferPanel::Column::Position:
@ -130,11 +130,11 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending )
return TQListViewItem::compare( i, col, ascending ); return TQListViewItem::compare( i, col, ascending );
} }
void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int /* oldtqStatus */ ) void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newStatus, int /* oldStatus */ )
{ {
updateView(); updateView();
if ( newtqStatus == DccTransfer::Transferring ) if ( newStatus == DccTransfer::Transferring )
startAutoViewUpdate(); startAutoViewUpdate();
} }
@ -167,7 +167,7 @@ void DccTransferPanelItem::showProgressBar()
{ {
if ( m_transfer->getFileSize() ) if ( m_transfer->getFileSize() )
{ {
TQRect rect = listView()->tqitemRect( this ); TQRect rect = listView()->itemRect( this );
TQHeader *head = listView()->header(); TQHeader *head = listView()->header();
rect.setLeft( head->sectionPos( DccTransferPanel::Column::Progress ) - head->offset() ); rect.setLeft( head->sectionPos( DccTransferPanel::Column::Progress ) - head->offset() );
rect.setWidth( head->sectionSize( DccTransferPanel::Column::Progress ) ); rect.setWidth( head->sectionSize( DccTransferPanel::Column::Progress ) );
@ -178,13 +178,13 @@ void DccTransferPanelItem::showProgressBar()
void DccTransferPanelItem::runFile() void DccTransferPanelItem::runFile()
{ {
if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done ) if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done )
new KRun( m_transfer->getFileURL(), listView() ); new KRun( m_transfer->getFileURL(), listView() );
} }
void DccTransferPanelItem::openFileInfoDialog() void DccTransferPanelItem::openFileInfoDialog()
{ {
if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done ) if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done )
{ {
TQStringList infoList; TQStringList infoList;
@ -278,7 +278,7 @@ TQPixmap DccTransferPanelItem::getTypeIcon() const
TQPixmap DccTransferPanelItem::getStatusIcon() const TQPixmap DccTransferPanelItem::getStatusIcon() const
{ {
TQString icon; TQString icon;
switch ( m_transfer->gettqStatus() ) switch ( m_transfer->getStatus() )
{ {
case DccTransfer::Queued: case DccTransfer::Queued:
icon = "player_stop"; icon = "player_stop";
@ -306,7 +306,7 @@ TQPixmap DccTransferPanelItem::getStatusIcon() const
TQString DccTransferPanelItem::getStatusText() const TQString DccTransferPanelItem::getStatusText() const
{ {
DccTransfer::DcctqStatus status = m_transfer->gettqStatus(); DccTransfer::DccStatus status = m_transfer->getStatus();
DccTransfer::DccType type = m_transfer->getType(); DccTransfer::DccType type = m_transfer->getType();
if ( status == DccTransfer::Queued ) if ( status == DccTransfer::Queued )

2
konversation/src/dcctransferpanelitem.h
Unescape View File

@ -71,7 +71,7 @@ class DccTransferPanelItem : public TQObject, public KListViewItem
static TQString secToHMS( long sec ); static TQString secToHMS( long sec );
private slots: private slots:
void slotStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus ); void slotStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus );
void updateView(); void updateView();
private: private:

36
konversation/src/dcctransferrecv.cpp
Unescape View File

@ -113,44 +113,44 @@ void DccTransferRecv::cleanUp()
// just for convenience // just for convenience
void DccTransferRecv::failed( const TQString& errorMessage ) void DccTransferRecv::failed( const TQString& errorMessage )
{ {
settqStatus( Failed, errorMessage ); setStatus( Failed, errorMessage );
cleanUp(); cleanUp();
emit done( this ); emit done( this );
} }
void DccTransferRecv::setPartnerIp( const TQString& ip ) void DccTransferRecv::setPartnerIp( const TQString& ip )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_partnerIp = ip; m_partnerIp = ip;
} }
void DccTransferRecv::setPartnerPort( const TQString& port ) void DccTransferRecv::setPartnerPort( const TQString& port )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_partnerPort = port; m_partnerPort = port;
} }
void DccTransferRecv::setFileSize( unsigned long fileSize ) void DccTransferRecv::setFileSize( unsigned long fileSize )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_fileSize = fileSize; m_fileSize = fileSize;
} }
void DccTransferRecv::setFileName( const TQString& fileName ) void DccTransferRecv::setFileName( const TQString& fileName )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_fileName = fileName; m_fileName = fileName;
} }
void DccTransferRecv::setFileURL( const KURL& url ) void DccTransferRecv::setFileURL( const KURL& url )
{ {
if ( gettqStatus() == Configuring || gettqStatus() == Queued ) if ( getStatus() == Configuring || getStatus() == Queued )
m_fileURL = url; m_fileURL = url;
} }
void DccTransferRecv::setReverse( bool reverse, const TQString& reverseToken ) void DccTransferRecv::setReverse( bool reverse, const TQString& reverseToken )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
{ {
m_reverse = reverse; m_reverse = reverse;
if ( reverse ) if ( reverse )
@ -165,7 +165,7 @@ bool DccTransferRecv::queue()
{ {
kdDebug() << "DccTransferRecv::queue()" << endl; kdDebug() << "DccTransferRecv::queue()" << endl;
if ( gettqStatus() != Configuring ) if ( getStatus() != Configuring )
return false; return false;
if ( m_partnerIp.isEmpty() || m_partnerPort.isEmpty() ) if ( m_partnerIp.isEmpty() || m_partnerPort.isEmpty() )
@ -237,7 +237,7 @@ void DccTransferRecv::abort() // public slot
m_writeCacheHandler->write( true ); // flush m_writeCacheHandler->write( true ); // flush
} }
settqStatus( Aborted ); setStatus( Aborted );
cleanUp(); cleanUp();
emit done( this ); emit done( this );
} }
@ -246,10 +246,10 @@ void DccTransferRecv::start() // public slot
{ {
kdDebug() << "DccTransferRecv::start() [BEGIN]" << endl; kdDebug() << "DccTransferRecv::start() [BEGIN]" << endl;
if ( gettqStatus() != Queued ) if ( getStatus() != Queued )
return; return;
settqStatus( Preparing ); setStatus( Preparing );
prepareLocalKio( false, false ); prepareLocalKio( false, false );
@ -305,7 +305,7 @@ void DccTransferRecv::askAndPrepareLocalKio( const TQString& message, int enable
break; break;
case DccResumeDialog::RA_Cancel: case DccResumeDialog::RA_Cancel:
default: default:
settqStatus( Queued ); setStatus( Queued );
} }
} }
@ -444,7 +444,7 @@ void DccTransferRecv::connectWithSender()
m_ownIp = DccCommon::getOwnIp( server ); m_ownIp = DccCommon::getOwnIp( server );
m_ownPort = TQString::number( DccCommon::getServerSocketPort( m_serverSocket ) ); m_ownPort = TQString::number( DccCommon::getServerSocketPort( m_serverSocket ) );
settqStatus( WaitingRemote, i18n( "Waiting for connection" ) ); setStatus( WaitingRemote, i18n( "Waiting for connection" ) );
server->dccReverseSendAck( m_partnerNick, m_fileName, DccCommon::textIpToNumericalIp( m_ownIp ), m_ownPort, m_fileSize, m_reverseToken ); server->dccReverseSendAck( m_partnerNick, m_fileName, DccCommon::textIpToNumericalIp( m_ownIp ), m_ownPort, m_fileSize, m_reverseToken );
@ -460,7 +460,7 @@ void DccTransferRecv::requestResume()
{ {
kdDebug() << "DccTransferRecv::requestResume()" << endl; kdDebug() << "DccTransferRecv::requestResume()" << endl;
settqStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) ); setStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) );
startConnectionTimer( 30 ); startConnectionTimer( 30 );
@ -503,7 +503,7 @@ void DccTransferRecv::connectToSendServer()
// connect to sender // connect to sender
settqStatus( Connecting ); setStatus( Connecting );
m_recvSocket = new KNetwork::KStreamSocket( m_partnerIp, m_partnerPort, this); m_recvSocket = new KNetwork::KStreamSocket( m_partnerIp, m_partnerPort, this);
@ -577,7 +577,7 @@ void DccTransferRecv::startReceiving()
connect( m_recvSocket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( sendAck() ) ); connect( m_recvSocket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( sendAck() ) );
connect( m_recvSocket, TQT_SIGNAL( closed() ), this, TQT_SLOT( slotSocketClosed() ) ); connect( m_recvSocket, TQT_SIGNAL( closed() ), this, TQT_SLOT( slotSocketClosed() ) );
settqStatus( Transferring ); setStatus( Transferring );
m_transferStartPosition = m_transferringPosition; m_transferStartPosition = m_transferringPosition;
@ -633,7 +633,7 @@ void DccTransferRecv::sendAck() // slot
void DccTransferRecv::slotLocalWriteDone() // <-WriteCacheHandler::done() void DccTransferRecv::slotLocalWriteDone() // <-WriteCacheHandler::done()
{ {
kdDebug() << "DccTransferRecv::slotLocalWriteDone()" << endl; kdDebug() << "DccTransferRecv::slotLocalWriteDone()" << endl;
settqStatus( Done ); setStatus( Done );
cleanUp(); cleanUp();
emit done( this ); emit done( this );
} }
@ -670,7 +670,7 @@ void DccTransferRecv::connectionTimeout() // slot
void DccTransferRecv::slotSocketClosed() void DccTransferRecv::slotSocketClosed()
{ {
finishTransferLogger(); finishTransferLogger();
if ( gettqStatus() == Transferring ) if ( getStatus() == Transferring )
failed( i18n( "Remote user disconnected" ) ); failed( i18n( "Remote user disconnected" ) );
} }

30
konversation/src/dcctransfersend.cpp
Unescape View File

@ -91,38 +91,38 @@ void DccTransferSend::cleanUp()
// just for convenience // just for convenience
void DccTransferSend::failed( const TQString& errorMessage ) void DccTransferSend::failed( const TQString& errorMessage )
{ {
settqStatus( Failed, errorMessage ); setStatus( Failed, errorMessage );
cleanUp(); cleanUp();
emit done( this ); emit done( this );
} }
void DccTransferSend::setFileURL( const KURL& url ) void DccTransferSend::setFileURL( const KURL& url )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_fileURL = url; m_fileURL = url;
} }
void DccTransferSend::setFileName( const TQString& fileName ) void DccTransferSend::setFileName( const TQString& fileName )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_fileName = fileName; m_fileName = fileName;
} }
void DccTransferSend::setOwnIp( const TQString& ownIp ) void DccTransferSend::setOwnIp( const TQString& ownIp )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_ownIp = ownIp; m_ownIp = ownIp;
} }
void DccTransferSend::setFileSize( KIO::filesize_t fileSize ) void DccTransferSend::setFileSize( KIO::filesize_t fileSize )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_fileSize = fileSize; m_fileSize = fileSize;
} }
void DccTransferSend::setReverse( bool reverse ) void DccTransferSend::setReverse( bool reverse )
{ {
if ( gettqStatus() == Configuring ) if ( getStatus() == Configuring )
m_reverse = reverse; m_reverse = reverse;
} }
@ -130,7 +130,7 @@ bool DccTransferSend::queue()
{ {
kdDebug() << "DccTransferSend::queue()" << endl; kdDebug() << "DccTransferSend::queue()" << endl;
if ( gettqStatus() != Configuring ) if ( getStatus() != Configuring )
return false; return false;
if ( m_ownIp.isEmpty() ) if ( m_ownIp.isEmpty() )
@ -217,7 +217,7 @@ void DccTransferSend::abort() // public slot
{ {
kdDebug() << "DccTransferSend::abort()" << endl; kdDebug() << "DccTransferSend::abort()" << endl;
settqStatus( Aborted ); setStatus( Aborted );
cleanUp(); cleanUp();
emit done( this ); emit done( this );
} }
@ -226,7 +226,7 @@ void DccTransferSend::start() // public slot
{ {
kdDebug() << "DccTransferSend::start()" << endl; kdDebug() << "DccTransferSend::start()" << endl;
if ( gettqStatus() != Queued ) if ( getStatus() != Queued )
return; return;
// common procedure // common procedure
@ -283,7 +283,7 @@ void DccTransferSend::start() // public slot
server->dccPassiveSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_fileSize, m_reverseToken ); server->dccPassiveSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_fileSize, m_reverseToken );
} }
settqStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) ); setStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) );
} }
void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQString& partnerPort ) void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQString& partnerPort )
@ -300,7 +300,7 @@ void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQSt
connect( m_sendSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( startSending() ) ); connect( m_sendSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( startSending() ) );
connect( m_sendSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotConnectionFailed( int ) ) ); connect( m_sendSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotConnectionFailed( int ) ) );
settqStatus( Connecting ); setStatus( Connecting );
m_sendSocket->connect(); m_sendSocket->connect();
} }
@ -309,7 +309,7 @@ bool DccTransferSend::setResume( unsigned long position )
{ {
kdDebug() << "DccTransferSend::setResume(): position=" << position << endl; kdDebug() << "DccTransferSend::setResume(): position=" << position << endl;
if ( gettqStatus() > WaitingRemote ) if ( getStatus() > WaitingRemote )
return false; return false;
if ( position >= m_fileSize ) if ( position >= m_fileSize )
@ -359,7 +359,7 @@ void DccTransferSend::startSending()
m_file.at( m_transferringPosition ); m_file.at( m_transferringPosition );
m_transferStartPosition = m_transferringPosition; m_transferStartPosition = m_transferringPosition;
settqStatus( Transferring ); setStatus( Transferring );
m_sendSocket->enableWrite( true ); m_sendSocket->enableWrite( true );
m_sendSocket->enableRead( m_fastSend ); m_sendSocket->enableRead( m_fastSend );
startTransferLogger(); // initialize CPS counter, ETA counter, etc... startTransferLogger(); // initialize CPS counter, ETA counter, etc...
@ -407,7 +407,7 @@ void DccTransferSend::getAck() // slot
{ {
kdDebug() << "DccTransferSend::getAck(): Received final ACK." << endl; kdDebug() << "DccTransferSend::getAck(): Received final ACK." << endl;
finishTransferLogger(); finishTransferLogger();
settqStatus( Done ); setStatus( Done );
cleanUp(); cleanUp();
emit done( this ); emit done( this );
break; // for safe break; // for safe
@ -457,7 +457,7 @@ void DccTransferSend::slotSendSocketClosed()
{ {
kdDebug() << "DccTransferSend::slotSendSocketClosed()" << endl; kdDebug() << "DccTransferSend::slotSendSocketClosed()" << endl;
finishTransferLogger(); finishTransferLogger();
if ( gettqStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) if ( getStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize )
failed( i18n( "Remote user disconnected" ) ); failed( i18n( "Remote user disconnected" ) );
} }

2
konversation/src/fontappearance_preferences.ui
Unescape View File

@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>161</height> <height>161</height>

6
konversation/src/generalbehavior_preferences.ui
Unescape View File

@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -88,7 +88,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -301,7 +301,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

8
konversation/src/highlight_preferencesui.ui
Unescape View File

@ -141,7 +141,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>250</height> <height>250</height>
@ -362,7 +362,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>120</width> <width>120</width>
<height>20</height> <height>20</height>
@ -379,7 +379,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -396,7 +396,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>

2
konversation/src/ignore_preferencesui.ui
Unescape View File

@ -185,7 +185,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

4
konversation/src/inputfilter.cpp
Unescape View File

@ -371,7 +371,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
i18n("Received CTCP-%1 request from %2, sending answer.") i18n("Received CTCP-%1 request from %2, sending answer.")
.tqarg("TIME").tqarg(sourceNick) .tqarg("TIME").tqarg(sourceNick)
); );
server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::tqcurrentDateTime().toString()); server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::currentDateTime().toString());
} }
// No known CTCP request, give a general message // No known CTCP request, give a general message
@ -431,7 +431,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
// pong reply, calculate turnaround time // pong reply, calculate turnaround time
if(replyReason.lower()=="ping") if(replyReason.lower()=="ping")
{ {
int dateArrived=TQDateTime::tqcurrentDateTime().toTime_t(); int dateArrived=TQDateTime::currentDateTime().toTime_t();
int dateSent=reply.toInt(); int dateSent=reply.toInt();
int time = dateArrived-dateSent; int time = dateArrived-dateSent;
TQString unit = "seconds"; TQString unit = "seconds";

6
konversation/src/ircinput.cpp
Unescape View File

@ -61,7 +61,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
connect(completionBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(insertCompletion(const TQString&))); connect(completionBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(insertCompletion(const TQString&)));
// widget may not be resized vertically // widget may not be resized vertically
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed)); setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed));
//NoWrap coupled with the size policy constrains the line edit to be one row high //NoWrap coupled with the size policy constrains the line edit to be one row high
setWordWrap(m_multiRow ? WidgetWidth : NoWrap); setWordWrap(m_multiRow ? WidgetWidth : NoWrap);
@ -130,7 +130,7 @@ void IRCInput::updateAppearance()
{ {
m_multiRow = Preferences::useMultiRowInputBox(); m_multiRow = Preferences::useMultiRowInputBox();
setWordWrap(m_multiRow ? WidgetWidth : NoWrap); setWordWrap(m_multiRow ? WidgetWidth : NoWrap);
m_lastHeight=heightForWidth(tqsizeHint().width()); m_lastHeight=heightForWidth(sizeHint().width());
ensureCursorVisible(); //appears to trigger updateGeometry ensureCursorVisible(); //appears to trigger updateGeometry
} }
@ -144,7 +144,7 @@ void IRCInput::resizeContents( int w, int h )
} }
// widget must be only one line high - luckily QT will enforce this via wrappping policy // widget must be only one line high - luckily QT will enforce this via wrappping policy
TQSize IRCInput::tqsizeHint() const TQSize IRCInput::sizeHint() const
{ {
constPolish(); constPolish();

2
konversation/src/ircinput.h
Unescape View File

@ -38,7 +38,7 @@ class IRCInput : public KTextEdit
int getOldCursorPosition(); int getOldCursorPosition();
TQString lastCompletion() const { return m_lastCompletion; } TQString lastCompletion() const { return m_lastCompletion; }
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
TQString text() const; TQString text() const;
signals: signals:

4
konversation/src/ircview.cpp
Unescape View File

@ -532,7 +532,7 @@ bool doHighlight, bool parseURL, bool self)
(whoSent.find(needleReg) != -1)); (whoSent.find(needleReg) != -1));
// remember captured patterns for later // remember captured patterns for later
captures=needleReg.tqcapturedTexts(); captures=needleReg.capturedTexts();
} }
else else
@ -1709,7 +1709,7 @@ TQString IRCView::timeStamp()
} }
else else
{ {
TQDate date = TQDate::tqcurrentDate(); TQDate date = TQDate::currentDate();
timeString = TQString("<font color=\"" + timeString = TQString("<font color=\"" +
timeColor + "\">[%1 %2]</font> ") timeColor + "\">[%1 %2]</font> ")
.tqarg(KGlobal::locale()->formatDate(date, true /*short format*/), .tqarg(KGlobal::locale()->formatDate(date, true /*short format*/),

12
konversation/src/ircviewbox.cpp
Unescape View File

@ -84,14 +84,14 @@ void IRCViewBox::searchNext(bool reversed)
if (match) if (match)
{ {
m_searchBar->setHasMatch(true); m_searchBar->setHasMatch(true);
m_searchBar->settqStatus(TQPixmap(), ""); m_searchBar->setStatus(TQPixmap(), "");
return; return;
} }
if (!m_matchedOnce) if (!m_matchedOnce)
{ {
m_searchBar->setHasMatch(false); m_searchBar->setHasMatch(false);
m_searchBar->settqStatus(getIcon("messagebox_warning"), m_searchBar->setStatus(getIcon("messagebox_warning"),
i18n("Phrase not found")); i18n("Phrase not found"));
return; return;
} }
@ -105,13 +105,13 @@ void IRCViewBox::searchNext(bool reversed)
if (!match) if (!match)
{ {
m_searchBar->setHasMatch(false); m_searchBar->setHasMatch(false);
m_searchBar->settqStatus(getIcon("messagebox_warning"), m_searchBar->setStatus(getIcon("messagebox_warning"),
i18n("Phrase not found")); i18n("Phrase not found"));
return; return;
} }
m_searchBar->setHasMatch(true); m_searchBar->setHasMatch(true);
m_searchBar->settqStatus(getIcon("messagebox_info"), m_searchBar->setStatus(getIcon("messagebox_info"),
i18n("Wrapped search")); i18n("Wrapped search"));
} }
@ -126,12 +126,12 @@ void IRCViewBox::slotSearchChanged(const TQString& pattern)
if (match) if (match)
{ {
m_searchBar->setHasMatch(true); m_searchBar->setHasMatch(true);
m_searchBar->settqStatus(TQPixmap(), ""); m_searchBar->setStatus(TQPixmap(), "");
} }
else else
{ {
m_searchBar->setHasMatch(false); m_searchBar->setHasMatch(false);
m_searchBar->settqStatus(getIcon("messagebox_warning"), m_searchBar->setStatus(getIcon("messagebox_warning"),
i18n("Phrase not found")); i18n("Phrase not found"));
} }

4
konversation/src/konversationapplication.cpp
Unescape View File

@ -343,7 +343,7 @@ void KonversationApplication::readOptions()
osd->setShadow(Preferences::oSDDrawShadow()); osd->setShadow(Preferences::oSDDrawShadow());
osd->setOffset(Preferences::oSDOffsetX(), Preferences::oSDOffsetY()); osd->setOffset(Preferences::oSDOffsetX(), Preferences::oSDOffsetY());
osd->tqsetAlignment((OSDWidget::Alignment)Preferences::oSDAlignment()); osd->setAlignment((OSDWidget::Alignment)Preferences::oSDAlignment());
if(Preferences::oSDUseCustomColors()) if(Preferences::oSDUseCustomColors())
{ {
@ -856,7 +856,7 @@ TQString KonversationApplication::doAutoreplace(const TQString& text,bool output
if(index != -1) if(index != -1)
{ {
// remember captured patterns // remember captured patterns
TQStringList captures = needleReg.tqcapturedTexts(); TQStringList captures = needleReg.capturedTexts();
// replace %0 - %9 in regex groups // replace %0 - %9 in regex groups
for(unsigned int capture=0;capture<captures.count();capture++) for(unsigned int capture=0;capture<captures.count();capture++)

2
konversation/src/konversationstatusbar.cpp
Unescape View File

@ -33,7 +33,7 @@ KonversationStatusBar::KonversationStatusBar(KonversationMainWindow* window)
m_mainLabel = new KSqueezedTextLabel(m_window->statusBar(),"mainLabel"); m_mainLabel = new KSqueezedTextLabel(m_window->statusBar(),"mainLabel");
setMainLabelText(i18n("Ready.")); setMainLabelText(i18n("Ready."));
m_mainLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); m_mainLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
m_mainLabel->setMinimumWidth(0); m_mainLabel->setMinimumWidth(0);
// KSqueezedLabel calculates the wrong height. Popular workaround. // KSqueezedLabel calculates the wrong height. Popular workaround.

2
konversation/src/konvibookmarkhandler.cpp
Unescape View File

@ -63,7 +63,7 @@ KonviBookmarkHandler::~KonviBookmarkHandler()
void KonviBookmarkHandler::slotEditBookmarks() void KonviBookmarkHandler::slotEditBookmarks()
{ {
KProcess proc; KProcess proc;
proc << TQString::tqfromLatin1("keditbookmarks"); proc << TQString::fromLatin1("keditbookmarks");
proc << "--nobrowser"; proc << "--nobrowser";
proc << "--caption" << i18n("Konversation Bookmarks Editor"); proc << "--caption" << i18n("Konversation Bookmarks Editor");
proc << m_file; proc << m_file;

12
konversation/src/linkaddressbook/addressbook.cpp
Unescape View File

@ -98,7 +98,7 @@ namespace Konversation
kdDebug() << "Addressbook::presenceString() called with an empty uid" << endl; kdDebug() << "Addressbook::presenceString() called with an empty uid" << endl;
return TQString("Error"); return TQString("Error");
} }
switch( presencetqStatus(uid)) switch( presenceStatus(uid))
{ {
case 0: case 0:
return ""; return "";
@ -113,7 +113,7 @@ namespace Konversation
} }
return TQString("Error"); return TQString("Error");
} }
int Addressbook::presencetqStatus(const TQString &uid) int Addressbook::presenceStatus(const TQString &uid)
{ {
return presenceStatusByAddressee(addressBook->findByUid(uid)); return presenceStatusByAddressee(addressBook->findByUid(uid));
} }
@ -125,7 +125,7 @@ namespace Konversation
kdDebug() << "Addressbook::canReceiveFiles() called with empty uid" << endl; kdDebug() << "Addressbook::canReceiveFiles() called with empty uid" << endl;
return false; return false;
} }
int presence = presencetqStatus(uid); int presence = presenceStatus(uid);
return (presence == 4) || (presence == 3); return (presence == 4) || (presence == 3);
} }
@ -137,7 +137,7 @@ namespace Konversation
return false; return false;
} }
//this should return false if they are offline. //this should return false if they are offline.
int result = presencetqStatus(uid); int result = presenceStatus(uid);
if(result == 3 || result == 4) return true; if(result == 3 || result == 4) return true;
return false; return false;
} }
@ -161,7 +161,7 @@ namespace Konversation
if(!isPresent(uid)) if(!isPresent(uid))
return TQPixmap(); return TQPixmap();
switch(presencetqStatus(uid)) switch(presenceStatus(uid))
{ {
case 0: //Unknown case 0: //Unknown
case 1: //Offline case 1: //Offline
@ -331,7 +331,7 @@ void Addressbook::emitContactPresenceChanged(const TQString &uid)
return; return;
}; };
emitContactPresenceChanged(uid, presencetqStatus(uid)); emitContactPresenceChanged(uid, presenceStatus(uid));
} }
} //NAMESPACE } //NAMESPACE

2
konversation/src/linkaddressbook/addressbook.h
Unescape View File

@ -52,7 +52,7 @@ namespace Konversation
// metadata // metadata
TQPixmap icon( const TQString &uid ); TQPixmap icon( const TQString &uid );
TQString context( const TQString &uid ); TQString context( const TQString &uid );
virtual int presencetqStatus(const TQString &uid); virtual int presenceStatus(const TQString &uid);
// App capabilities // App capabilities
TQStringList protocols(); TQStringList protocols();

4
konversation/src/linkaddressbook/kimiface.h
Unescape View File

@ -88,7 +88,7 @@ class KIMIface : virtual public DCOPObject
* @param uid the KABC uid you want the presence for. * @param uid the KABC uid you want the presence for.
* @return a numeric representation of presence - currently one of 0 (Unknown), 1 (Offline), 2 (Connecting), 3 (Away), 4 (Online) * @return a numeric representation of presence - currently one of 0 (Unknown), 1 (Offline), 2 (Connecting), 3 (Away), 4 (Online)
*/ */
virtual int presencetqStatus( const TQString & uid ) = 0; virtual int presenceStatus( const TQString & uid ) = 0;
/** /**
* Indicate if a given uid can receive files * Indicate if a given uid can receive files
* @param uid the KABC uid you are interested in. * @param uid the KABC uid you are interested in.
@ -175,7 +175,7 @@ class KIMIface : virtual public DCOPObject
* Indicates that a contact's presence has changed * Indicates that a contact's presence has changed
* @param uid the contact whose presence changed. * @param uid the contact whose presence changed.
* @param appId the dcop application id of the program the signal originates from. * @param appId the dcop application id of the program the signal originates from.
* @param presence the new numeric presence @ref presencetqStatus * @param presence the new numeric presence @ref presenceStatus
*/ */
void contactPresenceChanged( TQString uid, TQCString appId, int presence ); void contactPresenceChanged( TQString uid, TQCString appId, int presence );
}; };

2
konversation/src/linkaddressbook/linkaddressbookui_base.ui
Unescape View File

@ -37,7 +37,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>405</width> <width>405</width>
<height>20</height> <height>20</height>

8
konversation/src/linkaddressbook/nicklisttooltip.cpp
Unescape View File

@ -52,17 +52,17 @@ namespace Konversation
return; return;
TQString toolTip; TQString toolTip;
TQRect tqitemRect = m_listView->tqitemRect( item ); TQRect itemRect = m_listView->itemRect( item );
uint leftMargin = m_listView->treeStepSize() * uint leftMargin = m_listView->treeStepSize() *
( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) +
m_listView->itemMargin(); m_listView->itemMargin();
uint xAdjust = tqitemRect.left() + leftMargin; uint xAdjust = itemRect.left() + leftMargin;
uint yAdjust = tqitemRect.top(); uint yAdjust = itemRect.top();
TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust );
toolTip = Konversation::removeIrcMarkup(nick->getChannelNick()->tooltip()); toolTip = Konversation::removeIrcMarkup(nick->getChannelNick()->tooltip());
if(!toolTip.isEmpty()) if(!toolTip.isEmpty())
tip(tqitemRect, toolTip); tip(itemRect, toolTip);
} }
} // namespace Konversation } // namespace Konversation

8
konversation/src/linkaddressbook/nicksonlinetooltip.cpp
Unescape View File

@ -51,17 +51,17 @@ namespace Konversation
if(!nickInfo ) if(!nickInfo )
return; return;
TQString toolTip; TQString toolTip;
TQRect tqitemRect = m_listView->tqitemRect( item ); TQRect itemRect = m_listView->itemRect( item );
uint leftMargin = m_listView->treeStepSize() * uint leftMargin = m_listView->treeStepSize() *
( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) +
m_listView->itemMargin(); m_listView->itemMargin();
uint xAdjust = tqitemRect.left() + leftMargin; uint xAdjust = itemRect.left() + leftMargin;
uint yAdjust = tqitemRect.top(); uint yAdjust = itemRect.top();
TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust );
toolTip = nickInfo->tooltip(); toolTip = nickInfo->tooltip();
if(!toolTip.isEmpty()) if(!toolTip.isEmpty())
tip(tqitemRect, toolTip); tip(itemRect, toolTip);
} }
} // namespace Konversation } // namespace Konversation

2
konversation/src/log_preferences.ui
Unescape View File

@ -92,7 +92,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>10</height> <height>10</height>

2
konversation/src/multilinetextedit.cpp
Unescape View File

@ -44,7 +44,7 @@ void MultilineTextEdit::drawWhitespaces()
TQPainter pa(viewport()); TQPainter pa(viewport());
// get a sane color // get a sane color
TQColor col=tqcolorGroup().link(); TQColor col=colorGroup().link();
// and a brush of the same color // and a brush of the same color
TQBrush fillBrush(col); TQBrush fillBrush(col);
// use it for line drawing // use it for line drawing

2
konversation/src/nickinfo.cpp
Unescape View File

@ -99,7 +99,7 @@ bool NickInfo::isIdentified() const { return m_identified; }
TQString NickInfo::getPrettyOnlineSince() const TQString NickInfo::getPrettyOnlineSince() const
{ {
TQString prettyOnlineSince; TQString prettyOnlineSince;
int daysto = m_onlineSince.date().daysTo( TQDate::tqcurrentDate()); int daysto = m_onlineSince.date().daysTo( TQDate::currentDate());
if(daysto == 0) prettyOnlineSince = i18n("Today"); if(daysto == 0) prettyOnlineSince = i18n("Today");
else if(daysto == 1) prettyOnlineSince = i18n("Yesterday"); else if(daysto == 1) prettyOnlineSince = i18n("Yesterday");
else prettyOnlineSince = m_onlineSince.toString("ddd d MMMM yyyy"); else prettyOnlineSince = m_onlineSince.toString("ddd d MMMM yyyy");

8
konversation/src/nicklistbehavior_preferencesui.ui
Unescape View File

@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or
</widget> </widget>
<widget class="TQCheckBox" row="3" column="0"> <widget class="TQCheckBox" row="3" column="0">
<property name="name"> <property name="name">
<cstring>kcfg_SortBytqStatus</cstring> <cstring>kcfg_SortByStatus</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -133,13 +133,13 @@ the Free Software Foundation; either version 2 of the License, or
</widget> </widget>
<connections> <connections>
<connection> <connection>
<sender>kcfg_SortBytqStatus</sender> <sender>kcfg_SortByStatus</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
<receiver>sortOrder</receiver> <receiver>sortOrder</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
<connection> <connection>
<sender>kcfg_SortBytqStatus</sender> <sender>kcfg_SortByStatus</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
<receiver>orderHintLabel</receiver> <receiver>orderHintLabel</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
@ -148,7 +148,7 @@ the Free Software Foundation; either version 2 of the License, or
<tabstops> <tabstops>
<tabstop>kcfg_ChannelDoubleClickAction</tabstop> <tabstop>kcfg_ChannelDoubleClickAction</tabstop>
<tabstop>kcfg_SortCaseInsensitive</tabstop> <tabstop>kcfg_SortCaseInsensitive</tabstop>
<tabstop>kcfg_SortBytqStatus</tabstop> <tabstop>kcfg_SortByStatus</tabstop>
<tabstop>sortOrder</tabstop> <tabstop>sortOrder</tabstop>
</tabstops> </tabstops>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>

6
konversation/src/nicklistview.cpp
Unescape View File

@ -86,14 +86,14 @@ KListView(parent)
int newitem; int newitem;
newitem = popup->insertItem(i18n("Open &Query"),Konversation::OpenQuery); newitem = popup->insertItem(i18n("Open &Query"),Konversation::OpenQuery);
popup->tqsetWhatsThis(newitem, "<qt>Start a private chat between you and this person.<p/><em>Technical note:</em><br>The conversation between you and this person will be sent via the server. This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server.</qt>"); popup->setWhatsThis(newitem, "<qt>Start a private chat between you and this person.<p/><em>Technical note:</em><br>The conversation between you and this person will be sent via the server. This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server.</qt>");
newitem = popup->insertItem(i18n("Open DCC &Chat"),Konversation::StartDccChat); newitem = popup->insertItem(i18n("Open DCC &Chat"),Konversation::StartDccChat);
popup->tqsetWhatsThis(newitem, "<qt>Start a private <em>D</em>irect <em>C</em>lient <em>C</em>onnection chat between you and this person.<p/><em>Technical note:</em><br />The conversation between you and this person will be sent directly. This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected. It also means that no irc server admin can view or spy on this chat.</qt>"); popup->setWhatsThis(newitem, "<qt>Start a private <em>D</em>irect <em>C</em>lient <em>C</em>onnection chat between you and this person.<p/><em>Technical note:</em><br />The conversation between you and this person will be sent directly. This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected. It also means that no irc server admin can view or spy on this chat.</qt>");
if (kapp->authorize("allow_downloading")) if (kapp->authorize("allow_downloading"))
{ {
newitem = popup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); newitem = popup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend);
popup->tqsetWhatsThis(newitem, "<qt>Send a file to this person. If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>"); popup->setWhatsThis(newitem, "<qt>Send a file to this person. If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>");
} }
popup->insertItem(SmallIconSet("mail_generic"),i18n("&Send Email..."), Konversation::SendEmail); popup->insertItem(SmallIconSet("mail_generic"),i18n("&Send Email..."), Konversation::SendEmail);

2
konversation/src/nicksonline.cpp
Unescape View File

@ -102,7 +102,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
"When you select a nickname in the list above, the buttons here are used " "When you select a nickname in the list above, the buttons here are used "
"to associate the nickname with an entry in KAddressBook."); "to associate the nickname with an entry in KAddressBook.");
TQWhatsThis::add(addressbookLabel, addressbookLabelWT); TQWhatsThis::add(addressbookLabel, addressbookLabelWT);
addressbookLabel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); addressbookLabel->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_editContactButton = new TQPushButton(i18n("Edit C&ontact..."), m_editContactButton = new TQPushButton(i18n("Edit C&ontact..."),
buttonBox, "nicksonline_editcontact_button"); buttonBox, "nicksonline_editcontact_button");
TQString editContactButtonWT = i18n( TQString editContactButtonWT = i18n(

4
konversation/src/osd.cpp
Unescape View File

@ -206,7 +206,7 @@ void OSDWidget::setOffset( int /*x*/, int y )
reposition(); reposition();
} }
void OSDWidget::tqsetAlignment( Alignment a ) void OSDWidget::setAlignment( Alignment a )
{ {
m_tqalignment = a; m_tqalignment = a;
reposition(); reposition();
@ -402,7 +402,7 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
// the code was taken from pilotDaemon.cc in KPilot // the code was taken from pilotDaemon.cc in KPilot
// static // static
OSDWidget::KDesktopLocktqStatus OSDWidget::isKDesktopLockRunning() OSDWidget::KDesktopLockStatus OSDWidget::isKDesktopLockRunning()
{ {
if (!Preferences::oSDCheckDesktopLock()) if (!Preferences::oSDCheckDesktopLock())
return NotLocked; return NotLocked;

6
konversation/src/osd.h
Unescape View File

@ -41,7 +41,7 @@ class OSDWidget : public TQWidget
void setTextColor(const TQColor &newcolor); void setTextColor(const TQColor &newcolor);
void setBackgroundColor(const TQColor &newColor); void setBackgroundColor(const TQColor &newColor);
void setOffset( int x, int y ); void setOffset( int x, int y );
void tqsetAlignment(Alignment); void setAlignment(Alignment);
void setScreen(uint screen); void setScreen(uint screen);
void setText(const TQString &text) { m_currentText = text; refresh(); } void setText(const TQString &text) { m_currentText = text; refresh(); }
@ -79,8 +79,8 @@ class OSDWidget : public TQWidget
/* called after most set*() calls to update the OSD */ /* called after most set*() calls to update the OSD */
void refresh(); void refresh();
enum KDesktopLocktqStatus { NotLocked=0, Locked=1, DCOPError=2 }; enum KDesktopLockStatus { NotLocked=0, Locked=1, DCOPError=2 };
static KDesktopLocktqStatus isKDesktopLockRunning(); static KDesktopLockStatus isKDesktopLockRunning();
static const int MARGIN = 15; static const int MARGIN = 15;

4
konversation/src/osd_preferences.cpp
Unescape View File

@ -108,7 +108,7 @@ void OSD_Config::saveSettings()
//x is ignored anyway, but leave incase we use in future //x is ignored anyway, but leave incase we use in future
konvApp->osd->setOffset(kcfg_OSDOffsetX->value(), kcfg_OSDOffsetY->value()); konvApp->osd->setOffset(kcfg_OSDOffsetX->value(), kcfg_OSDOffsetY->value());
konvApp->osd->tqsetAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value()); konvApp->osd->setAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value());
} }
} }
@ -116,7 +116,7 @@ void OSD_Config::saveSettings()
void OSD_Config::showEvent(TQShowEvent*) void OSD_Config::showEvent(TQShowEvent*)
{ {
//Update the preview //Update the preview
m_pOSDPreview->tqsetAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) ); m_pOSDPreview->setAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) );
m_pOSDPreview->setOffset(kcfg_OSDOffsetX->value(),kcfg_OSDOffsetY->value()); m_pOSDPreview->setOffset(kcfg_OSDOffsetX->value(),kcfg_OSDOffsetY->value());
m_pOSDPreview->setShown(kcfg_UseOSD->isChecked()); m_pOSDPreview->setShown(kcfg_UseOSD->isChecked());

6
konversation/src/osd_preferencesui.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>10</height> <height>10</height>
@ -263,7 +263,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>31</height> <height>31</height>
@ -340,7 +340,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>

6
konversation/src/outputfilter.cpp
Unescape View File

@ -181,8 +181,8 @@ namespace Konversation
// someone didn't notice leading spaces // someone didn't notice leading spaces
{ {
TQString testNickServ( inputLine.stripWhiteSpace() ); TQString testNickServ( inputLine.stripWhiteSpace() );
if(testNickServ.tqstartsWith(commandChar+"nickserv", false) if(testNickServ.startsWith(commandChar+"nickserv", false)
|| testNickServ.tqstartsWith(commandChar+"ns", false)) || testNickServ.startsWith(commandChar+"ns", false))
{ {
inputLine = testNickServ; inputLine = testNickServ;
} }
@ -762,7 +762,7 @@ namespace Konversation
if (request == "PING") if (request == "PING")
{ {
unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t(); unsigned int time_t = TQDateTime::currentDateTime().toTime_t();
result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t); result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t);
result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient); result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient);
} }

10
konversation/src/query.cpp
Unescape View File

@ -57,10 +57,10 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
awayState=false; awayState=false;
TQHBox *box = new TQHBox(m_headerSplitter); TQHBox *box = new TQHBox(m_headerSplitter);
addresseeimage = new TQLabel(box, "query_image"); addresseeimage = new TQLabel(box, "query_image");
addresseeimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); addresseeimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
addresseeimage->hide(); addresseeimage->hide();
addresseelogoimage = new TQLabel(box, "query_logo_image"); addresseelogoimage = new TQLabel(box, "query_logo_image");
addresseelogoimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); addresseelogoimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
addresseelogoimage->hide(); addresseelogoimage->hide();
queryHostmask=new Konversation::TopicLabel(box, "query_hostmask"); queryHostmask=new Konversation::TopicLabel(box, "query_hostmask");
@ -284,8 +284,8 @@ void Query::updateAppearance()
} }
else else
{ {
fg=tqcolorGroup().foreground(); fg=colorGroup().foreground();
bg=tqcolorGroup().base(); bg=colorGroup().base();
} }
queryInput->unsetPalette(); queryInput->unsetPalette();
@ -365,7 +365,7 @@ void Query::showEvent(TQShowEvent*)
if(m_initialShow) { if(m_initialShow) {
m_initialShow = false; m_initialShow = false;
TQValueList<int> sizes; TQValueList<int> sizes;
sizes << queryHostmask->tqsizeHint().height() << (height() - queryHostmask->tqsizeHint().height()); sizes << queryHostmask->sizeHint().height() << (height() - queryHostmask->sizeHint().height());
m_headerSplitter->setSizes(sizes); m_headerSplitter->setSizes(sizes);
} }
} }

4
konversation/src/queuetunerbase.ui
Unescape View File

@ -54,7 +54,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>34</height> <height>34</height>
@ -96,7 +96,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>33</height> <height>33</height>

2
konversation/src/quickbuttons_preferencesui.ui
Unescape View File

@ -193,7 +193,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>230</height> <height>230</height>

8
konversation/src/searchbar.cpp
Unescape View File

@ -126,7 +126,7 @@ void SearchBar::slotFind()
m_searchEdit->unsetPalette(); m_searchEdit->unsetPalette();
m_findNextButton->setEnabled(false); m_findNextButton->setEnabled(false);
m_findPreviousButton->setEnabled(false); m_findPreviousButton->setEnabled(false);
settqStatus(TQPixmap(), ""); setStatus(TQPixmap(), "");
return; return;
} }
@ -140,7 +140,7 @@ void SearchBar::slotFindNext()
m_searchEdit->unsetPalette(); m_searchEdit->unsetPalette();
m_findNextButton->setEnabled(false); m_findNextButton->setEnabled(false);
m_findPreviousButton->setEnabled(false); m_findPreviousButton->setEnabled(false);
settqStatus(TQPixmap(), ""); setStatus(TQPixmap(), "");
return; return;
} }
@ -154,7 +154,7 @@ void SearchBar::slotFindPrevious()
m_searchEdit->unsetPalette(); m_searchEdit->unsetPalette();
m_findNextButton->setEnabled(false); m_findNextButton->setEnabled(false);
m_findPreviousButton->setEnabled(false); m_findPreviousButton->setEnabled(false);
settqStatus(TQPixmap(), ""); setStatus(TQPixmap(), "");
return; return;
} }
@ -170,7 +170,7 @@ void SearchBar::setHasMatch(bool value)
m_findPreviousButton->setEnabled(value); m_findPreviousButton->setEnabled(value);
} }
void SearchBar::settqStatus(const TQPixmap& pix, const TQString& text) void SearchBar::setStatus(const TQPixmap& pix, const TQString& text)
{ {
if(!text.isEmpty()) { if(!text.isEmpty()) {
m_statusPixLabel->show(); m_statusPixLabel->show();

2
konversation/src/searchbar.h
Unescape View File

@ -34,7 +34,7 @@ class SearchBar : public SearchBarBase
~SearchBar(); ~SearchBar();
void setHasMatch(bool value); void setHasMatch(bool value);
void settqStatus(const TQPixmap& pix, const TQString& text); void setStatus(const TQPixmap& pix, const TQString& text);
TQString pattern() const; TQString pattern() const;

22
konversation/src/server.cpp
Unescape View File

@ -324,7 +324,7 @@ void Server::connectSignals()
connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )), connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )),
this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& ))); this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& )));
// tqStatus View // Status View
connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool))); connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool)));
// Scripts // Scripts
@ -1882,10 +1882,10 @@ void Server::dccGetDone(DccTransfer* item)
if(showfile.startsWith("\"") && showfile.endsWith("\"")) if(showfile.startsWith("\"") && showfile.endsWith("\""))
showfile = showfile.mid(1, showfile.length() - 2); showfile = showfile.mid(1, showfile.length() - 2);
if(item->gettqStatus()==DccTransfer::Done) if(item->getStatus()==DccTransfer::Done)
appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
"Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick())); "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick()));
else if(item->gettqStatus()==DccTransfer::Failed) else if(item->getStatus()==DccTransfer::Failed)
appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
"Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile, "Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile,
item->getPartnerNick(), item->getStatusDetail())); item->getPartnerNick(), item->getStatusDetail()));
@ -1901,16 +1901,16 @@ void Server::dccSendDone(DccTransfer* item)
if(showfile.startsWith("\"") && showfile.endsWith("\"")) if(showfile.startsWith("\"") && showfile.endsWith("\""))
showfile = showfile.mid(1, showfile.length() - 2); showfile = showfile.mid(1, showfile.length() - 2);
if(item->gettqStatus()==DccTransfer::Done) if(item->getStatus()==DccTransfer::Done)
appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
"Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick())); "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick()));
else if(item->gettqStatus()==DccTransfer::Failed) else if(item->getStatus()==DccTransfer::Failed)
appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
"Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(), "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(),
item->getStatusDetail())); item->getStatusDetail()));
} }
void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatus) void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus)
{ {
if(!item) if(!item)
return; return;
@ -1923,13 +1923,13 @@ void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatu
if ( item->getType() == DccTransfer::Send ) if ( item->getType() == DccTransfer::Send )
{ {
// when resuming, a message about the receiver's acceptance has been shown already, so suppress this message // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message
if ( newtqStatus == DccTransfer::Transferring && oldtqStatus == DccTransfer::WaitingRemote && !item->isResumed() ) if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() )
appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient", appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient",
"Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) ); "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) );
} }
else // type == Receive else // type == Receive
{ {
if ( newtqStatus == DccTransfer::Transferring && !item->isResumed() ) if ( newStatus == DccTransfer::Transferring && !item->isResumed() )
{ {
appendMessageToFrontmost( i18n( "DCC" ), appendMessageToFrontmost( i18n( "DCC" ),
i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...") i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...")
@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN
if (plus) if (plus)
{ {
TQDateTime when; TQDateTime when;
addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::tqcurrentDateTime().toTime_t())); addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::currentDateTime().toTime_t()));
} else { } else {
removeBan(channelName, parameter); removeBan(channelName, parameter);
} }
@ -3226,7 +3226,7 @@ TQString Server::awayTime() const
if (m_away) if (m_away)
{ {
int diff = TQDateTime::tqcurrentDateTime().toTime_t() - m_awayTime; int diff = TQDateTime::currentDateTime().toTime_t() - m_awayTime;
int num = diff / 3600; int num = diff / 3600;
if (num < 10) if (num < 10)
@ -3254,7 +3254,7 @@ TQString Server::awayTime() const
void Server::startAwayTimer() void Server::startAwayTimer()
{ {
m_awayTime = TQDateTime::tqcurrentDateTime().toTime_t(); m_awayTime = TQDateTime::currentDateTime().toTime_t();
} }
KABC::Addressee Server::getOfflineNickAddressee(TQString& nickname) KABC::Addressee Server::getOfflineNickAddressee(TQString& nickname)

2
konversation/src/server.h
Unescape View File

@ -502,7 +502,7 @@ void resetNickSelection();
void resumeDccSendTransfer(const TQString& sourceNick,const TQStringList& dccArguments); void resumeDccSendTransfer(const TQString& sourceNick,const TQStringList& dccArguments);
void dccGetDone(DccTransfer* item); void dccGetDone(DccTransfer* item);
void dccSendDone(DccTransfer* item); void dccSendDone(DccTransfer* item);
void dccStatusChanged(DccTransfer* item, int newtqStatus, int oldtqStatus); void dccStatusChanged(DccTransfer* item, int newStatus, int oldStatus);
void scriptNotFound(const TQString& name); void scriptNotFound(const TQString& name);
void scriptExecutionError(const TQString& name); void scriptExecutionError(const TQString& name);
void userhost(const TQString& nick,const TQString& hostmask,bool away,bool ircOp); void userhost(const TQString& nick,const TQString& hostmask,bool away,bool ircOp);

4
konversation/src/servergroupdialogui.ui
Unescape View File

@ -185,7 +185,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -264,7 +264,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>255</width> <width>255</width>
<height>20</height> <height>20</height>

2
konversation/src/serverlistview.cpp
Unescape View File

@ -66,7 +66,7 @@ void ServerListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQLis
else else
{ {
// Get the closest item before us ('atpos' or the one above, if any) // Get the closest item before us ('atpos' or the one above, if any)
if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
above = atpos->itemAbove(); above = atpos->itemAbove();
else else
above = atpos; above = atpos;

6
konversation/src/statuspanel.cpp
Unescape View File

@ -32,7 +32,7 @@
StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent) StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent)
{ {
setType(ChatWindow::tqStatus); setType(ChatWindow::Status);
setChannelEncodingSupported(true); setChannelEncodingSupported(true);
@ -164,8 +164,8 @@ void StatusPanel::updateAppearance()
} }
else else
{ {
fg=tqcolorGroup().foreground(); fg=colorGroup().foreground();
bg=tqcolorGroup().base(); bg=colorGroup().base();
} }
statusInput->unsetPalette(); statusInput->unsetPalette();

16
konversation/src/tabnotifications_preferences.ui
Unescape View File

@ -73,7 +73,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>Application events occur in Konsole tabs, the DCC tqStatus tab and other application tabs not used directly for chatting.</string> <string>Application events occur in Konsole tabs, the DCC Status tab and other application tabs not used directly for chatting.</string>
</property> </property>
</widget> </widget>
<spacer row="5" column="3"> <spacer row="5" column="3">
@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>
@ -122,7 +122,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>
@ -154,7 +154,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>21</height> <height>21</height>
@ -208,7 +208,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -225,7 +225,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>
@ -283,7 +283,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -337,7 +337,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>60</height> <height>60</height>

4
konversation/src/tabs_preferencesui.ui
Unescape View File

@ -83,7 +83,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>111</width> <width>111</width>
<height>20</height> <height>20</height>
@ -178,7 +178,7 @@ the Free Software Foundation; either version 2 of the License, or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>100</height> <height>100</height>

4
konversation/src/theme_preferencesui.ui
Unescape View File

@ -66,7 +66,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>131</width> <width>131</width>
<height>20</height> <height>20</height>
@ -77,7 +77,7 @@
<property name="name"> <property name="name">
<cstring>frame3_2</cstring> <cstring>frame3_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>

4
konversation/src/topiclabel.cpp
Unescape View File

@ -60,13 +60,13 @@ namespace Konversation
{ {
} }
TQSize TopicLabel::tqminimumSizeHint() const TQSize TopicLabel::minimumSizeHint() const
{ {
int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent(); int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent();
return TQSize(0, minHeight); return TQSize(0, minHeight);
} }
TQSize TopicLabel::tqsizeHint() const TQSize TopicLabel::sizeHint() const
{ {
int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent(); int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent();
return TQSize(0, minHeight); return TQSize(0, minHeight);

4
konversation/src/topiclabel.h
Unescape View File

@ -33,8 +33,8 @@ namespace Konversation
explicit TopicLabel(TQWidget *parent = 0, const char *name = 0); explicit TopicLabel(TQWidget *parent = 0, const char *name = 0);
~TopicLabel(); ~TopicLabel();
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
void setServer(Server* server); void setServer(Server* server);
enum PopupIDs { Copy,CopyUrl,SelectAll,Bookmark }; enum PopupIDs { Copy,CopyUrl,SelectAll,Bookmark };

46
konversation/src/viewcontainer.cpp
Unescape View File

@ -157,7 +157,7 @@ void ViewContainer::setupTabWidget()
KPushButton* closeBtn = new KPushButton(m_tabWidget); KPushButton* closeBtn = new KPushButton(m_tabWidget);
closeBtn->setPixmap(KGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small)); closeBtn->setPixmap(KGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small));
closeBtn->resize(22, 22); closeBtn->resize(22, 22);
closeBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_tabWidget->setCornerWidget(closeBtn); m_tabWidget->setCornerWidget(closeBtn);
connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentView())); connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentView()));
@ -220,7 +220,7 @@ void ViewContainer::setupViewTree()
{ {
ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i)); ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i));
if (view->getType() == ChatWindow::tqStatus) if (view->getType() == ChatWindow::Status)
{ {
if (view == m_frontView) if (view == m_frontView)
m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true); m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true);
@ -233,7 +233,7 @@ void ViewContainer::setupViewTree()
{ {
ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i)); ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i));
if (!view->getType() == ChatWindow::tqStatus) if (!view->getType() == ChatWindow::Status)
{ {
if (view == m_frontView) if (view == m_frontView)
m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true); m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true);
@ -426,7 +426,7 @@ void ViewContainer::updateViewActions(int index)
if (action) action->setEnabled(index < (m_tabWidget->count() - 1)); if (action) action->setEnabled(index < (m_tabWidget->count() - 1));
} }
if (server && (viewType == ChatWindow::tqStatus || server == m_frontServer)) if (server && (viewType == ChatWindow::Status || server == m_frontServer))
{ {
action = actionCollection()->action("reconnect_server"); action = actionCollection()->action("reconnect_server");
if (action) action->setEnabled(true); if (action) action->setEnabled(true);
@ -457,7 +457,7 @@ void ViewContainer::updateViewActions(int index)
if (notifyAction) if (notifyAction)
{ {
notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query ||
viewType == ChatWindow::tqStatus || viewType == ChatWindow::Konsole || viewType == ChatWindow::Status || viewType == ChatWindow::Konsole ||
viewType == ChatWindow::DccTransferPanel || viewType == ChatWindow::RawLog); viewType == ChatWindow::DccTransferPanel || viewType == ChatWindow::RawLog);
notifyAction->setChecked(view->notificationsEnabled()); notifyAction->setChecked(view->notificationsEnabled());
} }
@ -702,7 +702,7 @@ void ViewContainer::updateFrontView()
{ {
case ChatWindow::Channel: case ChatWindow::Channel:
case ChatWindow::Query: case ChatWindow::Query:
case ChatWindow::tqStatus: case ChatWindow::Status:
case ChatWindow::ChannelList: case ChatWindow::ChannelList:
case ChatWindow::RawLog: case ChatWindow::RawLog:
emit setStatusBarLagLabelShown(true); emit setStatusBarLagLabelShown(true);
@ -729,7 +729,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG
if (serverGroup) if (serverGroup)
{ {
if (view->getType() == ChatWindow::tqStatus && view->getServer()->getServerGroup() == serverGroup) if (view->getType() == ChatWindow::Status && view->getServer()->getServerGroup() == serverGroup)
{ {
TQString label = view->getServer()->getDisplayName(); TQString label = view->getServer()->getDisplayName();
@ -762,7 +762,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG
if (!Preferences::tabNotificationsText()) if (!Preferences::tabNotificationsText())
m_viewTree->setViewColor(view, m_window->tqcolorGroup().foreground()); m_viewTree->setViewColor(view, m_window->colorGroup().foreground());
} }
else if (m_tabWidget) else if (m_tabWidget)
{ {
@ -773,7 +773,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG
m_tabWidget->setTabIconSet(view, images->getCloseIcon()); m_tabWidget->setTabIconSet(view, images->getCloseIcon());
if (!Preferences::tabNotificationsText()) if (!Preferences::tabNotificationsText())
m_tabWidget->setTabColor(view, m_window->tqcolorGroup().foreground()); m_tabWidget->setTabColor(view, m_window->colorGroup().foreground());
} }
if (Preferences::tabNotificationsLeds() || Preferences::tabNotificationsText()) if (Preferences::tabNotificationsLeds() || Preferences::tabNotificationsText())
@ -1040,7 +1040,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
m_viewTree->setViewIcon(view, images->getPrivateLed(false)); m_viewTree->setViewIcon(view, images->getPrivateLed(false));
break; break;
case ChatWindow::tqStatus: case ChatWindow::Status:
m_viewTree->setViewIcon(view, images->getServerLed(false)); m_viewTree->setViewIcon(view, images->getServerLed(false));
break; break;
@ -1051,7 +1051,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
} }
TQColor textColor = (Preferences::inputFieldsBackgroundColor() TQColor textColor = (Preferences::inputFieldsBackgroundColor()
? Preferences::color(Preferences::ChannelMessage) : m_window->tqcolorGroup().foreground()); ? Preferences::color(Preferences::ChannelMessage) : m_window->colorGroup().foreground());
if (view->getType() == ChatWindow::Channel) if (view->getType() == ChatWindow::Channel)
{ {
@ -1083,7 +1083,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
m_tabWidget->setTabIconSet(view, images->getPrivateLed(false)); m_tabWidget->setTabIconSet(view, images->getPrivateLed(false));
break; break;
case ChatWindow::tqStatus: case ChatWindow::Status:
m_tabWidget->setTabIconSet(view, images->getServerLed(false)); m_tabWidget->setTabIconSet(view, images->getServerLed(false));
break; break;
@ -1093,7 +1093,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
} }
} }
TQColor textColor = m_window->tqcolorGroup().foreground(); TQColor textColor = m_window->colorGroup().foreground();
if (view->getType() == ChatWindow::Channel) if (view->getType() == ChatWindow::Channel)
{ {
@ -1196,7 +1196,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
{ {
tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer())
{ {
for (int index = sindex + 1; index < m_tabWidget->count(); index++) for (int index = sindex + 1; index < m_tabWidget->count(); index++)
{ {
@ -1226,7 +1226,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
{ {
tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer())
{ {
placement = sindex + 1; placement = sindex + 1;
break; break;
@ -1245,7 +1245,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
{ {
tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer())
{ {
for (int index = sindex + 1; index < m_tabWidget->count(); index++) for (int index = sindex + 1; index < m_tabWidget->count(); index++)
{ {
@ -1276,7 +1276,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
tmp_ChatWindow = static_cast<ChatWindow*>(m_tabWidget->page(sindex)); tmp_ChatWindow = static_cast<ChatWindow*>(m_tabWidget->page(sindex));
wtype = tmp_ChatWindow->getType(); wtype = tmp_ChatWindow->getType();
if (wtype != ChatWindow::tqStatus && wtype != ChatWindow::Channel if (wtype != ChatWindow::Status && wtype != ChatWindow::Channel
&& wtype != ChatWindow::RawLog && wtype != ChatWindow::Query && wtype != ChatWindow::RawLog && wtype != ChatWindow::Query
&& wtype != ChatWindow::DccChat && wtype != ChatWindow::ChannelList) && wtype != ChatWindow::DccChat && wtype != ChatWindow::ChannelList)
{ {
@ -1286,7 +1286,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
} }
break; break;
case ChatWindow::tqStatus: case ChatWindow::Status:
if (Preferences::tabNotificationsLeds()) if (Preferences::tabNotificationsLeds())
iconSet = images->getServerLed(false); iconSet = images->getServerLed(false);
else if (Preferences::closeButtons()) else if (Preferences::closeButtons())
@ -1299,7 +1299,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
if (tmp_ChatWindow->getType() != ChatWindow::Channel if (tmp_ChatWindow->getType() != ChatWindow::Channel
&& tmp_ChatWindow->getType() != ChatWindow::tqStatus && tmp_ChatWindow->getType() != ChatWindow::Status
&& tmp_ChatWindow->getType() != ChatWindow::RawLog && tmp_ChatWindow->getType() != ChatWindow::RawLog
&& tmp_ChatWindow->getType() != ChatWindow::Query && tmp_ChatWindow->getType() != ChatWindow::Query
&& tmp_ChatWindow->getType() != ChatWindow::DccChat) && tmp_ChatWindow->getType() != ChatWindow::DccChat)
@ -1624,7 +1624,7 @@ void ViewContainer::updateViewEncoding(ChatWindow* view)
if (codecAction) if (codecAction)
{ {
if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::tqStatus) if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::Status)
{ {
codecAction->setEnabled(view->isChannelEncodingSupported()); codecAction->setEnabled(view->isChannelEncodingSupported());
TQString encoding = view->getChannelEncoding(); TQString encoding = view->getChannelEncoding();
@ -1682,7 +1682,7 @@ void ViewContainer::showViewContextMenu(TQWidget* tab, const TQPoint& pos)
} }
} }
if (viewType == ChatWindow::tqStatus) if (viewType == ChatWindow::Status)
{ {
TQPtrList<KAction> serverActions; TQPtrList<KAction> serverActions;
KAction* action = actionCollection()->action("disconnect_server"); KAction* action = actionCollection()->action("disconnect_server");
@ -1825,7 +1825,7 @@ void ViewContainer::appendToFrontmost(const TQString& type,const TQString& messa
} }
// This might happen if canBeFrontView() is false for active ChatWindow // This might happen if canBeFrontView() is false for active ChatWindow
// and the view does not belong to any server (e.g. DCC tqStatus View). // and the view does not belong to any server (e.g. DCC Status View).
// Discard message in this case. // Discard message in this case.
if (!serverView) return; if (!serverView) return;
@ -1957,7 +1957,7 @@ void ViewContainer::openLogFile()
ChatWindow* view=static_cast<ChatWindow*>(m_frontView); ChatWindow* view=static_cast<ChatWindow*>(m_frontView);
ChatWindow::WindowType viewType=view->getType(); ChatWindow::WindowType viewType=view->getType();
if (viewType==ChatWindow::Channel || viewType==ChatWindow::Query || if (viewType==ChatWindow::Channel || viewType==ChatWindow::Query ||
viewType==ChatWindow::tqStatus || viewType==ChatWindow::DccChat) viewType==ChatWindow::Status || viewType==ChatWindow::DccChat)
{ {
openLogFile(view->getName(), view->logFileName()); openLogFile(view->getName(), view->logFileName());
} }

8
konversation/src/viewtree.cpp
Unescape View File

@ -56,7 +56,7 @@ void ViewTree::ToolTip::maybeTip (const TQPoint &pos)
ViewTreeItem* view = static_cast<ViewTreeItem*>(viewTree->itemAt(pos)); ViewTreeItem* view = static_cast<ViewTreeItem*>(viewTree->itemAt(pos));
if (view && view->isTruncated()) tip(viewTree->tqitemRect(view), view->getName()); if (view && view->isTruncated()) tip(viewTree->itemRect(view), view->getName());
} }
@ -503,7 +503,7 @@ void ViewTree::enableCloseButton()
bool ViewTree::isAboveIcon(TQPoint point, ViewTreeItem* item) bool ViewTree::isAboveIcon(TQPoint point, ViewTreeItem* item)
{ {
TQPoint inItem = point - tqitemRect(item).topLeft(); TQPoint inItem = point - itemRect(item).topLeft();
int MARGIN = 2; int MARGIN = 2;
int LED_ICON_SIZE = 14; int LED_ICON_SIZE = 14;
@ -748,7 +748,7 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewI
else else
{ {
// Get the closest item before us ('atpos' or the one above, if any). // Get the closest item before us ('atpos' or the one above, if any).
if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
above = atpos->itemAbove(); above = atpos->itemAbove();
else else
above = atpos; above = atpos;
@ -913,7 +913,7 @@ ViewTreeItem* ViewTree::getParentItemForView(ChatWindow* view)
while (item) while (item)
{ {
if (item->getViewType() == ChatWindow::tqStatus if (item->getViewType() == ChatWindow::Status
&& item->getView() && item->getView()
&& item->getView()->getServer() == server) && item->getView()->getServer() == server)
{ {

2
konversation/src/viewtreeitem.cpp
Unescape View File

@ -246,7 +246,7 @@ bool ViewTreeItem::sortLast() const
{ {
if (!m_isSeparator) if (!m_isSeparator)
{ {
if (getViewType() == ChatWindow::tqStatus if (getViewType() == ChatWindow::Status
|| getViewType() == ChatWindow::Channel || getViewType() == ChatWindow::Channel
|| getViewType() == ChatWindow::Query || getViewType() == ChatWindow::Query
|| getViewType() == ChatWindow::RawLog || getViewType() == ChatWindow::RawLog

4
konversation/src/watchednicknames_preferencesui.ui
Unescape View File

@ -106,7 +106,7 @@ command is placed in the &lt;b&gt;Input Line&lt;/b&gt; on the server window.&lt;
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>150</width> <width>150</width>
<height>20</height> <height>20</height>
@ -333,7 +333,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>160</height> <height>160</height>

Write Preview
Loading…
Cancel
Save