From a2277b6bc715464e83882b90c2a058139b8a6b54 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 23 Jun 2011 01:42:07 +0000
Subject: TQt4 port kdeutils This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmilo/powerbook2/pb_monitor.cpp | 8 ++++----
 kmilo/powerbook2/pb_monitor.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kmilo/powerbook2')

diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp
index 340d38b..20ba17b 100644
--- a/kmilo/powerbook2/pb_monitor.cpp
+++ b/kmilo/powerbook2/pb_monitor.cpp
@@ -49,9 +49,9 @@ const TQString tpmodes[] = { I18N_NOOP("No Tap"), I18N_NOOP("Tap"), I18N_NOOP("D
 
 namespace KMilo {
 
-PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name,
+PowerBookMonitor::PowerBookMonitor(TQObject *tqparent, const char *name,
                                    const TQStringList& args)
-	: Monitor(parent, name, args),
+	: Monitor(tqparent, name, args),
 		m_progress( 0 )
 {
   	init_libpbb();
@@ -79,7 +79,7 @@ Monitor::DisplayType PowerBookMonitor::poll()
 	Monitor::DisplayType rc = None;
 	// Drain the queue, send the last message
 	struct tagitem* tag = readMessage();
-	m_message = TQString::null;
+	m_message = TQString();
 	while ( tag && tag->tag != TAG_END ) {
 		switch ( tag->tag ) {
 		case TAG_VOLUME:
@@ -98,7 +98,7 @@ Monitor::DisplayType PowerBookMonitor::poll()
 			{
 				rc = Monitor::Tap;
 				TQString marg =  tpmodes[ tag->data & 3 ];
-				m_message = i18n( "Operating mode set to: %1." ).arg( marg );
+				m_message = i18n( "Operating mode set to: %1." ).tqarg( marg );
 			}
 			break;
 		default:
diff --git a/kmilo/powerbook2/pb_monitor.h b/kmilo/powerbook2/pb_monitor.h
index e9dfb71..2adb4d8 100644
--- a/kmilo/powerbook2/pb_monitor.h
+++ b/kmilo/powerbook2/pb_monitor.h
@@ -34,7 +34,7 @@ namespace KMilo {
 class PowerBookMonitor : public KMilo::Monitor
 {
 public:
-	PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&);
+	PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList&);
 	virtual ~PowerBookMonitor();
 
 	virtual bool init();
-- 
cgit v1.2.1