summaryrefslogtreecommitdiffstats
path: root/kjots
diff options
context:
space:
mode:
Diffstat (limited to 'kjots')
-rw-r--r--kjots/CHANGES2
-rw-r--r--kjots/CMakeL10n.txt6
-rw-r--r--kjots/CMakeLists.txt5
-rw-r--r--kjots/KJotsMain.cpp130
-rw-r--r--kjots/KJotsMain.h2
-rw-r--r--kjots/Kjots.desktop73
-rw-r--r--kjots/Makefile.am2
-rw-r--r--kjots/kjotsbookmarks.h2
-rw-r--r--kjots/kjotsedit.cpp4
-rw-r--r--kjots/kjotsedit.h2
-rw-r--r--kjots/kjotsentry.cpp14
-rw-r--r--kjots/kjotsentry.h6
-rw-r--r--kjots/main.cpp2
13 files changed, 92 insertions, 158 deletions
diff --git a/kjots/CHANGES b/kjots/CHANGES
index e2da856..3594e13 100644
--- a/kjots/CHANGES
+++ b/kjots/CHANGES
@@ -55,7 +55,7 @@ new in version 0.2.2
new in version 0.2.1
-- should compile cleanly with libqt1.2 and libkde-0.7.1 and later
+- should compile cleanly with libtqt1.2 and libkde-0.7.1 and later
new in version 0.2.0
diff --git a/kjots/CMakeL10n.txt b/kjots/CMakeL10n.txt
index 54d5ac2..bdf0f4d 100644
--- a/kjots/CMakeL10n.txt
+++ b/kjots/CMakeL10n.txt
@@ -1,3 +1,9 @@
##### create translation templates ##############
tde_l10n_create_template( "kjots" )
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/Kjots.desktop/"
+ SOURCES Kjots.desktop
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kjots/CMakeLists.txt b/kjots/CMakeLists.txt
index c4ce568..addcfed 100644
--- a/kjots/CMakeLists.txt
+++ b/kjots/CMakeLists.txt
@@ -42,11 +42,8 @@ install( FILES kjotsui.rc
DESTINATION ${DATA_INSTALL_DIR}/kjots
)
-install( FILES Kjots.desktop
- DESTINATION ${XDG_APPS_INSTALL_DIR}
-)
+tde_create_translated_desktop( Kjots.desktop )
install( FILES kjots.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)
-
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 5146536..5510f23 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -90,10 +90,10 @@ KJotsMain::KJotsMain(const char* name)
textStack = new TQWidgetStack(splitter);
me_text = new KJotsEdit(textStack, "me_text");
- me_text->setFocusPolicy(TQ_StrongFocus);
+ me_text->setFocusPolicy(TQWidget::StrongFocus);
me_text->setEnabled(false);
textStack->addWidget(me_text);
- connect(me_text, TQT_SIGNAL(findSuccessful()), this, TQT_SLOT(slotFindSuccessful()));
+ connect(me_text, TQ_SIGNAL(findSuccessful()), this, TQ_SLOT(slotFindSuccessful()));
roTextView = new KTextBrowser(textStack, "roTextView", true);
textStack->addWidget(roTextView);
@@ -104,73 +104,73 @@ KJotsMain::KJotsMain(const char* name)
splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
// create actions
- actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this),
- TQT_SLOT(nextBook()), actionCollection(), "go_next_book");
- actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, TQT_TQOBJECT(this),
- TQT_SLOT(prevBook()), actionCollection(), "go_prev_book");
- actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, TQT_TQOBJECT(this),
- TQT_SLOT(nextPage()), actionCollection(), "go_next_page");
- actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, TQT_TQOBJECT(this),
- TQT_SLOT(prevPage()), actionCollection(), "go_prev_page");
-
- actions[ACTION_NEW_PAGE] = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newEntry()), actionCollection());
+ actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, this,
+ TQ_SLOT(nextBook()), actionCollection(), "go_next_book");
+ actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, this,
+ TQ_SLOT(prevBook()), actionCollection(), "go_prev_book");
+ actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, this,
+ TQ_SLOT(nextPage()), actionCollection(), "go_next_page");
+ actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, this,
+ TQ_SLOT(prevPage()), actionCollection(), "go_prev_page");
+
+ actions[ACTION_NEW_PAGE] = KStdAction::openNew(this, TQ_SLOT(newEntry()), actionCollection());
actions[ACTION_NEW_PAGE]->setText(i18n("&New Page"));
- actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, TQT_TQOBJECT(this),
- TQT_SLOT(createNewBook()), actionCollection(), "new_book");
+ actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, this,
+ TQ_SLOT(createNewBook()), actionCollection(), "new_book");
exportPageMenu = new TDEActionMenu(i18n("Export Page"), actionCollection(), "save_page_to");
- actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
- TQT_SLOT(writePage()), actionCollection(), "save_page_to_ascii");
+ actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this,
+ TQ_SLOT(writePage()), actionCollection(), "save_page_to_ascii");
actions[ACTION_PAGE2TEXT]->plug(exportPageMenu->popupMenu());
- actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
- TQT_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html");
+ actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this,
+ TQ_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html");
actions[ACTION_PAGE2HTML]->plug(exportPageMenu->popupMenu());
exportBookMenu = new TDEActionMenu(i18n("Export Book"), actionCollection(), "save_book_to");
- actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
- TQT_SLOT(writeBook()), actionCollection(), "save_book_to_ascii");
+ actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this,
+ TQ_SLOT(writeBook()), actionCollection(), "save_book_to_ascii");
actions[ACTION_BOOK2TEXT]->plug(exportBookMenu->popupMenu());
- actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
- TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html");
+ actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this,
+ TQ_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html");
actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu());
- actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, TQT_TQOBJECT(this),
- TQT_SLOT(deleteEntry()), actionCollection(), "del_page");
- actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this),
- TQT_SLOT(deleteBook()), actionCollection(), "del_folder");
+ actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, this,
+ TQ_SLOT(deleteEntry()), actionCollection(), "del_page");
+ actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, this,
+ TQ_SLOT(deleteBook()), actionCollection(), "del_folder");
actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), 0, TDEStdAccel::save(),
- TQT_TQOBJECT(this), TQT_SLOT(autoSave()), actionCollection(), "manual_save");
- actions[ACTION_PRINT] = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection());
- actions[ACTION_QUIT] = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+ this, TQ_SLOT(autoSave()), actionCollection(), "manual_save");
+ actions[ACTION_PRINT] = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection());
+ actions[ACTION_QUIT] = KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection());
- actions[ACTION_CUT] = KStdAction::cut(TQT_TQOBJECT(me_text), TQT_SLOT(cut()), actionCollection());
- connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQT_SLOT(setEnabled(bool)));
+ actions[ACTION_CUT] = KStdAction::cut(me_text, TQ_SLOT(cut()), actionCollection());
+ connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQ_SLOT(setEnabled(bool)));
actions[ACTION_CUT]->setEnabled(false);
- actions[ACTION_COPY] = KStdAction::copy(TQT_TQOBJECT(me_text), TQT_SLOT(copy()), actionCollection());
- connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool)));
+ actions[ACTION_COPY] = KStdAction::copy(me_text, TQ_SLOT(copy()), actionCollection());
+ connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQ_SLOT(setEnabled(bool)));
actions[ACTION_COPY]->setEnabled(false);
- actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, TQT_TQOBJECT(this),
- TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle");
- connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool)));
+ actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, this,
+ TQ_SLOT(copySelection()), actionCollection(), "copyIntoTitle");
+ connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQ_SLOT(setEnabled(bool)));
actions[ACTION_PASTE2TITLE]->setEnabled(false);
- actions[ACTION_PASTE] = KStdAction::pasteText(TQT_TQOBJECT(me_text), TQT_SLOT(paste()), actionCollection());
+ actions[ACTION_PASTE] = KStdAction::pasteText(me_text, TQ_SLOT(paste()), actionCollection());
- actions[ACTION_FIND] = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotSearch() ), actionCollection() );
- actions[ACTION_FIND_NEXT] = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotRepeatSearch() ), actionCollection() );
+ actions[ACTION_FIND] = KStdAction::find( this, TQ_SLOT( slotSearch() ), actionCollection() );
+ actions[ACTION_FIND_NEXT] = KStdAction::findNext( this, TQ_SLOT( slotRepeatSearch() ), actionCollection() );
actions[ACTION_FIND_NEXT]->setEnabled(false);
- actions[ACTION_REPLACE] = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), actionCollection() );
+ actions[ACTION_REPLACE] = KStdAction::replace( this, TQ_SLOT( slotReplace() ), actionCollection() );
- actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, TQT_TQOBJECT(this),
- TQT_SLOT(slotRenameEntry()), actionCollection(), "rename_entry");
- actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, TQT_TQOBJECT(this),
- TQT_SLOT(insertDate()), actionCollection(), "insert_date");
+ actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, this,
+ TQ_SLOT(slotRenameEntry()), actionCollection(), "rename_entry");
+ actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, this,
+ TQ_SLOT(insertDate()), actionCollection(), "insert_date");
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection());
bookmarkMenu = new TDEActionMenu(i18n("&Bookmarks"), "bookmarks", actionCollection(), "bookmarks");
KJotsBookmarks* bookmarks = new KJotsBookmarks(this);
- connect(bookmarks, TQT_SIGNAL(openPage(const TQString&)), TQT_SLOT(jumpToBookmark(const TQString&)));
+ connect(bookmarks, TQ_SIGNAL(openPage(const TQString&)), TQ_SLOT(jumpToBookmark(const TQString&)));
new KBookmarkMenu(KBookmarkManager::managerForFile(locateLocal("appdata","bookmarks.xml")),
bookmarks, bookmarkMenu->popupMenu(),
actionCollection(), true);
@@ -204,25 +204,25 @@ KJotsMain::KJotsMain(const char* name)
updateConfiguration();
updateMenu();
- TQTimer::singleShot(0, this, TQT_SLOT(slotSetupInterface()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotSetupInterface()));
//connect new slots
- connect(subjectList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(jumpToEntry(TQListViewItem*)));
- connect(subjectList, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)),
- this, TQT_SLOT(slotItemMoved(TQListViewItem*, TQListViewItem*, TQListViewItem*)));
- connect(subjectList, TQT_SIGNAL(expanded(TQListViewItem*)),
- this, TQT_SLOT(slotExpandBook(TQListViewItem*)));
- connect(subjectList, TQT_SIGNAL(collapsed(TQListViewItem*)),
- this, TQT_SLOT(slotCollapseBook(TQListViewItem*)));
- connect(subjectList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
- this, TQT_SLOT(showListviewContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)));
- connect(subjectList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),
- this, TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int)));
- connect(roTextView, TQT_SIGNAL(urlClick(const TQString&)),
- this, TQT_SLOT(linkClicked(const TQString&)));
- connect(m_autosaveTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(autoSave()));
+ connect(subjectList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(jumpToEntry(TQListViewItem*)));
+ connect(subjectList, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)),
+ this, TQ_SLOT(slotItemMoved(TQListViewItem*, TQListViewItem*, TQListViewItem*)));
+ connect(subjectList, TQ_SIGNAL(expanded(TQListViewItem*)),
+ this, TQ_SLOT(slotExpandBook(TQListViewItem*)));
+ connect(subjectList, TQ_SIGNAL(collapsed(TQListViewItem*)),
+ this, TQ_SLOT(slotCollapseBook(TQListViewItem*)));
+ connect(subjectList, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
+ this, TQ_SLOT(showListviewContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)));
+ connect(subjectList, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),
+ this, TQ_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int)));
+ connect(roTextView, TQ_SIGNAL(urlClick(const TQString&)),
+ this, TQ_SLOT(linkClicked(const TQString&)));
+ connect(m_autosaveTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(autoSave()));
}
void KJotsMain::slotSetupInterface()
@@ -399,7 +399,7 @@ void KJotsMain::configure()
confPageMisc* cpMisc = new confPageMisc(0, "Autosave");
dialog->addPage(cpMisc, i18n("Autosave"), "misc");
- connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateConfiguration()));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateConfiguration()));
dialog->show();
}
@@ -657,7 +657,7 @@ void KJotsMain::slotFindSuccessful()
void KJotsMain::showListviewContextMenu(TDEListView*, TQListViewItem* i, const TQPoint& p)
{
if ( invalidMoveFlag ) return; //Prevent race condition
- TDEActionMenu* am = new TDEActionMenu(TQT_TQOBJECT(this));
+ TDEActionMenu* am = new TDEActionMenu(this);
if (!i)
{
diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h
index 0f24e5a..b9dfb3c 100644
--- a/kjots/KJotsMain.h
+++ b/kjots/KJotsMain.h
@@ -81,7 +81,7 @@ class KJotsEdit;
class KJotsMain : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kjots/Kjots.desktop b/kjots/Kjots.desktop
index 4980053..86b54b1 100644
--- a/kjots/Kjots.desktop
+++ b/kjots/Kjots.desktop
@@ -1,79 +1,12 @@
[Desktop Entry]
-X-DocPath=kjots/index.html
Name=KJots
-Name[af]=Kjots
-Name[eo]=Notlibro
-Name[hi]=के-जॉट्स
-Name[hr]=Bilješke
-Name[pt_BR]=Tomador de notas
-Name[sv]=Kjots
-Name[ta]= KJots
-Name[th]=บันทึกช่วยจำ
-Name[xh]=Amaxabiso amancinane e K
+
GenericName=Note Taker
-GenericName[af]=Nota Afnemer
-GenericName[ar]=برنامج لأخذ الملاحظات
-GenericName[bg]=Бележки
-GenericName[bs]=Uzimanje bilješki
-GenericName[ca]=Anotador
-GenericName[cs]=Poznámkový blok
-GenericName[cy]=Cofnodydd
-GenericName[da]=Notetager
-GenericName[de]=Notizen machen
-GenericName[el]=Καταγραφέας σημειώσεων
-GenericName[eo]=Notolibro
-GenericName[es]=Para tomar notas
-GenericName[et]=Märkmete tegemine
-GenericName[eu]=Ohar Hartzailea
-GenericName[fa]=یادداشت بردار
-GenericName[fi]=Muistilappuohjelma
-GenericName[fr]=Prise de notes
-GenericName[ga]=Eagarthóir Nótaí
-GenericName[he]=כותב הערות
-GenericName[hi]=नोट टेकर
-GenericName[hr]=Program za pisanje bilježaka
-GenericName[hu]=Jegyzetlapok
-GenericName[is]=Minnispunktar
-GenericName[it]=Blocco per appunti
-GenericName[ja]=メモを取る
-GenericName[kk]=Шағын дәптер
-GenericName[km]=កម្មវិធី​កត់ចំណាំNote Taker
-GenericName[lt]=Pastabų gavėjas
-GenericName[lv]=Piezīmju Ņēmējs
-GenericName[mk]=Прибележувач
-GenericName[ms]=Pengambil Nota
-GenericName[mt]=Ħu noti
-GenericName[nb]=Beskjedverktøy
-GenericName[nds]=Notizen maken
-GenericName[ne]=टिपोट टेकर
-GenericName[nl]=Notitieboekje
-GenericName[nn]=Notatprogram
-GenericName[pa]=ਨੋਟ ਲਵੋ
-GenericName[pl]=Notatnik
-GenericName[pt]=Bloco de Notas
-GenericName[pt_BR]=Anotar pequenos apontamentos
-GenericName[ro]=Notiţe
-GenericName[ru]=Записная книжка
-GenericName[sk]=Ukladanie poznámok
-GenericName[sl]=Majhna beležnica
-GenericName[sr]=Прибележивач
-GenericName[sr@Latn]=Pribeleživač
-GenericName[sv]=Elektroniska anteckningar
-GenericName[ta]= குறிப்பு எடுப்பான்
-GenericName[tg]=Китобчаи Навиштаҷот
-GenericName[th]=บันทึกช่วยจำ
-GenericName[tr]=Not alıcı
-GenericName[uk]=Записна книжка
-GenericName[ven]=Mudzhii wa dzinotsi
-GenericName[wa]=Usteye po prinde des notes
-GenericName[xh]=Umthathi Womakuqwalaselwe
-GenericName[zh_CN]=笔记记录
-GenericName[zh_TW]=筆記簡記
-GenericName[zu]=Umthathi Wepheshana
+
+X-DocPath=kjots/index.html
Icon=kjots
Exec=kjots -caption "%c" %i %m
Type=Application
-Path=
Terminal=false
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
diff --git a/kjots/Makefile.am b/kjots/Makefile.am
index 82b6626..b341880 100644
--- a/kjots/Makefile.am
+++ b/kjots/Makefile.am
@@ -1,5 +1,5 @@
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT)
bin_PROGRAMS = kjots
diff --git a/kjots/kjotsbookmarks.h b/kjots/kjotsbookmarks.h
index ebf08d4..c71c15f 100644
--- a/kjots/kjotsbookmarks.h
+++ b/kjots/kjotsbookmarks.h
@@ -29,7 +29,7 @@ class KJotsMain;
class KJotsBookmarks : public TQObject, public KBookmarkOwner
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp
index 420f715..2b78698 100644
--- a/kjots/kjotsedit.cpp
+++ b/kjots/kjotsedit.cpp
@@ -45,7 +45,7 @@ KJotsEdit::KJotsEdit (TQWidget* parent, const char* name)
setWordWrap(TQTextEdit::WidgetWidth);
setLinkUnderline(true);
web_menu = new TDEPopupMenu(this);;
- web_menu->insertItem(i18n("Open URL"), this, TQT_SLOT(openUrl()) );
+ web_menu->insertItem(i18n("Open URL"), this, TQ_SLOT(openUrl()) );
}
KJotsEdit::~KJotsEdit()
@@ -55,7 +55,7 @@ KJotsEdit::~KJotsEdit()
void KJotsEdit::mousePressEvent( TQMouseEvent *e )
{
- if(e->button() == Qt::RightButton &&
+ if(e->button() == TQt::RightButton &&
hasSelectedText())
{
KURL url(selectedText());
diff --git a/kjots/kjotsedit.h b/kjots/kjotsedit.h
index a85d3d0..6506fab 100644
--- a/kjots/kjotsedit.h
+++ b/kjots/kjotsedit.h
@@ -29,7 +29,7 @@ class KJotsPage;
class KJotsEdit : public KEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
KJotsEdit (TQWidget* parent=0, const char* name=0);
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 03581cf..0a20072 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -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();
@@ -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;
}
@@ -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;
}
diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h
index 45c165d..1f1adc5 100644
--- a/kjots/kjotsentry.h
+++ b/kjots/kjotsentry.h
@@ -48,7 +48,7 @@ namespace TDEIO
class KJotsEntryBase : public TQObject, public TDEListViewItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
KJotsEntryBase(TDEListView*, TQListViewItem*);
@@ -98,7 +98,7 @@ class KJotsEntryBase : public TQObject, public TDEListViewItem
class KJotsBook : public KJotsEntryBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KJotsBook(TDEListView*, TQListViewItem* after = 0);
@@ -142,7 +142,7 @@ class KJotsBook : public KJotsEntryBase
//
class KJotsPage : public KJotsEntryBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KJotsPage(KJotsBook* parent, TQListViewItem* after = 0);
diff --git a/kjots/main.cpp b/kjots/main.cpp
index c9d158b..48c55fa 100644
--- a/kjots/main.cpp
+++ b/kjots/main.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
//
// kjots
//
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 07:22:55 +0000