TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 6 deletions

diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp
index 2f341426..95333c92 100644
--- a/kopete/kopete/contactlist/customnotificationprops.cpp
+++ b/kopete/kopete/contactlist/customnotificationprops.cpp
@@ -33,10 +33,10 @@
 
 #include "customnotificationprops.h"
 
-CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name )
-: TQObject( parent, name )
+CustomNotificationProps::CustomNotificationProps( TQWidget *tqparent, Kopete::NotifyDataObject* item, const char * name )
+: TQObject( tqparent, name )
 {
-	m_notifyWidget = new CustomNotificationWidget( parent, "notificationWidget" );
+	m_notifyWidget = new CustomNotificationWidget( tqparent, "notificationWidget" );
 
 	m_item = item;
 	TQString path = "kopete/eventsrc";
@@ -47,12 +47,12 @@ CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::Noti
 	TQStringList::Iterator end = m_eventList.end();
 	for ( ; it != end; ++it )
 	{
-		if ( !(*it).startsWith( TQString::fromLatin1( "kopete_contact_" ) ) )
+		if ( !(*it).startsWith( TQString::tqfromLatin1( "kopete_contact_" ) ) )
 			continue;
 		contactSpecificEvents.append( *it );
 		TQMap<TQString, TQString> entries = eventsfile.entryMap( *it );
 		eventsfile.setGroup( *it );
-		TQString comment = eventsfile.readEntry( "Comment", TQString::fromLatin1( "Found nothing!" ) );
+		TQString comment = eventsfile.readEntry( "Comment", TQString::tqfromLatin1( "Found nothing!" ) );
 		m_notifyWidget->cmbEvents->insertItem( comment );
 	}
 	m_eventList = contactSpecificEvents;
@@ -152,7 +152,7 @@ void CustomNotificationProps::storeCurrentCustoms()
 		evt->setPresentation( Kopete::EventPresentation::Message, eventNotify );
 		// set chat attributes
 		eventNotify = new Kopete::EventPresentation( Kopete::EventPresentation::Chat,
-				TQString::null,
+				TQString(),
 				m_notifyWidget->chkChatSS->isChecked(),
 				m_notifyWidget->chkCustomChat->isChecked() );
 		evt->setPresentation( Kopete::EventPresentation::Chat, eventNotify );