Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

5 files changed, 9 insertions, 9 deletions

diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index a7864c423..b4b0f7786 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
 
 TQString KNotesPart::newNoteFromClipboard( const TQString& name )
 {
-  const TQString& text = KApplication::clipboard()->text();
+  const TQString& text = KApplication::tqclipboard()->text();
   return newNote( name, text );
 }
 
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 7665426c6..9f8a4bb83 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -144,7 +144,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       mNoteEdit->setFocus();
 
       KXMLGUIBuilder builder( page );
-      KXMLGUIFactory factory( &builder, this );
+      KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
       factory.addClient( this );
 
       mTool = static_cast<KToolBar *>(factory.container( "note_tool", this ));
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 0fe265524..a72f14b7e 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin,
 
 
 KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & )
-  : Kontact::Plugin( core, core, "knotes" ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "knotes" ),
     mAboutData( 0 )
 {
   setInstance( KNotesPluginFactory::instance() );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index afa21fb40..9e2609fc2 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -75,7 +75,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
   mNoteIVI = item;
 
   if ( !mNoteIVI ) {
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
     if ( isVisible() ) {
       setFilter( false );
       hide();
@@ -104,7 +104,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
     resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
 
     hide();
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
     setFilter( true );
     startTimer( 600 );  // delay showing the tooltip for 0.7 sec
   }
@@ -121,7 +121,7 @@ void KNoteTip::resizeEvent( TQResizeEvent *ev )
 
 void KNoteTip::timerEvent( TQTimerEvent * )
 {
-  killTimers();
+  TQT_TQOBJECT(this)->killTimers();
 
   if ( !isVisible() ) {
     startTimer( 15000 ); // show the tooltip for 15 sec
@@ -144,7 +144,7 @@ bool KNoteTip::eventFilter( TQObject *, TQEvent *e )
     case TQEvent::FocusIn:
     case TQEvent::FocusOut:
     case TQEvent::Wheel:
-      killTimers();
+      TQT_TQOBJECT(this)->killTimers();
       setFilter( false );
       hide();
     default:
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 611425b9d..c0e1ef402 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -138,9 +138,9 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ )
 bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( obj );
+    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
+      emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }