From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- ksirc/dccManager.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'ksirc/dccManager.cpp') diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index 386644b9..cbf63109 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -22,7 +22,7 @@ #define COL_CPS 4 #define COL_PER 5 -dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) +dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) : TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) { m_percent = 0; @@ -34,16 +34,16 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumToStatus(status)); + setText(COL_STAT, enumTotqStatus(status)); if(m_type == dccChat) setText(COL_SIZE, ""); else - setText(COL_SIZE, TQString("%1").arg(size)); + setText(COL_SIZE, TQString("%1").tqarg(size)); setText(COL_PER, ""); } -dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) +dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) : TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) { m_percent = 0; @@ -54,9 +54,9 @@ dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumToStatus(status)); + setText(COL_STAT, enumTotqStatus(status)); if(type != dccChat) - setText(COL_SIZE, TQString("%1").arg(size)); + setText(COL_SIZE, TQString("%1").tqarg(size)); setText(COL_PER, ""); } @@ -65,7 +65,7 @@ dccItem::~dccItem() { } -TQString dccItem::enumToStatus(enum dccStatus status) +TQString dccItem::enumTotqStatus(enum dcctqStatus status) { TQString str; switch(status){ @@ -108,7 +108,7 @@ TQString dccItem::enumToStatus(enum dccStatus status) void dccItem::setWhoPostfix(const TQString &post) { m_post = post; - setText(COL_WHO, TQString("%1 %2").arg(m_who).arg(post)); + setText(COL_WHO, TQString("%1 %2").tqarg(m_who).tqarg(post)); } void dccItem::changeFilename(const TQString &file) { @@ -121,10 +121,10 @@ void dccItem::changeWho(const TQString &who) { m_who = who; } -void dccItem::changeStatus(enum dccStatus status) +void dccItem::changetqStatus(enum dcctqStatus status) { m_manager->doChanged(); - setText(COL_STAT, enumToStatus(status)); + setText(COL_STAT, enumTotqStatus(status)); m_status = status; emit statusChanged(this); } @@ -146,13 +146,13 @@ void dccItem::setReceivedBytes(int bytes) (ctime >= (m_lasttime + 2)) ){ m_lasttime = ctime; - setText(COL_SIZE, TQString("%1/%2").arg(bytes).arg(m_size)); - setText(COL_PER, TQString("%1%").arg(per)); + setText(COL_SIZE, TQString("%1/%2").tqarg(bytes).tqarg(m_size)); + setText(COL_PER, TQString("%1%").tqarg(per)); m_percent = per; if(m_status == dccResumed) m_stime = 0; /* if we are got a resume request don't update CPS, reset it */ else - setText(COL_CPS, TQString("%1").arg(1.0*bytes/(time(NULL) - m_stime), 2)); + setText(COL_CPS, TQString("%1").tqarg(1.0*bytes/(time(NULL) - m_stime), 2)); } @@ -228,7 +228,7 @@ dccManager::~dccManager() { } -dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccStatus status, unsigned int size) +dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_sendit, this, dccItem::dccSend, file, who, status, size); @@ -237,7 +237,7 @@ dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccS return it; } -dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccStatus status, unsigned int size) +dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_getit, this, dccItem::dccGet, file, who, status, size); @@ -247,7 +247,7 @@ dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccSt } -dccItem *dccManager::newChatItem(TQString who, enum dccItem::dccStatus status) +dccItem *dccManager::newChatItem(TQString who, enum dccItem::dcctqStatus status) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_chatit, this, dccItem::dccChat, "", who, status, 0); -- cgit v1.2.1