summaryrefslogtreecommitdiffstats
path: root/kjots
diff options
context:
space:
mode:
Diffstat (limited to 'kjots')
-rw-r--r--kjots/CHANGES10
-rw-r--r--kjots/KJotsMain.cpp16
-rw-r--r--kjots/KJotsMain.h2
-rw-r--r--kjots/confpagemisc.ui6
-rw-r--r--kjots/kjotsedit.cpp2
-rw-r--r--kjots/kjotsentry.cpp30
6 files changed, 33 insertions, 33 deletions
diff --git a/kjots/CHANGES b/kjots/CHANGES
index a4cc4ff..9815d90 100644
--- a/kjots/CHANGES
+++ b/kjots/CHANGES
@@ -15,12 +15,12 @@ new in version 0.5 (Aaron J. Seigo)
new in version 0.4 (Mario Weilguni <mweilguni@kde.org>)
- works now with Qt 2.0
-- fixed broken tqlayout of main window
-- tqlayout improvements in AskFileName()
-- tqlayout improvements in SubjList()
+- fixed broken layout of main window
+- layout improvements in AskFileName()
+- layout improvements in SubjList()
- compiles without warnings
- "Apply" button is only activated when changes were made
-- improved tqlayout of configuration dialog
+- improved layout of configuration dialog
- fixed a bug in the font selection
- now compiles with EGCS ( Robert Williams )
@@ -59,7 +59,7 @@ new in version 0.2.1
new in version 0.2.0
-- changed the tqlayout to be more KDE conforming (toolbar, statusbar,...)
+- changed the layout to be more KDE conforming (toolbar, statusbar,...)
- folders are now called books and entries are pages
- added subject to each page
- you may popup a window with a list of all subjects and use it to find
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 2feb47a..f2dfa97 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -72,7 +72,7 @@ KJotsMain::KJotsMain(const char* name)
// the subject list
subjectList = new KListView(splitter, "subjectList");
subjectList->setRootIsDecorated(true);
- subjectList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
+ subjectList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
subjectList->setMinimumWidth(subjectList->fontMetrics().maxWidth() * 10 + 5);
subjectList->addColumn(i18n("Pages"));
subjectList->setFullWidth(true);
@@ -101,7 +101,7 @@ KJotsMain::KJotsMain(const char* name)
TQVBoxLayout *bookGrid = new TQVBoxLayout(f_main, KDialog::marginHint(), KDialog::spacingHint());
bookGrid->addWidget(splitter, 0, 0);
bookGrid->setMargin(0);
- splitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
+ splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
// create actions
actions[ACTION_NEXT_BOOK] = new KAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this),
@@ -316,7 +316,7 @@ void KJotsMain::deleteBook()
return;
TQString msg = i18n("<qt>Are you sure you want to delete the <strong>%1</strong> book?</qt>");
- int result = KMessageBox::warningContinueCancel(tqtopLevelWidget(), msg.tqarg(b->subject()), i18n("Delete Book"),KStdGuiItem::del());
+ int result = KMessageBox::warningContinueCancel(topLevelWidget(), msg.arg(b->subject()), i18n("Delete Book"),KStdGuiItem::del());
if (result!=KMessageBox::Continue)
return;
@@ -358,9 +358,9 @@ void KJotsMain::deleteEntry()
KJotsPage* cur = currentPage();
if (!cur ||
- KMessageBox::warningContinueCancel(tqtopLevelWidget(),
+ KMessageBox::warningContinueCancel(topLevelWidget(),
i18n("<qt>Are you sure you want to delete the <strong>%1</strong> page?</qt>")
- .tqarg(cur->subject()),
+ .arg(cur->subject()),
i18n("Delete Page"),KStdGuiItem::del()) != KMessageBox::Continue)
{
return;
@@ -493,7 +493,7 @@ void KJotsMain::saveBookToFile(bool plainText)
}
if (!KIO::NetAccess::exists(res.URLs[0], true, this) ||
- KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
+ KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
{
tryAgain = false;
}
@@ -534,7 +534,7 @@ void KJotsMain::savePageToFile(bool plainText)
}
if (!KIO::NetAccess::exists(res.URLs[0], true, this) ||
- KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
+ KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
{
tryAgain = false;
}
@@ -573,7 +573,7 @@ void KJotsMain::slotQuit()
void KJotsMain::insertDate()
{
- me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), true) + " ");
+ me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
}
void KJotsMain::updateMenu()
diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h
index 61c830b..1285f06 100644
--- a/kjots/KJotsMain.h
+++ b/kjots/KJotsMain.h
@@ -23,7 +23,7 @@
#ifndef KJotsMain_included
#define KJotsMain_included
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <kdialogbase.h>
diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui
index 4a45efb..f717a48 100644
--- a/kjots/confpagemisc.ui
+++ b/kjots/confpagemisc.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp
index eff6cba..643fd92 100644
--- a/kjots/kjotsedit.cpp
+++ b/kjots/kjotsedit.cpp
@@ -135,7 +135,7 @@ void KJotsEdit::setEntry (KJotsPage *entry)
m_entry = entry;
setText(entry->body());
removeSelection();
- tqrepaint();
+ repaint();
setEnabled(true);
setFocus();
entry->setEditor(this);
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 53613c3..fa35c86 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -23,7 +23,7 @@
#include <tqdir.h>
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqdom.h>
#include <kapplication.h>
@@ -532,9 +532,9 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding)
//revisions will likely use it. I don't want to make the translators add, remove,
//and re-add translations, so I'm just keeping this here for now.
m_saveProgressDialog = new KProgressDialog(listView(), "bookSaveInProgress",
- i18n("Saving %1").tqarg(subject()),
+ i18n("Saving %1").arg(subject()),
i18n("Saving the contents of %1 to %2")
- .tqarg(subject(), url.prettyURL()),
+ .arg(subject(), url.prettyURL()),
true);
m_saveProgressDialog->progressBar()->setTotalSteps(1);
@@ -613,7 +613,7 @@ void KJotsBook::print(TQFont& defaultFont)
printer.setFullPage(false);
printer.setCreator("KJots");
- if (!printer.setup(listView(), i18n("Print: %1").tqarg(subject())))
+ if (!printer.setup(listView(), i18n("Print: %1").arg(subject())))
{
return;
}
@@ -657,7 +657,7 @@ bool KJotsBook::isDirty()
//Am I dirty?
if ( KJotsEntryBase::isDirty() ) return true;
- //Check all tqchildren to see if any of them are dirty
+ //Check all children to see if any of them are dirty
KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild());
while ( entry )
{
@@ -763,7 +763,7 @@ TQString KJotsBook::getToc()
KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild());
while ( entry ) {
TQString htmlSubject = prepForHTML(entry->subject());
- toc += TQString("<li><a href=\"#%1\">").tqarg(entry->id()) + htmlSubject + "</a></li>";
+ toc += TQString("<li><a href=\"#%1\">").arg(entry->id()) + htmlSubject + "</a></li>";
KJotsBook *book = dynamic_cast<KJotsBook*>(entry);
if ( book ) toc += book->getToc();
@@ -787,13 +787,13 @@ TQString KJotsBook::generateHtml( KJotsEntryBase* top, bool diskMode )
if ( top == this )
{
- toc = TQString("<h1><a name=\"%1\">%2</a></h1>").tqarg(id()).tqarg(htmlTitle);
+ toc = TQString("<h1><a name=\"%1\">%2</a></h1>").arg(id()).arg(htmlTitle);
} else {
if ( diskMode )
{
- toc = TQString("<h2><a name=\"%1\">%2</a></h2>").tqarg(id()).tqarg(htmlTitle);
+ toc = TQString("<h2><a name=\"%1\">%2</a></h2>").arg(id()).arg(htmlTitle);
} else {
- toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").tqarg(id()).tqarg(id()).tqarg(htmlTitle);
+ toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").arg(id()).arg(id()).arg(htmlTitle);
}
}
@@ -995,7 +995,7 @@ void KJotsPage::print(TQFont& defaultFont)
printer.setFullPage(false);
printer.setCreator("KJots");
- if (printer.setup(listView(), i18n("Print: %1").tqarg(docName)))
+ if (printer.setup(listView(), i18n("Print: %1").arg(docName)))
{
TQPainter painter( &printer );
painter.setFont(defaultFont);
@@ -1066,7 +1066,7 @@ TQString KJotsPage::defaultSubject()
page = 1;
}
- return i18n("Page %1").tqarg(page);
+ return i18n("Page %1").arg(page);
}
/*!
@@ -1181,21 +1181,21 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode )
TQString htmlSubject = prepForHTML(subject());
if ( top == this || diskMode ) {
- html += TQString("<h3><a name=\"%1\">%2</a></h3>").tqarg(id()).tqarg(htmlSubject);
+ html += TQString("<h3><a name=\"%1\">%2</a></h3>").arg(id()).arg(htmlSubject);
} else {
- html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").tqarg(id()).tqarg(id()).tqarg(htmlSubject);
+ html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").arg(id()).arg(id()).arg(htmlSubject);
}
html += prepForHTML(body());
html += "<br><table border=1><tr>";
- html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(id()).tqarg(subject());
+ html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(id()).arg(subject());
if ( top != this )
{
KJotsBook *parent = parentBook();
while ( parent )
{
- html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(parent->id()).tqarg(parent->subject());
+ html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(parent->id()).arg(parent->subject());
if ( parent == top ) break;
parent = parent->parentBook();
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-20 02:15:00 +0000