1 files changed, 15 insertions, 15 deletions

diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 231afede..79a3ca99 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -60,8 +60,8 @@ using namespace KNetwork;
 class KNotesKeyDialog : public KDialogBase
 {
 public:
-    KNotesKeyDialog( KGlobalAccel *globals, TQWidget *parent, const char* name = 0 )
-        : KDialogBase( parent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok )
+    KNotesKeyDialog( KGlobalAccel *globals, TQWidget *tqparent, const char* name = 0 )
+        : KDialogBase( tqparent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok )
     {
         m_keyChooser = new KKeyChooser( globals, this );
         setMainWidget( m_keyChooser );
@@ -94,7 +94,7 @@ int KNotesApp::KNoteActionList::compareItems( TQPtrCollection::Item s1, TQPtrCol
 
 KNotesApp::KNotesApp()
     : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ),
-      m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 )
+      m_alarm( 0 ), m_listener( 0 ), m_tqfind( 0 ), m_findPos( 0 )
 {
     connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) );
 
@@ -121,7 +121,7 @@ KNotesApp::KNotesApp()
         this, TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
     new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
 
-    m_findAction = KStdAction::find( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() );
+    m_findAction = KStdAction::tqfind( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() );
     KStdAction::preferences( this, TQT_SLOT(slotPreferences()), actionCollection() );
     KStdAction::keyBindings( this, TQT_SLOT(slotConfigureAccels()), actionCollection() );
     //FIXME: no shortcut removing!?
@@ -236,7 +236,7 @@ KNotesApp::~KNotesApp()
     delete m_guiBuilder;
 }
 
-bool KNotesApp::commitData( QSessionManager& )
+bool KNotesApp::commitData( TQSessionManager& )
 {
     saveConfigs();
     return true;
@@ -336,7 +336,7 @@ TQString KNotesApp::name( const TQString& id ) const
     if ( note )
         return note->name();
     else
-        return TQString::null;
+        return TQString();
 }
 
 TQString KNotesApp::text( const TQString& id ) const
@@ -345,7 +345,7 @@ TQString KNotesApp::text( const TQString& id ) const
     if ( note )
         return note->text();
     else
-        return TQString::null;
+        return TQString();
 }
 
 void KNotesApp::setName( const TQString& id, const TQString& newName )
@@ -372,7 +372,7 @@ TQString KNotesApp::fgColor( const TQString& id ) const
     if ( note )
         return note->fgColor().name();
     else
-        return TQString::null;
+        return TQString();
 }
 
 TQString KNotesApp::bgColor( const TQString& id ) const
@@ -381,7 +381,7 @@ TQString KNotesApp::bgColor( const TQString& id ) const
     if ( note )
         return note->bgColor().name();
     else
-        return TQString::null;
+        return TQString();
 }
 
 void KNotesApp::setColor( const TQString& id, const TQString& fgColor, const TQString& bgColor )
@@ -521,8 +521,8 @@ void KNotesApp::slotOpenFindDialog()
     m_findPos = new TQDictIterator<KNote>( m_noteList );
 
     // this could be in an own method if searching without a dialog should be possible
-    delete m_find;
-    m_find = new KFind( findDia.pattern(), findDia.options(), this );
+    delete m_tqfind;
+    m_tqfind = new KFind( findDia.pattern(), findDia.options(), this );
 
     slotFindNext();
 }
@@ -533,13 +533,13 @@ void KNotesApp::slotFindNext()
     {
         KNote *note = **m_findPos;
         ++*m_findPos;
-        note->find( m_find->pattern(), m_find->options() );
+        note->tqfind( m_tqfind->pattern(), m_tqfind->options() );
     }
     else
     {
-        m_find->displayFinalDialog();
-        delete m_find;
-        m_find = 0;
+        m_tqfind->displayFinalDialog();
+        delete m_tqfind;
+        m_tqfind = 0;
         delete m_findPos;
         m_findPos = 0;
     }