1 files changed, 17 insertions, 17 deletions

diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 03581cf..c947f94 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -32,7 +32,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 
 #include <tdeio/job.h>
@@ -245,7 +245,7 @@ void KJotsBook::init()
     m_open = false;
     m_saveProgressDialog = 0;
     setExpandable(true);
-    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small));
+    setPixmap(0, tdeApp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small));
 }
 
 /*!
@@ -264,7 +264,7 @@ bool KJotsBook::isBookFile(const TQString& filename)
     {
         if ( folder.open(IO_ReadWrite) )
         {
-            TQTextStream st(TQT_TQIODEVICE(&folder));
+            TQTextStream st(&folder);
             st.setEncoding( KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
             TQString buf = st.readLine().stripWhiteSpace();
 
@@ -306,7 +306,7 @@ bool KJotsBook::openBook(const TQString& filename)
     
             if ( file.exists() && file.open(IO_ReadWrite) ) //TODO: Implement read-only mode?
             {
-                TQTextStream st(TQT_TQIODEVICE(&file));
+                TQTextStream st(&file);
                 st.setEncoding(  KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
                 TQString data = st.read();
 
@@ -388,7 +388,7 @@ bool KJotsBook::openBook(const TQString& filename)
 */
 bool KJotsBook::loadOldBook(TQFile &file)
 {
-    TQTextStream st(TQT_TQIODEVICE(&file));
+    TQTextStream st(&file);
     st.setEncoding(  KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
     TQString buf = st.readLine();
 
@@ -501,7 +501,7 @@ void KJotsBook::rename()
     {
         setSubject(name);
 
-        KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget());
+        KJotsMain* m = dynamic_cast<KJotsMain*>(tdeApp->mainWidget());
 
         if (m)
             m->updateCaption();
@@ -541,8 +541,8 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding)
     m_saveProgressDialog->showCancelButton(false);
     m_saveProgressDialog->setAutoClose(true);
 
-    connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&)));
-    connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *)));
+    connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQ_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&)));
+    connect(job, TQ_SIGNAL(result( TDEIO::Job *)), TQ_SLOT(slotSaveResult( TDEIO::Job *)));
 
     m_saveInProgress = true;
 }
@@ -849,7 +849,7 @@ KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after)
 {
     m_isBook = false;
     m_paraPos = m_indexPos = 0;
-    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small));
+    setPixmap(0, tdeApp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small));
 }
 
 KJotsPage::~KJotsPage()
@@ -882,10 +882,10 @@ void KJotsPage::initNewPage(void)
 TQString KJotsPage::body()
 {
     //if we're being edited we want the current text, not whatever we saved before.
-    if ( m_editor && m_editor->edited() )
+    if (m_editor && m_editor->isModified())
     {
         m_text = m_editor->text();
-        m_editor->setEdited(false);
+        m_editor->setModified(false);
         setDirty(true);
     }
 
@@ -913,7 +913,7 @@ void KJotsPage::rename()
     {
         setSubject(name);
 
-        KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget());
+        KJotsMain* m = dynamic_cast<KJotsMain*>(tdeApp->mainWidget());
 
         if (m)
             m->updateCaption();
@@ -939,8 +939,8 @@ void KJotsPage::saveToFile(KURL url, bool plainText, const TQString& encoding)
         return;
     }
 
-    connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&)));
-    connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *)));
+    connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQ_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&)));
+    connect(job, TQ_SIGNAL(result( TDEIO::Job *)), TQ_SLOT(slotSaveResult( TDEIO::Job *)));
     m_saveInProgress = true;
 }
 
@@ -1079,7 +1079,7 @@ void KJotsPage::setEditor( KJotsEdit *editor )
     {
         m_editor->getCursorPosition(&m_paraPos, &m_indexPos);
 
-        if ( m_editor->edited() )
+        if (m_editor->isModified())
         {
             m_text = m_editor->text();
             setDirty(true);
@@ -1091,7 +1091,7 @@ void KJotsPage::setEditor( KJotsEdit *editor )
     //and in with the new
     if ( m_editor )
     {
-        m_editor->setEdited(false);
+        m_editor->setModified(false);
         m_editor->setCursorPosition(m_paraPos, m_indexPos);
     }
 
@@ -1105,7 +1105,7 @@ void KJotsPage::setEditor( KJotsEdit *editor )
 */
 bool KJotsPage::isDirty()
 {
-    if ( m_editor && m_editor->edited() )
+    if (m_editor && m_editor->isModified())
     {
         setDirty(true);
     }