summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/winpopup
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/winpopup')
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp18
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.h2
-rw-r--r--kopete/protocols/winpopup/ui/wpaddcontactbase.ui12
-rw-r--r--kopete/protocols/winpopup/ui/wpeditaccountbase.ui16
-rw-r--r--kopete/protocols/winpopup/ui/wpuserinfowidget.ui6
-rw-r--r--kopete/protocols/winpopup/wpaccount.cpp14
-rw-r--r--kopete/protocols/winpopup/wpaddcontact.cpp4
-rw-r--r--kopete/protocols/winpopup/wpcontact.cpp16
-rw-r--r--kopete/protocols/winpopup/wpcontact.h4
-rw-r--r--kopete/protocols/winpopup/wpprotocol.cpp2
-rw-r--r--kopete/protocols/winpopup/wpuserinfo.cpp2
11 files changed, 48 insertions, 48 deletions
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 15440eda..8efe247a 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -107,8 +107,8 @@ bool WinPopupLib::checkMessageDir()
"If you have not configured anything yet (samba) please see\n"
"Install Into Samba (Configure... -> Account -> Edit) information\n"
"on how to do this.\n"
- "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR),
- TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
+ "Should the directory be created? (May need root password)").arg(WP_POPUP_DIR),
+ TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
if (tmpYesNo == KMessageBox::Yes) {
TQStringList tdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
@@ -126,8 +126,8 @@ bool WinPopupLib::checkMessageDir()
"%1 are wrong!\n"
"You will not receive messages if you say no.\n"
"You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
- "Fix? (May need root password)").tqarg(WP_POPUP_DIR),
- TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+ "Fix? (May need root password)").arg(WP_POPUP_DIR),
+ TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
if (tmpYesNo == KMessageBox::Yes) {
TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
@@ -148,7 +148,7 @@ void WinPopupLib::slotUpdateGroupData()
passedInitialHost = false;
todo.clear();
currentGroupsMap.clear();
- currentHost = TQString::tqfromLatin1("LOCALHOST");
+ currentHost = TQString::fromLatin1("LOCALHOST");
startReadProcess(currentHost);
}
@@ -184,7 +184,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r)
if (group.search(tmpLine) != -1) currentGroups[group.cap(1)] = group.cap(2);
if (error.search(tmpLine) != -1) {
kdDebug(14170) << "Connection to " << currentHost << " failed!" << endl;
- if (currentHost == TQString::tqfromLatin1("LOCALHOST")) currentHost = TQString::tqfromLatin1("failed"); // to be sure
+ if (currentHost == TQString::fromLatin1("LOCALHOST")) currentHost = TQString::fromLatin1("failed"); // to be sure
}
}
}
@@ -229,11 +229,11 @@ void WinPopupLib::slotReadProcessExited(KProcess *r)
todo += groupMaster;
}
} else {
- if (currentHost == TQString::tqfromLatin1("failed"))
+ if (currentHost == TQString::fromLatin1("failed"))
KMessageBox::error(Kopete::UI::Global::mainWidget(),
i18n("Connection to localhost failed!\n"
"Is your samba server running?"),
- TQString::tqfromLatin1("Winpopup"));
+ TQString::fromLatin1("Winpopup"));
}
}
@@ -303,7 +303,7 @@ void WinPopupLib::readMessages(const KFileItemList &items)
i18n("A message file could not be removed; "
"maybe the permissions are wrong.\n"
"Fix? (May need root password)"),
- TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+ TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
if (tmpYesNo == KMessageBox::Yes) {
TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) {
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index 686252ea..b4d7dc82 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -29,7 +29,7 @@
#include <kprocio.h>
#include <kfileitem.h>
-const TQString WP_POPUP_DIR = TQString::tqfromLatin1("/var/lib/winpopup");
+const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");
class KDirLister;
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index 8049dab1..a594a5b1 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -28,7 +28,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout59</cstring>
+ <cstring>layout59</cstring>
</property>
<hbox>
<property name="name">
@@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<vbox>
<property name="name">
@@ -80,7 +80,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<vbox>
<property name="name">
@@ -117,7 +117,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index 32c8ead5..ecf97df5 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -32,7 +32,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -64,7 +64,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout40</cstring>
+ <cstring>layout40</cstring>
</property>
<hbox>
<property name="name">
@@ -142,7 +142,7 @@
<property name="text">
<string>To receive WinPopup messages sent from other machines, the hostname above must be set to this machine's hostname.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -163,7 +163,7 @@
However, the recommended way is to ask your administrator to create this directory ('mkdir -p -m 0777 /var/lib/winpopup') and add
'message command = _PATH_TO_/winpopup-send.sh %s %m %t &amp;' (substitute _PATH_TO_ by the real path) to your smb.conf [global]-section.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -179,7 +179,7 @@ However, the recommended way is to ask your administrator to create this directo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>
@@ -209,7 +209,7 @@ However, the recommended way is to ask your administrator to create this directo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>135</height>
@@ -266,7 +266,7 @@ However, the recommended way is to ask your administrator to create this directo
</widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -274,7 +274,7 @@ However, the recommended way is to ask your administrator to create this directo
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
index aaec0dbe..7c87b961 100644
--- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
+++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
@@ -26,7 +26,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -34,7 +34,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -120,7 +120,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index eb881c70..d7439628 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -66,7 +66,7 @@ const TQStringList WPAccount::getHosts(const TQString &Group)
bool WPAccount::checkHost(const TQString &Name)
{
// kdDebug() << "WPAccount::checkHost: " << Name << endl;
- if (Name.upper() == TQString::tqfromLatin1("LOCALHOST")) {
+ if (Name.upper() == TQString::fromLatin1("LOCALHOST")) {
// Assume localhost is always there, but it will not appear in the samba output.
// Should never happen as localhost is now forbidden as contact, just for safety. GF
return true;
@@ -159,8 +159,8 @@ KActionMenu* WPAccount::actionMenu()
/// How to remove an action from Kopete::Account::actionMenu()? GF
- KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this);
- theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId()));
+ KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this);
+ theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId()));
if (mProtocol)
{
@@ -189,17 +189,17 @@ void WPAccount::slotSendMessage(const TQString &Body, const TQString &Destinatio
{
kdDebug(14170) << "WPAccount::slotSendMessage(" << Body << ", " << Destination << ")" << endl;
- if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
+ if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
mProtocol->sendMessage(Body, Destination);
}
void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason)
{
- if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
+ if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
connect( status );
- else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
+ else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
disconnect();
- else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
+ else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
setAway( true, reason );
}
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index 25e4b6d8..0ca685dc 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -18,7 +18,7 @@
* *
***************************************************************************/
// QT Includes
-#include <tqlayout.h>
+#include <layout.h>
// KDE Includes
#include <kcombobox.h>
@@ -93,7 +93,7 @@ bool WPAddContact::validateData()
// If our own host is not allowed as contact localhost should be forbidden as well,
// additionally somehow localhost as contact crashes when receiving a message from it?? GF
- if (tmpHostName.upper() == TQString::tqfromLatin1("LOCALHOST")) {
+ if (tmpHostName.upper() == TQString::fromLatin1("LOCALHOST")) {
KMessageBox::sorry(this, i18n("<qt>LOCALHOST is not allowed as contact.</qt>"), i18n("WinPopup"));
return false;
}
diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp
index 1aff6e32..103a2a85 100644
--- a/kopete/protocols/winpopup/wpcontact.cpp
+++ b/kopete/protocols/winpopup/wpcontact.cpp
@@ -51,8 +51,8 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
// Initialise and start the periodical checking for contact's status
setOnlineStatus(static_cast<WPProtocol *>(protocol())->WPOffline);
- connect(&checktqStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus()));
- checktqStatus.start(1000, false);
+ connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
+ checkStatus.start(1000, false);
}
TQPtrList<KAction> * WPContact::customContextMenuActions()
@@ -89,14 +89,14 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr
bool WPContact::isOnline() const
{
kdDebug(14170) << "[WPContact::isOnline()]" << endl;
- return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+ return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
}
*/
bool WPContact::isReachable()
{
// kdDebug(14170) << "[WPContact::isReachable()]" << endl;
- return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+ return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
}
void WPContact::slotChatSessionDestroyed()
@@ -131,7 +131,7 @@ void deleteContact()
}
*/
-void WPContact::slotChecktqStatus()
+void WPContact::slotCheckStatus()
{
bool oldWasConnected = myWasConnected;
bool newIsOnline = false;
@@ -141,11 +141,11 @@ void WPContact::slotChecktqStatus()
if (acct) newIsOnline = acct->checkHost(contactId());
if(newIsOnline != isOnline() || myWasConnected != oldWasConnected) {
- Kopete::OnlineStatus tmptqStatus = WPProtocol::protocol()->WPOffline;
+ Kopete::OnlineStatus tmpStatus = WPProtocol::protocol()->WPOffline;
if (myWasConnected && newIsOnline) {
- tmptqStatus = WPProtocol::protocol()->WPOnline;
+ tmpStatus = WPProtocol::protocol()->WPOnline;
}
- setOnlineStatus(tmptqStatus);
+ setOnlineStatus(tmpStatus);
}
}
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index 6843d6c2..8acd7235 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -62,7 +62,7 @@ public:
public slots:
virtual void slotUserInfo();
- void slotChecktqStatus(); // the call back for the checktqStatus timer
+ void slotCheckStatus(); // the call back for the checkStatus timer
void slotNewMessage(const TQString &Body, const TQDateTime &Arrival);
private slots:
@@ -73,7 +73,7 @@ private slots:
private:
bool myWasConnected; // true if protocol connected at last check
- TQTimer checktqStatus; // checks the status of this contact every second or so
+ TQTimer checkStatus; // checks the status of this contact every second or so
// KActionCollection *myActionCollection;
// holds all the protocol specific actions (not many!)
Kopete::ChatSession *m_manager;
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index d16c8e6a..91145338 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -58,7 +58,7 @@ WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList &
sProtocol = this;
- // Load tqStatus Actions
+ // Load Status Actions
// initActions();
// TODO: Maybe use this in the future?
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index c602b70e..162374b7 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -38,7 +38,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa
{
// kdDebug( 14170 ) << k_funcinfo << endl;
- setCaption( i18n( "User Info for %1" ).tqarg( m_contact->nickName() ) );
+ setCaption( i18n( "User Info for %1" ).arg( m_contact->nickName() ) );
m_mainWidget = new WPUserInfoWidget( this, "WPUserInfo::m_mainWidget" );
setMainWidget( m_mainWidget );