summaryrefslogtreecommitdiffstats
path: root/ksayit/src
diff options
context:
space:
mode:
Diffstat (limited to 'ksayit/src')
-rw-r--r--ksayit/src/DocTreeView.ui26
-rw-r--r--ksayit/src/DocTreeView.ui.h2
-rw-r--r--ksayit/src/KSayItView.ui10
-rw-r--r--ksayit/src/Types.h6
-rw-r--r--ksayit/src/contextmenuhandler.cpp22
-rw-r--r--ksayit/src/contextmenuhandler.h13
-rw-r--r--ksayit/src/docbookclasses.cpp266
-rw-r--r--ksayit/src/docbookclasses.h38
-rw-r--r--ksayit/src/docbookgenerator.cpp14
-rw-r--r--ksayit/src/docbookgenerator.h2
-rw-r--r--ksayit/src/docbookparser.cpp44
-rw-r--r--ksayit/src/docbookparser.h2
-rw-r--r--ksayit/src/doctreeviewimpl.cpp122
-rw-r--r--ksayit/src/doctreeviewimpl.h6
-rw-r--r--ksayit/src/effectstack.cpp2
-rw-r--r--ksayit/src/fx_setup.ui62
-rw-r--r--ksayit/src/fxpluginhandler.cpp20
-rw-r--r--ksayit/src/fxpluginhandler.h5
-rw-r--r--ksayit/src/fxsetupimpl.cpp6
-rw-r--r--ksayit/src/fxsetupimpl.h3
-rw-r--r--ksayit/src/ksayit.cpp134
-rw-r--r--ksayit/src/ksayit.h13
-rw-r--r--ksayit/src/ksayit_fxplugin.h7
-rw-r--r--ksayit/src/ksayit_ttsplugin.h10
-rw-r--r--ksayit/src/ksayitbookmarkhandler.cpp18
-rw-r--r--ksayit/src/ksayitbookmarkhandler.h4
-rw-r--r--ksayit/src/ksayitsystemtray.cpp28
-rw-r--r--ksayit/src/ksayitsystemtray.h4
-rw-r--r--ksayit/src/ksayitviewimpl.cpp6
-rw-r--r--ksayit/src/ksayitviewimpl.h5
-rw-r--r--ksayit/src/parasaxparser.cpp6
-rw-r--r--ksayit/src/parasaxparser.h2
-rw-r--r--ksayit/src/saxhandler.cpp8
-rw-r--r--ksayit/src/saxhandler.h6
-rw-r--r--ksayit/src/voicesetupdlg.cpp10
-rw-r--r--ksayit/src/voicesetupdlg.h3
36 files changed, 472 insertions, 463 deletions
diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index 14e5f09..ed6f9b1 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>DocTreeView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>DocTreeView</cstring>
</property>
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>200</height>
@@ -105,21 +105,21 @@
<connections>
<connection>
<sender>listView</sender>
- <signal>clicked(QListViewItem*)</signal>
+ <signal>clicked(TQListViewItem*)</signal>
<receiver>DocTreeView</receiver>
- <slot>slotItemClicked(QListViewItem*)</slot>
+ <slot>slotItemClicked(TQListViewItem*)</slot>
</connection>
<connection>
<sender>listView</sender>
- <signal>rightButtonPressed(QListViewItem*,const QPoint&amp;,int)</signal>
+ <signal>rightButtonPressed(TQListViewItem*,const TQPoint&amp;,int)</signal>
<receiver>DocTreeView</receiver>
- <slot>slotRightButtonPressed(QListViewItem*,const QPoint&amp;,int)</slot>
+ <slot>slotRightButtonPressed(TQListViewItem*,const TQPoint&amp;,int)</slot>
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">DocTreeView.ui.h</include>
</includes>
-<signals>
+<Q_SIGNALS>
<signal>signalContentChanged(const QString &amp;)</signal>
<signal>signalAllNodesProcessed()</signal>
<signal>signalSetText(const QString &amp;)</signal>
@@ -128,9 +128,9 @@
<signal>signalSetBookmarkFilename(const QString&amp;)</signal>
<signal>signalChangeBookmarkFilename(const QString &amp;)</signal>
<signal>signalDeleteBookmark(const QString&amp;, const QString&amp;)</signal>
-</signals>
-<slots>
- <slot>slotItemClicked( QListViewItem * )</slot>
+</Q_SIGNALS>
+<Q_SLOTS>
+ <slot>slotItemClicked( TQListViewItem * )</slot>
<slot access="protected">slotRenameItem()</slot>
<slot access="protected">slotDeleteItem()</slot>
<slot access="protected">slotNewBookInfo()</slot>
@@ -149,9 +149,9 @@
<slot access="protected">slotNewSection_3()</slot>
<slot access="protected">slotNewSection_4()</slot>
<slot access="protected">slotNewSection_5()</slot>
- <slot>slotRightButtonPressed( QListViewItem * i, const QPoint &amp;, int )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+ <slot>slotRightButtonPressed( TQListViewItem * i, const TQPoint &amp;, int )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/ksayit/src/DocTreeView.ui.h b/ksayit/src/DocTreeView.ui.h
index 9807a7c..4d1de7b 100644
--- a/ksayit/src/DocTreeView.ui.h
+++ b/ksayit/src/DocTreeView.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you want to add, delete, or rename functions or slots, use
-** Qt Designer to update this file, preserving your code.
+** TQt Designer to update this file, preserving your code.
**
** You should not define a constructor or destructor in this file.
** Instead, write your code in functions called init() and destroy().
diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui
index 4ffa9b9..adb821b 100644
--- a/ksayit/src/KSayItView.ui
+++ b/ksayit/src/KSayItView.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KSayItView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KSayItView</cstring>
</property>
@@ -23,7 +23,7 @@
<property name="name">
<cstring>TextEdit</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>400</width>
<height>200</height>
@@ -58,11 +58,11 @@
<tabstops>
<tabstop>TextEdit</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot>slotCopyAvailable(bool)</slot>
<slot>slotTextChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextedit.h</includehint>
</includehints>
diff --git a/ksayit/src/Types.h b/ksayit/src/Types.h
index 506e67f..005f108 100644
--- a/ksayit/src/Types.h
+++ b/ksayit/src/Types.h
@@ -54,9 +54,9 @@ This abstract class is the interface to access the items of the TreeView.
class ListViewInterface : public KListViewItem
{
public:
- ListViewInterface(ListViewInterface *parent=0, TQString label=TQString::null);
- ListViewInterface(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
- ListViewInterface(KListView *lv=0, TQString label=TQString::null);
+ ListViewInterface(ListViewInterface *tqparent=0, TQString label=TQString());
+ ListViewInterface(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+ ListViewInterface(KListView *lv=0, TQString label=TQString());
// ~ListViewItemInterface();
diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp
index 26e8831..75f06e7 100644
--- a/ksayit/src/contextmenuhandler.cpp
+++ b/ksayit/src/contextmenuhandler.cpp
@@ -10,7 +10,7 @@
//
//
-// Qt includes
+// TQt includes
#include <tqfile.h>
#include <tqvariant.h>
@@ -31,12 +31,12 @@
ContextActionHandler::ContextActionHandler(ContextMenuHandler *menuhandler)
: TQXmlDefaultHandler(), m_menuhandler(menuhandler)
{
- m_subName = TQString::null;
- m_actionName = TQString::null;
- m_qty = TQString::null;
+ m_subName = TQString();
+ m_actionName = TQString();
+ m_qty = TQString();
m_popup = menuhandler->m_popupmenu;
m_hit = false;
- m_searchID = TQString::null;
+ m_searchID = TQString();
}
ContextActionHandler::~ContextActionHandler()
@@ -117,8 +117,8 @@ bool ContextActionHandler::characters( const TQString &ch )
/**
* MenuHandler
*/
-ContextMenuHandler::ContextMenuHandler(TQObject *parent, const char *name)
- : TQObject(parent, name), m_DocTreeView(parent)
+ContextMenuHandler::ContextMenuHandler(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name), m_DocTreeView(tqparent)
{
m_popupmenu = NULL;
m_item = NULL;
@@ -293,7 +293,7 @@ bool ContextMenuHandler::parseXmlFile(const TQString &xmlID)
ContextActionHandler handler(this);
handler.setSearchID(xmlID);
parser.setContentHandler( &handler );
- return parser.parse( &xmlFile );
+ return parser.parse( TQT_TQIODEVICE(&xmlFile) );
}
@@ -307,7 +307,7 @@ KAction* ContextMenuHandler::ActionFactory( const TQString &actionName, const TQ
// check if qty is within allowed limits
ListViewInterface *i = static_cast<ListViewInterface*>(m_item->firstChild());
int count = 0;
- TQString name = TQString::null;
+ TQString name = TQString();
while (i){
name = ( i->getValue(KSayItGlobal::XMLCONTEXTNAME) ).toString();
if ( name.lower() == actionName.lower() ){
@@ -378,9 +378,9 @@ KAction* ContextMenuHandler::ActionFactory( const TQString &actionName, const TQ
}
-KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *parent)
+KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *tqparent)
{
- return new KPopupMenu(parent);
+ return new KPopupMenu(tqparent);
}
diff --git a/ksayit/src/contextmenuhandler.h b/ksayit/src/contextmenuhandler.h
index 148bb04..88d7c0e 100644
--- a/ksayit/src/contextmenuhandler.h
+++ b/ksayit/src/contextmenuhandler.h
@@ -12,7 +12,7 @@
#ifndef CONTEXTMENUHANDLER_H
#define CONTEXTMENUHANDLER_H
-// Qt includes
+// TQt includes
#include <tqobject.h>
#include <tqstring.h>
#include <tqxml.h>
@@ -64,11 +64,12 @@ private:
/**
@author Robert Vogl
*/
-class ContextMenuHandler : public QObject
+class ContextMenuHandler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- ContextMenuHandler(TQObject *parent = 0, const char *name = 0);
+ ContextMenuHandler(TQObject *tqparent = 0, const char *name = 0);
~ContextMenuHandler();
@@ -79,10 +80,10 @@ public:
KPopupMenu* getPopupMenu(ListViewInterface *item);
/**
- * \returns A pointer to the Submenu as a child of the parent
- * \p parent.
+ * \returns A pointer to the Submenu as a child of the tqparent
+ * \p tqparent.
*/
- KPopupMenu* SubMenuFactory(KPopupMenu *parent);
+ KPopupMenu* SubMenuFactory(KPopupMenu *tqparent);
/**
* Creates an action sufficiant to the given name.
diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 9a3af1b..5f0fa00 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -9,7 +9,7 @@
// Copyright: See COPYING file that comes with this distribution
//
//
-// Qt includes
+// TQt includes
#include <tqwidget.h>
#include <tqtextstream.h>
#include <tqpixmap.h>
@@ -31,12 +31,12 @@
//////////////////////////////////////
// Interface
//////////////////////////////////////
-ListViewInterface::ListViewInterface(ListViewInterface *parent, TQString label)
- : KListViewItem( parent, label )
+ListViewInterface::ListViewInterface(ListViewInterface *tqparent, TQString label)
+ : KListViewItem( tqparent, label )
{
}
-ListViewInterface::ListViewInterface(ListViewInterface *parent, ListViewInterface *after, TQString label) : KListViewItem( parent, after, label )
+ListViewInterface::ListViewInterface(ListViewInterface *tqparent, ListViewInterface *after, TQString label) : KListViewItem( tqparent, after, label )
{
}
@@ -63,12 +63,12 @@ RobDocument::RobDocument(KListView *lv, TQString label)
m_valueList.append( TQString("RobDocument") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<H1><center>" + i18n("unnamed") + "</center></H1>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("unnamed") + "\n"); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -101,7 +101,7 @@ bool RobDocument::setValue( unsigned int index, TQVariant data )
TQVariant RobDocument::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -116,8 +116,8 @@ TQVariant RobDocument::getValue( unsigned int index ) const
/**
* Overview
*/
-Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Overview::Overview(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -128,12 +128,12 @@ Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString
m_valueList.append( TQString("BookInfo") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<H1>" + i18n("Overview") + "</H1>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Overview") + "\n"); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -160,7 +160,7 @@ bool Overview::setValue( unsigned int index, TQVariant data )
TQVariant Overview::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -171,8 +171,8 @@ TQVariant Overview::getValue( unsigned int index ) const
/**
* Date
*/
-Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Date::Date(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -183,12 +183,12 @@ Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label)
m_valueList.append( TQString("Date") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)1 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<B>" + i18n("Date") +": </B>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Date") + ": "); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -227,7 +227,7 @@ bool Date::setValue( unsigned int index, TQVariant data )
TQVariant Date::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -238,8 +238,8 @@ TQVariant Date::getValue( unsigned int index ) const
/**
* ReleaseInfo
*/
-ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+ReleaseInfo::ReleaseInfo(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -250,12 +250,12 @@ ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQ
m_valueList.append( TQString("ReleaseInfo") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)1 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<B>" + i18n("Release") + ": </B>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Release") + ": "); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -294,7 +294,7 @@ bool ReleaseInfo::setValue( unsigned int index, TQVariant data )
TQVariant ReleaseInfo::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -305,8 +305,8 @@ TQVariant ReleaseInfo::getValue( unsigned int index ) const
/**
* Authorgroup
*/
-AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+AuthorGroup::AuthorGroup(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("kdmconfig", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -317,12 +317,12 @@ AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQ
m_valueList.append( TQString("AuthorGroup") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<H2>" + i18n("Author(s)")+ "</H2>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Author(s)") + "\n"); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -349,7 +349,7 @@ bool AuthorGroup::setValue( unsigned int index, TQVariant data )
TQVariant AuthorGroup::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -361,8 +361,8 @@ TQVariant AuthorGroup::getValue( unsigned int index ) const
/**
* Author
*/
-Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Author::Author(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("personal", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -372,12 +372,12 @@ Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString lab
m_valueList.append( TQString("Author") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)1 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<B>" + i18n("Author") + ": </B>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Author") + ": "); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -389,9 +389,9 @@ Author::~Author()
// {
// // canonify string
// TQString m_data = data;
-// m_data.replace( TQRegExp("\n"), "" ); // remove Newlines
-// m_data.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
-// m_data.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
+// m_data.tqreplace( TQRegExp("\n"), "" ); // remove Newlines
+// m_data.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
+// m_data.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
// // split string "firstname surname"
// TQString firstname = m_data.section(' ', 0, 0);
// TQString surname = m_data.section(' ', 1, 1);
@@ -434,7 +434,7 @@ bool Author::setValue( unsigned int index, TQVariant data )
TQVariant Author::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -445,8 +445,8 @@ TQVariant Author::getValue( unsigned int index ) const
/**
* KeywordSet
*/
-KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+KeywordSet::KeywordSet(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -457,12 +457,12 @@ KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQSt
m_valueList.append( TQString("KeywordSet") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<H2>" + i18n("Keywords") + "</H2>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Keywords") + "\n"); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -489,7 +489,7 @@ bool KeywordSet::setValue( unsigned int index, TQVariant data )
TQVariant KeywordSet::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -500,20 +500,20 @@ TQVariant KeywordSet::getValue( unsigned int index ) const
/**
* Keyword
*/
-Keyword::Keyword(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Keyword::Keyword(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
// new Concept (begin)
m_valueList.clear();
m_valueList.append( TQString("Keyword") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (bool)1 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
- m_valueList.append(TQString::null); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
+ m_valueList.append(TQString()); // SpeakerHeader
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -553,7 +553,7 @@ bool Keyword::setValue( unsigned int index, TQVariant data )
TQVariant Keyword::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -566,8 +566,8 @@ TQVariant Keyword::getValue( unsigned int index ) const
/**
* Abstract
*/
-Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Abstract::Abstract(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -578,12 +578,12 @@ Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString
m_valueList.append( TQString("Abstract") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
m_valueList.append("<H2>" + i18n("Abstract") + "</H2>"); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Abstract") + "\n"); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -610,7 +610,7 @@ bool Abstract::setValue( unsigned int index, TQVariant data )
TQVariant Abstract::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -622,8 +622,8 @@ TQVariant Abstract::getValue( unsigned int index ) const
/**
* Para
*/
-Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Para::Para(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -633,12 +633,12 @@ Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label)
m_valueList.append( TQString("Para") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)-1 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
m_valueList.append(i18n("Paragraph") + "\n"); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -652,7 +652,7 @@ bool Para::setValue( unsigned int index, TQVariant data )
return false;
TQValueList<TQVariant>::Iterator it = m_valueList.at(index);
- TQString sData = TQString::null;
+ TQString sData = TQString();
ParaSaxParser *p = ParaSaxParser::Instance();
switch (index){
case KSayItGlobal::ISEDITABLE:
@@ -684,7 +684,7 @@ bool Para::setValue( unsigned int index, TQVariant data )
TQVariant Para::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -696,8 +696,8 @@ TQVariant Para::getValue( unsigned int index ) const
/**
* Chapter
*/
-Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Chapter::Chapter(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -707,12 +707,12 @@ Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString l
m_valueList.append( TQString("Chapter") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
- m_valueList.append(TQString::null); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
+ m_valueList.append(TQString()); // SpeakerHeader
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -745,7 +745,7 @@ bool Chapter::setValue( unsigned int index, TQVariant data )
TQVariant Chapter::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -757,8 +757,8 @@ TQVariant Chapter::getValue( unsigned int index ) const
/**
* Sect1
*/
-Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Sect1::Sect1(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -768,12 +768,12 @@ Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label
m_valueList.append( TQString("Sect1") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
- m_valueList.append(TQString::null); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
+ m_valueList.append(TQString()); // SpeakerHeader
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -806,7 +806,7 @@ bool Sect1::setValue( unsigned int index, TQVariant data )
TQVariant Sect1::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -817,8 +817,8 @@ TQVariant Sect1::getValue( unsigned int index ) const
/**
* Sect2
*/
-Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Sect2::Sect2(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -828,12 +828,12 @@ Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label
m_valueList.append( TQString("Sect2") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
- m_valueList.append(TQString::null); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
+ m_valueList.append(TQString()); // SpeakerHeader
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -866,7 +866,7 @@ bool Sect2::setValue( unsigned int index, TQVariant data )
TQVariant Sect2::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -877,8 +877,8 @@ TQVariant Sect2::getValue( unsigned int index ) const
/**
* Sect3
*/
-Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Sect3::Sect3(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -888,12 +888,12 @@ Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label
m_valueList.append( TQString("Sect3") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
- m_valueList.append(TQString::null); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
+ m_valueList.append(TQString()); // SpeakerHeader
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -926,7 +926,7 @@ bool Sect3::setValue( unsigned int index, TQVariant data )
TQVariant Sect3::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -937,8 +937,8 @@ TQVariant Sect3::getValue( unsigned int index ) const
/**
* Sect4
*/
-Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Sect4::Sect4(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -948,12 +948,12 @@ Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label
m_valueList.append( TQString("Sect4") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
- m_valueList.append(TQString::null); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
+ m_valueList.append(TQString()); // SpeakerHeader
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -986,7 +986,7 @@ bool Sect4::setValue( unsigned int index, TQVariant data )
TQVariant Sect4::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
@@ -997,8 +997,8 @@ TQVariant Sect4::getValue( unsigned int index ) const
/**
* Sect5
*/
-Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label)
- : ListViewInterface(parent, after, label)
+Sect5::Sect5(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
+ : ListViewInterface(tqparent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
@@ -1008,12 +1008,12 @@ Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label
m_valueList.append( TQString("Sect5") ); // XmlContextName
m_valueList.append( (bool)false ); // isEditable
m_valueList.append( (int)0 ); // MaxLines
- m_valueList.append(TQString::null); // Summary
- m_valueList.append(TQString::null); // RawData
- m_valueList.append(TQString::null); // RTFHeader
- m_valueList.append(TQString::null); // RTFData
- m_valueList.append(TQString::null); // SpeakerHeader
- m_valueList.append(TQString::null); // SpeakerData
+ m_valueList.append(TQString()); // Summary
+ m_valueList.append(TQString()); // RawData
+ m_valueList.append(TQString()); // RTFHeader
+ m_valueList.append(TQString()); // RTFData
+ m_valueList.append(TQString()); // SpeakerHeader
+ m_valueList.append(TQString()); // SpeakerData
// new Concept (end)
}
@@ -1046,7 +1046,7 @@ bool Sect5::setValue( unsigned int index, TQVariant data )
TQVariant Sect5::getValue( unsigned int index ) const
{
if ( index > m_valueList.count() )
- return TQVariant(); // a invalid QVariant
+ return TQVariant(); // a invalid TQVariant
TQVariant data;
data = m_valueList[index];
diff --git a/ksayit/src/docbookclasses.h b/ksayit/src/docbookclasses.h
index e7a891f..e24af91 100644
--- a/ksayit/src/docbookclasses.h
+++ b/ksayit/src/docbookclasses.h
@@ -12,7 +12,7 @@
#ifndef DOCBOOKCLASSES_H
#define DOCBOOKCLASSES_H
-// Qt includes
+// TQt includes
#include <tqstring.h>
#include <tqvariant.h>
@@ -32,7 +32,7 @@ class TQStringList;
//
/**
Represents the root item of the document, therefore it expects
- a \p TQListView object as parent.\n
+ a \p TQListView object as tqparent.\n
Structural item only (no references to a DOM node).
@author Robert Vogl
*/
@@ -41,11 +41,11 @@ class RobDocument : public ListViewInterface
public:
/**
* Constructor
- * \param lv The ListView parent.
+ * \param lv The ListView tqparent.
* \param label The label is shown in column 0 of the TreeView and is also
* used as bookmark title.
*/
- RobDocument(KListView *lv=0, TQString label=TQString::null);
+ RobDocument(KListView *lv=0, TQString label=TQString());
~RobDocument();
bool setValue( unsigned int index, TQVariant data );
@@ -67,7 +67,7 @@ private:
class Overview : public ListViewInterface
{
public:
- Overview(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Overview(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Overview();
bool setValue( unsigned int index, TQVariant data );
@@ -85,7 +85,7 @@ private:
class Date : public ListViewInterface
{
public:
- Date(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Date(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Date();
bool setValue( unsigned int index, TQVariant data );
@@ -104,7 +104,7 @@ private:
class ReleaseInfo : public ListViewInterface
{
public:
- ReleaseInfo(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ ReleaseInfo(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~ReleaseInfo();
bool setValue( unsigned int index, TQVariant data );
@@ -124,7 +124,7 @@ private:
class AuthorGroup : public ListViewInterface
{
public:
- AuthorGroup(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ AuthorGroup(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~AuthorGroup();
bool setValue( unsigned int index, TQVariant data );
@@ -143,7 +143,7 @@ private:
class Author : public ListViewInterface
{
public:
- Author(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Author(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Author();
bool setValue( unsigned int index, TQVariant data );
@@ -162,7 +162,7 @@ private:
class KeywordSet : public ListViewInterface
{
public:
- KeywordSet(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ KeywordSet(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~KeywordSet();
bool setValue( unsigned int index, TQVariant data );
@@ -180,7 +180,7 @@ private:
class Keyword : public ListViewInterface
{
public:
- Keyword(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Keyword(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Keyword();
bool setValue( unsigned int index, TQVariant data );
@@ -199,7 +199,7 @@ private:
class Abstract : public ListViewInterface
{
public:
- Abstract(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Abstract(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Abstract();
bool setValue( unsigned int index, TQVariant data );
@@ -217,7 +217,7 @@ private:
class Para : public ListViewInterface
{
public:
- Para(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Para(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Para();
bool setValue( unsigned int index, TQVariant data );
@@ -236,7 +236,7 @@ private:
class Chapter : public ListViewInterface
{
public:
- Chapter(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Chapter(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Chapter();
bool setValue( unsigned int index, TQVariant data );
@@ -255,7 +255,7 @@ private:
class Sect1 : public ListViewInterface
{
public:
- Sect1(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Sect1(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Sect1();
bool setValue( unsigned int index, TQVariant data );
@@ -274,7 +274,7 @@ private:
class Sect2 : public ListViewInterface
{
public:
- Sect2(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Sect2(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Sect2();
bool setValue( unsigned int index, TQVariant data );
@@ -293,7 +293,7 @@ private:
class Sect3 : public ListViewInterface
{
public:
- Sect3(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Sect3(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Sect3();
bool setValue( unsigned int index, TQVariant data );
@@ -312,7 +312,7 @@ private:
class Sect4 : public ListViewInterface
{
public:
- Sect4(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Sect4(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Sect4();
bool setValue( unsigned int index, TQVariant data );
@@ -331,7 +331,7 @@ private:
class Sect5 : public ListViewInterface
{
public:
- Sect5(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null);
+ Sect5(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
~Sect5();
bool setValue( unsigned int index, TQVariant data );
diff --git a/ksayit/src/docbookgenerator.cpp b/ksayit/src/docbookgenerator.cpp
index 4b792b2..a6f8a72 100644
--- a/ksayit/src/docbookgenerator.cpp
+++ b/ksayit/src/docbookgenerator.cpp
@@ -10,7 +10,7 @@
//
//
-// Qt includes
+// TQt includes
#include <tqstring.h>
#include <tqvariant.h>
@@ -105,10 +105,10 @@ void DocbookGenerator::writeTitleOfBook(TQTextStream &doc, ListViewInterface *it
if ( whoAmI != "BookInfo" )
return;
- // Documents title is stored in root element (parent of BookInfo)
- ListViewInterface *parent = static_cast<ListViewInterface*>(item->parent());
- if ( parent ){
- TQString title = parent->text(0);
+ // Documents title is stored in root element (tqparent of BookInfo)
+ ListViewInterface *tqparent = static_cast<ListViewInterface*>(item->tqparent());
+ if ( tqparent ){
+ TQString title = tqparent->text(0);
// add node to document
doc << "<Title>" << title << "</Title>" << endl;
@@ -151,7 +151,7 @@ void DocbookGenerator::writeAuthor(TQTextStream &doc, ListViewInterface *item)
if ( whoAmI != "Author" )
return;
- TQString author = TQString::null;
+ TQString author = TQString();
author = ( item->getValue(KSayItGlobal::RAWDATA) ).toString();
// add node to document
@@ -231,7 +231,7 @@ void DocbookGenerator::writeKeyword(TQTextStream &doc, ListViewInterface *item)
return;
// TQString keyword = item->text( 0 );
- TQString keyword = TQString::null;
+ TQString keyword = TQString();
keyword = (item->getValue(3)).toString();
// add node to document
diff --git a/ksayit/src/docbookgenerator.h b/ksayit/src/docbookgenerator.h
index b5fb251..109d0c5 100644
--- a/ksayit/src/docbookgenerator.h
+++ b/ksayit/src/docbookgenerator.h
@@ -12,7 +12,7 @@
#ifndef DOCBOOKGENERATOR_H
#define DOCBOOKGENERATOR_H
-// Qt includes
+// TQt includes
#include <tqtextstream.h>
// KDE includes
diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp
index 679a44b..f1e0c51 100644
--- a/ksayit/src/docbookparser.cpp
+++ b/ksayit/src/docbookparser.cpp
@@ -10,7 +10,7 @@
//
//
-// Qt includes
+// TQt includes
#include <tqregexp.h>
#include <tqstring.h>
#include <tqtextstream.h>
@@ -58,7 +58,7 @@ TQString DocbookParser::node2raw(TQDomNode node) const
void DocbookParser::parseBook(const TQDomElement &element, ListViewInterface *item)
{
kdDebug(100200) << "+++ entering parseBook()" << endl;
- item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( item );
@@ -89,7 +89,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
kdDebug(100200) << "+++ entering parseBookInfo()" << endl;
Overview *overview = new Overview(item, NULL, i18n("Overview"));
- overview->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ overview->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( overview );
@@ -122,7 +122,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
data = node.firstChild().toText();
if( !data.isNull() ){
Date *date = new Date(overview, NULL, i18n("Date"));
- date->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ date->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
date->setText( 1, data.nodeValue() );
date->setValue(KSayItGlobal::RTFDATA, data.nodeValue());
date->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue());
@@ -140,7 +140,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
data = node.firstChild().toText();
if( !data.isNull() ){
ReleaseInfo *relinfo = new ReleaseInfo(overview, NULL, i18n("Release"));
- relinfo->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ relinfo->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
relinfo->setText( 1, data.nodeValue() );
relinfo->setValue(KSayItGlobal::RTFDATA, data.nodeValue());
relinfo->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue());
@@ -176,7 +176,7 @@ void DocbookParser::parseAuthorGroup(const TQDomElement &element, ListViewInterf
// item = overview
AuthorGroup *authorgroup = new AuthorGroup(item, NULL, i18n("Author(s)"));
- authorgroup->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ authorgroup->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( authorgroup );
@@ -199,11 +199,11 @@ void DocbookParser::parseAuthor(const TQDomElement &element, ListViewInterface *
TQDomText data;
TQDomText firstname = TQDomText();
TQDomText surname = TQDomText();
- TQString s_firstname = TQString::null;
- TQString s_surname = TQString::null;
+ TQString s_firstname = TQString();
+ TQString s_surname = TQString();
Author *author = new Author(item);
- author->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ author->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
TQDomNode node = element.firstChild();
while( !node.isNull() ){
@@ -241,7 +241,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa
// item = overview
KeywordSet *keywordset = new KeywordSet(item, NULL, i18n("Keywords"));
- keywordset->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ keywordset->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( keywordset );
@@ -252,7 +252,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa
data = node.firstChild().toText();
if( !data.isNull() ){
Keyword *keyword = new Keyword(keywordset);
- keyword->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ keyword->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
keyword->setText(0, data.nodeValue() );
keyword->setValue(KSayItGlobal::RTFDATA, data.nodeValue() );
keyword->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue() );
@@ -275,7 +275,7 @@ void DocbookParser::parseAbstract(const TQDomElement &element, ListViewInterface
// item = overview
TQDomText data;
Abstract *abstract = new Abstract(item, NULL, i18n("Abstract"));
- abstract->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ abstract->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( abstract );
@@ -296,7 +296,7 @@ void DocbookParser::parseChapter(const TQDomElement &element, ListViewInterface
TQDomText data;
Chapter *chapter = new Chapter(item, NULL, i18n("Chapter"));
- chapter->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ chapter->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( chapter );
@@ -326,7 +326,7 @@ void DocbookParser::parseSect1(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect1 *sect1 = new Sect1(item, NULL, i18n("Section Level 1"));
- sect1->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ sect1->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect1 );
@@ -356,7 +356,7 @@ void DocbookParser::parseSect2(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect2 *sect2 = new Sect2(item, NULL, i18n("Section Level 2"));
- sect2->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ sect2->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect2 );
@@ -386,7 +386,7 @@ void DocbookParser::parseSect3(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect3 *sect3 = new Sect3(item, NULL, i18n("Section Level 3"));
- sect3->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ sect3->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect3 );
@@ -416,7 +416,7 @@ void DocbookParser::parseSect4(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect4 *sect4 = new Sect4(item, NULL, i18n("Section Level 4"));
- sect4->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ sect4->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect4 );
@@ -446,7 +446,7 @@ void DocbookParser::parseSect5(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect5 *sect5 = new Sect5(item, NULL, i18n("Section Level 4"));
- sect5->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ sect5->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect5 );
@@ -473,15 +473,15 @@ void DocbookParser::parsePara(const TQDomElement &element, ListViewInterface *it
kdDebug(100200) << "+++ entering parsePara()" << endl;
Para *para = new Para(item, NULL, i18n("Paragraph"));
- para->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ para->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( para );
TQString raw = node2raw(element);
// remove <para> tags
- raw.replace( TQRegExp("</?(para|Para|PARA)/?>"),"");
- raw.replace( TQRegExp("^ "),"" );
- raw.replace( TQRegExp("^\n"), "" );
+ raw.tqreplace( TQRegExp("</?(para|Para|PARA)/?>"),"");
+ raw.tqreplace( TQRegExp("^ "),"" );
+ raw.tqreplace( TQRegExp("^\n"), "" );
para->setValue(KSayItGlobal::RAWDATA, raw);
para->setValue(KSayItGlobal::RTFDATA, raw);
diff --git a/ksayit/src/docbookparser.h b/ksayit/src/docbookparser.h
index 5c84e30..66deb91 100644
--- a/ksayit/src/docbookparser.h
+++ b/ksayit/src/docbookparser.h
@@ -12,7 +12,7 @@
#ifndef DOCBOOKPARSER_H
#define DOCBOOKPARSER_H
-// Qt includes
+// TQt includes
#include <tqdom.h>
// KDE includes
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 11e22ce..5776917 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -11,7 +11,7 @@
//
#include <stdlib.h> // getenv
-// Qt includes
+// TQt includes
#include <tqdom.h>
#include <tqfile.h>
#include <tqwidget.h>
@@ -41,8 +41,8 @@
//////////////////////////////////////
// TreeView Implementation
//////////////////////////////////////
-DocTreeViewImpl::DocTreeViewImpl(TQWidget* parent, const char* name, WFlags fl)
- : DocTreeView(parent, name, fl)
+DocTreeViewImpl::DocTreeViewImpl(TQWidget* tqparent, const char* name, WFlags fl)
+ : DocTreeView(tqparent, name, fl)
{
m_rootItem = NULL;
m_url = KURL();
@@ -66,7 +66,7 @@ DocTreeViewImpl::DocTreeViewImpl(TQWidget* parent, const char* name, WFlags fl)
m_currentItem = m_rootItem;
m_parasaxparser = ParaSaxParser::Instance();
m_editMode = false;
- m_changedContent = TQString::null;
+ m_changedContent = TQString();
m_contextmenuhandler = NULL;
m_contextmenu = NULL;
@@ -86,7 +86,7 @@ DocTreeViewImpl::~DocTreeViewImpl()
void DocTreeViewImpl::enableContextMenus( bool enabled )
{
if ( enabled ){
- m_contextmenuhandler = new ContextMenuHandler(this, "contextmenuhandler");
+ m_contextmenuhandler = new ContextMenuHandler(TQT_TQOBJECT(this), "contextmenuhandler");
} else {
if ( m_contextmenuhandler )
delete m_contextmenuhandler;
@@ -105,7 +105,7 @@ void DocTreeViewImpl::clear()
// inform BookmarkHandler
//
- emit signalSetBookmarkFilename( TQString::null );
+ emit signalSetBookmarkFilename( TQString() );
listView->clear();
m_rootItem = new RobDocument( listView, i18n("unnamed") );
@@ -193,11 +193,11 @@ void DocTreeViewImpl::openFile(const KURL &url)
if( domTree.setContent(&file) ){
// extract Header
file.reset();
- TQString header = TQString::null;
+ TQString header = TQString();
TQString line;
int offset;
file.readLine( line, file.size() );
- while( !file.atEnd() && (offset = line.find("<book", 0, false)) < 0 ){
+ while( !file.atEnd() && (offset = line.tqfind("<book", 0, false)) < 0 ){
header += line;
file.readLine( line, file.size() );
}
@@ -261,7 +261,7 @@ void DocTreeViewImpl::openFile(const KURL &url)
docbookparser.parseBook(root , m_rootItem);
m_idCounter = docbookparser.getIdCounter();
} else {
- err = i18n("The file is of type %1, 'book' expected.").arg(root.tagName() );
+ err = i18n("The file is of type %1, 'book' expected.").tqarg(root.tagName() );
throw(err);
}
@@ -329,7 +329,7 @@ void DocTreeViewImpl::saveFileAs()
makeCurrentNodePersistent();
- m_url = KFileDialog::getSaveURL(TQString::null, "*.docbook", this, i18n("Save File As"));
+ m_url = KFileDialog::getSaveURL(TQString(), "*.docbook", this, i18n("Save File As"));
if ( m_url.isEmpty() ) // dialog cancelled
return;
if ( !m_url.isValid() ){
@@ -391,9 +391,9 @@ void DocTreeViewImpl::setEditMode(bool mode)
void DocTreeViewImpl::makeToSingleLine( TQString &content )
{
// canonify string
- content.replace( TQRegExp("\n"), "" ); // remove Newlines
- content.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
- content.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
+ content.tqreplace( TQRegExp("\n"), "" ); // remove Newlines
+ content.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
+ content.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
}
@@ -402,10 +402,10 @@ TQString DocTreeViewImpl::selectItemByID(const TQString &ID, const TQString titl
kdDebug(100200) << "DocTreeViewImpl::selectItemByID(" << ID << ")" << endl;
if ( ID.isNull() )
- return TQString::null;
+ return TQString();
TQString sTitle = title.lower();
- TQString err = TQString::null;
+ TQString err = TQString();
/**
* Search on structure (URL)
@@ -416,7 +416,7 @@ TQString DocTreeViewImpl::selectItemByID(const TQString &ID, const TQString titl
TQStringList::Iterator it = partList.begin();
it++; // skip first element (allways RobDocument)
int childNum = 0;
- TQString childType = TQString::null;
+ TQString childType = TQString();
ListViewInterface *item = m_rootItem;
bool hit = false;
@@ -459,7 +459,7 @@ TQString DocTreeViewImpl::selectItemByID(const TQString &ID, const TQString titl
// with the given title.
item = NULL;
TQListViewItemIterator sit( m_rootItem );
- TQString itemTitle = TQString::null;
+ TQString itemTitle = TQString();
while ( sit.current() ) {
item = static_cast<ListViewInterface*>(sit.current());
if ( !item )
@@ -503,7 +503,7 @@ void DocTreeViewImpl::slotItemClicked(TQListViewItem *item)
if ( item ){
m_currentItem = static_cast<ListViewInterface*>(item);
- TQString str = TQString::null;
+ TQString str = TQString();
TQTextStream msg(&str, IO_ReadWrite);
msg.setEncoding(TQTextStream::UnicodeUTF8);
@@ -517,7 +517,7 @@ void DocTreeViewImpl::slotItemClicked(TQListViewItem *item)
// Create Bookmark-ID depending on the location of the item
// within the tree
- TQString idstring = TQString::null;
+ TQString idstring = TQString();
TQTextStream id(&idstring, IO_ReadWrite);
id.setEncoding(TQTextStream::UnicodeUTF8);
id << "1=RobDocument";
@@ -553,21 +553,21 @@ void DocTreeViewImpl::recursiveBuildItemIdentifier(ListViewInterface* item, TQTe
if ( !item )
return;
- // 1. Do we have a parent (=parentItem)?
+ // 1. Do we have a tqparent (=tqparentItem)?
// If no -> return, if yes -> recursive call
- ListViewInterface *parentItem = NULL;
- parentItem = static_cast<ListViewInterface*>( item->parent() );
- if ( parentItem ){
- recursiveBuildItemIdentifier( parentItem, idstring );
+ ListViewInterface *tqparentItem = NULL;
+ tqparentItem = static_cast<ListViewInterface*>( item->tqparent() );
+ if ( tqparentItem ){
+ recursiveBuildItemIdentifier( tqparentItem, idstring );
} else {
// break recursion
return;
}
- // 2. Which child of the parentItem are we? Append no. to idstring.
+ // 2. Which child of the tqparentItem are we? Append no. to idstring.
int childno = 0;
TQString itemID = item->text(3);
- ListViewInterface *i = static_cast<ListViewInterface*>( parentItem->firstChild() );
+ ListViewInterface *i = static_cast<ListViewInterface*>( tqparentItem->firstChild() );
while( i ){
childno++;
if ( i->text(3) == itemID )
@@ -585,17 +585,17 @@ void DocTreeViewImpl::recursiveBuildItemIdentifier(ListViewInterface* item, TQTe
TQString DocTreeViewImpl::getItemTitle( ListViewInterface *item )
{
if ( !item )
- return TQString::null;
+ return TQString();
TQString col0 = item->text(0);
- TQString title = TQString::null;
+ TQString title = TQString();
// if ( col0 == i18n("Paragraph") ){ // better to use XmlContextName?
if( (item->getValue(KSayItGlobal::XMLCONTEXTNAME)).toString() == i18n("Paragraph") ){
title = ( item->getValue(KSayItGlobal::SPEAKERDATA) ).toString().left(32);
// canonify string
- title.replace( TQRegExp("^( |\t|\n)+"), "");
- title.replace( TQRegExp("( |\t|\n)$+"), "");
+ title.tqreplace( TQRegExp("^( |\t|\n)+"), "");
+ title.tqreplace( TQRegExp("( |\t|\n)$+"), "");
} else {
title = col0.left(32);
}
@@ -700,7 +700,7 @@ void DocTreeViewImpl::makeCurrentNodePersistent()
m_currentItem->setValue( KSayItGlobal::RTFDATA, m_changedContent );
m_currentItem->setValue( KSayItGlobal::SPEAKERDATA, m_changedContent );
- m_changedContent = TQString::null;
+ m_changedContent = TQString();
}
/** replaced by slotRightButtonPressed()
@@ -756,13 +756,13 @@ void DocTreeViewImpl::slotDeleteItem()
kdDebug(100200) << "DocTreeViewImpl::slotDeleteItem()" << endl;
ListViewInterface *itemToDelete = m_currentItem;
- ListViewInterface *parentItem = NULL;
- parentItem = static_cast<ListViewInterface*>(itemToDelete->parent());
- if ( !parentItem )
- return; // delete only items with parent
+ ListViewInterface *tqparentItem = NULL;
+ tqparentItem = static_cast<ListViewInterface*>(itemToDelete->tqparent());
+ if ( !tqparentItem )
+ return; // delete only items with tqparent
// try to delete bookmark
- TQString url = TQString::null;
+ TQString url = TQString();
TQTextStream id(&url, IO_ReadWrite);
id.setEncoding(TQTextStream::UnicodeUTF8);
id << "ksayit://1=RobDocument";
@@ -779,15 +779,15 @@ void DocTreeViewImpl::slotDeleteItem()
TQListViewItemIterator itr( m_rootItem );
while ( itr.current() ) {
item = static_cast<ListViewInterface*>(itr.current());
- item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
+ item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
++itr;
}
// show
m_rootItem->sort();
- listView->setSelected( parentItem, true );
- listView->ensureItemVisible( parentItem );
- slotItemClicked( parentItem );
+ listView->setSelected( tqparentItem, true );
+ listView->ensureItemVisible( tqparentItem );
+ slotItemClicked( tqparentItem );
}
@@ -797,7 +797,7 @@ void DocTreeViewImpl::slotNewBookInfo()
if ( whoAmI == "RobDocument" ){
int newIndex = newIndexFirstChild();
Overview *overview = new Overview( m_currentItem, NULL, i18n("Overview") );
- overview->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ overview->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( overview );
}
@@ -810,7 +810,7 @@ void DocTreeViewImpl::slotNewChapter()
if ( whoAmI == "RobDocument" ){
int newIndex = newIndexLastChild();
Chapter *chapter = new Chapter( m_currentItem, NULL, i18n("Chapter") );
- chapter->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ chapter->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Chapter Title");
chapter->setText(0, newTitle );
@@ -829,7 +829,7 @@ void DocTreeViewImpl::slotNewKeywordSet()
// New TreeView item
int newIndex = newIndexFirstChild();
KeywordSet *keywordset = new KeywordSet(m_currentItem, NULL, i18n("Keywords"));
- keywordset->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ keywordset->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( keywordset );
}
@@ -843,7 +843,7 @@ void DocTreeViewImpl::slotNewKeyword()
// New TreeView item
int newIndex = newIndexLastChild();
Keyword *keyword = new Keyword(m_currentItem, NULL, i18n("Keyword"));
- keyword->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ keyword->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newKeyword = i18n("New Keyword");
keyword->setText(0, newKeyword );
@@ -863,7 +863,7 @@ void DocTreeViewImpl::slotNewAbstract()
// New TreeView item
int newIndex = newIndexLastChild();
Abstract *abstract = new Abstract(m_currentItem, NULL, i18n("Abstract"));
- abstract->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ abstract->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( abstract );
@@ -883,7 +883,7 @@ void DocTreeViewImpl::slotNewAuthorGroup()
// New TreeView item
int newIndex = newIndexFirstChild();
AuthorGroup *authorgroup = new AuthorGroup(m_currentItem, NULL, i18n("Author(s)"));
- authorgroup->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ authorgroup->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( authorgroup );
@@ -903,7 +903,7 @@ void DocTreeViewImpl::slotNewAuthor()
// New TreeView item
int newIndex = newIndexLastChild();
Author *author = new Author(m_currentItem);
- author->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ author->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
author->setText(0, i18n("Author") );
TQString newAuthor = i18n("Firstname Surname");
@@ -924,10 +924,10 @@ void DocTreeViewImpl::slotNewDate()
// New TreeView item
int newIndex = newIndexLastChild();
Date *date = new Date(m_currentItem, NULL, i18n("Date"));
- date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ date->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
// get current date
TQString today;
- today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
+ today = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(Qt::LocalTime), true);
date->setText( 1, today);
date->setValue( KSayItGlobal::RAWDATA, today );
date->setValue( KSayItGlobal::RTFDATA, today );
@@ -945,7 +945,7 @@ void DocTreeViewImpl::slotNewReleaseInfo()
// New TreeView item
int newIndex = newIndexLastChild();
ReleaseInfo *relinfo = new ReleaseInfo(m_currentItem, NULL, i18n("Release"));
- relinfo->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ relinfo->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newRelease = "0.0.0";
relinfo->setText( 1, newRelease );
@@ -966,20 +966,20 @@ void DocTreeViewImpl::slotNewTitle()
void DocTreeViewImpl::slotNewParagraph()
{
/* // Create Null element
- TQDomElement parentElement = TQDomElement();
+ TQDomElement tqparentElement = TQDomElement();
NodeList_type list;
list.clear();
m_currentItem->getNodes( list );
- parentElement = (list.front()).toElement();
+ tqparentElement = (list.front()).toElement();
- if ( parentElement.isNull() )
+ if ( tqparentElement.isNull() )
return;
*/
// New TreeView item
int newIndex = newIndexLastChild();
Para *para = new Para(m_currentItem, NULL, i18n("Paragraph"));
- para->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ para->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( para );
@@ -992,7 +992,7 @@ void DocTreeViewImpl::slotNewSection_1()
if ( whoAmI == "Chapter" ){
int newIndex = newIndexLastChild();
Sect1 *sect1 = new Sect1(m_currentItem, NULL, i18n("Section Level 1"));
- sect1->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ sect1->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect1->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1009,7 +1009,7 @@ void DocTreeViewImpl::slotNewSection_2()
if ( whoAmI == "Sect1" ){
int newIndex = newIndexLastChild();
Sect2 *sect2 = new Sect2(m_currentItem, NULL, i18n("Section Level 2"));
- sect2->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ sect2->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect2->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1026,7 +1026,7 @@ void DocTreeViewImpl::slotNewSection_3()
if ( whoAmI == "Sect2" ){
int newIndex = newIndexLastChild();
Sect3 *sect3 = new Sect3(m_currentItem, NULL, i18n("Section Level 3"));
- sect3->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ sect3->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect3->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1043,7 +1043,7 @@ void DocTreeViewImpl::slotNewSection_4()
if ( whoAmI == "Sect3" ){
int newIndex = newIndexLastChild();
Sect4 *sect4 = new Sect4(m_currentItem, NULL, i18n("Section Level 4"));
- sect4->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ sect4->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect4->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1060,7 +1060,7 @@ void DocTreeViewImpl::slotNewSection_5()
if ( whoAmI == "Sect4" ){
int newIndex = newIndexLastChild();
Sect5 *sect5 = new Sect5(m_currentItem, NULL, i18n("Section Level 5"));
- sect5->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
+ sect5->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect5->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1086,7 +1086,7 @@ int DocTreeViewImpl::newIndexFirstChild()
item = static_cast<ListViewInterface*>(it.current());
itemIndex = (item->text(3)).toInt();
if ( itemIndex > currentIndex ){
- item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );;
+ item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );;
}
++it;
}
@@ -1116,7 +1116,7 @@ int DocTreeViewImpl::newIndexLastChild()
item = static_cast<ListViewInterface*>(it.current());
itemIndex = (item->text(3)).toInt();
if ( itemIndex > lastIndex ){
- item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );
+ item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );
}
++it;
}
diff --git a/ksayit/src/doctreeviewimpl.h b/ksayit/src/doctreeviewimpl.h
index c42cab8..f461b84 100644
--- a/ksayit/src/doctreeviewimpl.h
+++ b/ksayit/src/doctreeviewimpl.h
@@ -12,7 +12,7 @@
#ifndef DOCTREEVIEWIMPL_H
#define DOCTREEVIEWIMPL_H
-// Qt includes
+// TQt includes
#include <tqstring.h>
// KDE includes
@@ -40,7 +40,7 @@ all required methods to access or manipulate its content.
class DocTreeViewImpl : public DocTreeView
{
public:
- DocTreeViewImpl(TQWidget* parent=0, const char* name=0, WFlags fl=0);
+ DocTreeViewImpl(TQWidget* tqparent=0, const char* name=0, WFlags fl=0);
~DocTreeViewImpl();
@@ -102,7 +102,7 @@ public:
/**
* Sets the item active designated by the ID.
* \param ID The ID (column 3) of the TreeView item.
- * \returns <tt>TQString::null</tt> if the operation was successfull,\n
+ * \returns <tt>TQString()</tt> if the operation was successfull,\n
* an error message, if the item was not found.
*/
TQString selectItemByID(const TQString &ID, const TQString title);
diff --git a/ksayit/src/effectstack.cpp b/ksayit/src/effectstack.cpp
index 67cfb44..75ef7f5 100644
--- a/ksayit/src/effectstack.cpp
+++ b/ksayit/src/effectstack.cpp
@@ -10,7 +10,7 @@
//
//
-// Qt includes
+// TQt includes
#include <tqstringlist.h>
// KDE includes
diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui
index 60ad57d..056ceb0 100644
--- a/ksayit/src/fx_setup.ui
+++ b/ksayit/src/fx_setup.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>FX_Setup</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>FX_Setup</cstring>
</property>
@@ -22,23 +22,23 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel_available</cstring>
</property>
@@ -46,11 +46,11 @@
<string>Available:</string>
</property>
</widget>
- <widget class="QListBox">
+ <widget class="TQListBox">
<property name="name">
<cstring>listBox_Available</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>170</height>
@@ -59,9 +59,9 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<vbox>
<property name="name">
@@ -77,18 +77,18 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>toolButton_add</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -101,11 +101,11 @@
<iconset>image0</iconset>
</property>
</widget>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>toolButton_remove</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -137,15 +137,15 @@
</spacer>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel_active</cstring>
</property>
@@ -153,11 +153,11 @@
<string>Active:</string>
</property>
</widget>
- <widget class="QListBox">
+ <widget class="TQListBox">
<property name="name">
<cstring>listBox_Active</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>170</height>
@@ -171,9 +171,9 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="1" column="0">
+ <widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<hbox>
<property name="name">
@@ -189,14 +189,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pushButton_removeAll</cstring>
</property>
@@ -237,16 +237,16 @@
</connection>
<connection>
<sender>listBox_Active</sender>
- <signal>doubleClicked(QListBoxItem*)</signal>
+ <signal>doubleClicked(TQListBoxItem*)</signal>
<receiver>FX_Setup</receiver>
- <slot>slotConfigureEffect(QListBoxItem*)</slot>
+ <slot>slotConfigureEffect(TQListBoxItem*)</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>slotAdd()</slot>
<slot>slotRemove()</slot>
<slot>slotRemoveAll()</slot>
- <slot>slotConfigureEffect(QListBoxItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+ <slot>slotConfigureEffect(TQListBoxItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp
index ec68de8..fc5ed5d 100644
--- a/ksayit/src/fxpluginhandler.cpp
+++ b/ksayit/src/fxpluginhandler.cpp
@@ -26,8 +26,8 @@
#include "ksayit_ttsplugin.h"
-FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, KConfig *config)
- : TQObject(parent, name), m_config(config)
+FXPluginHandler::FXPluginHandler(TQObject *tqparent, const char *name, KConfig *config)
+ : TQObject(tqparent, name), m_config(config)
{
m_mapPluginList.clear();
m_lstActivePlugins.clear();
@@ -58,8 +58,8 @@ void FXPluginHandler::searchPlugins()
KTrader::OfferList offers = KTrader::self()->query("KSayIt/FXPlugin");
KLibFactory *factory = NULL;
- TQString library = TQString::null;
- TQString name = TQString::null;
+ TQString library = TQString();
+ TQString name = TQString();
KTrader::OfferList::Iterator it=offers.begin();
for ( ;it!=offers.end(); ++it ){
@@ -70,11 +70,11 @@ void FXPluginHandler::searchPlugins()
if ( factory ){
kdDebug(100200) << "FXPluginHandler::searchPlugins(): Plugin factory found." << endl;
// register found plugin
- if ( !sRegistered.contains( TQString(name) )){
+ if ( !sRegistered.tqcontains( TQString(name) )){
sRegistered.append( TQString(name) );
plugin.name = name;
plugin.library = library;
- plugin.description = TQString::null;
+ plugin.description = TQString();
plugin.EffectID = 0;
plugin.p = NULL;
m_mapPluginList[plugin.name] = plugin; // update Plugin Map
@@ -96,7 +96,7 @@ void FXPluginHandler::readConfiguration()
// unload all plugins and destroy the effect objects
lit = m_lstActivePlugins.begin();
while ( lit != m_lstActivePlugins.end() ){
- mit = m_mapPluginList.find( *lit );
+ mit = m_mapPluginList.tqfind( *lit );
if ( mit!=m_mapPluginList.end() ){
plugin = *mit;
if ( (plugin.p != NULL) && (plugin.EffectID == 0) ){
@@ -116,7 +116,7 @@ void FXPluginHandler::readConfiguration()
KLibFactory *factory = NULL;
for (lit=conf_active.begin(); lit!=conf_active.end(); ++lit){ // for all in config
- mit = m_mapPluginList.find(*lit);
+ mit = m_mapPluginList.tqfind(*lit);
if( mit!=m_mapPluginList.end() ){
// plugin found in list of registered plugins
plugin = *mit;
@@ -146,7 +146,7 @@ void FXPluginHandler::showEffectGUI(const TQString &pname)
fx_struct plugin;
// find plugin with name==pname in list and show its GUI
- mit = m_mapPluginList.find(pname);
+ mit = m_mapPluginList.tqfind(pname);
if ( mit != m_mapPluginList.end() ){
plugin = *mit;
if ( plugin.p != NULL ){ // plugin loaded
@@ -198,7 +198,7 @@ void FXPluginHandler::activateEffect(const TQString &pname,
fx_struct plugin;
// find plugin with name==pname
- mit = m_mapPluginList.find(pname);
+ mit = m_mapPluginList.tqfind(pname);
if ( mit!=m_mapPluginList.end() ){
plugin = *mit;
if ( plugin.p != NULL ){
diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h
index 43c820f..ca4aa21 100644
--- a/ksayit/src/fxpluginhandler.h
+++ b/ksayit/src/fxpluginhandler.h
@@ -44,11 +44,12 @@ typedef struct {
} fx_struct;
-class FXPluginHandler : public QObject
+class FXPluginHandler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- FXPluginHandler(TQObject *parent = 0, const char *name = 0, KConfig *config=0);
+ FXPluginHandler(TQObject *tqparent = 0, const char *name = 0, KConfig *config=0);
~FXPluginHandler();
public: // Methods
diff --git a/ksayit/src/fxsetupimpl.cpp b/ksayit/src/fxsetupimpl.cpp
index fc0100e..9f18b81 100644
--- a/ksayit/src/fxsetupimpl.cpp
+++ b/ksayit/src/fxsetupimpl.cpp
@@ -27,10 +27,10 @@
// #include "freeverbsetupimpl.h"
#include "fxpluginhandler.h"
-FX_SetupImpl::FX_SetupImpl(TQWidget *parent, const char *name,
+FX_SetupImpl::FX_SetupImpl(TQWidget *tqparent, const char *name,
KConfig *config,
FXPluginHandler *fxpluginhandler )
- : FX_Setup(parent,name), m_config(config), m_fxpluginhandler(fxpluginhandler)
+ : FX_Setup(tqparent,name), m_config(config), m_fxpluginhandler(fxpluginhandler)
{
m_fxpluginhandler->getPlugins(pluginlist);
@@ -109,7 +109,7 @@ void FX_SetupImpl::Init(TQStringList c_avail)
pushButton_removeAll->setEnabled(false);
for (sit=conf_active.begin(); sit!=conf_active.end(); ++sit){
- it = c_avail.find(*sit);
+ it = c_avail.tqfind(*sit);
if ( it!=c_avail.end() ){ // active plugin as per config-file in pluginlist found
c_active.append(*sit); // append to active list
c_avail.remove(*sit); // remove active plugin from the list of avail plugins
diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h
index ac256ed..fc868e6 100644
--- a/ksayit/src/fxsetupimpl.h
+++ b/ksayit/src/fxsetupimpl.h
@@ -37,9 +37,10 @@ class FXPluginHandler;
*/
class FX_SetupImpl : public FX_Setup {
Q_OBJECT
+ TQ_OBJECT
public:
- FX_SetupImpl(TQWidget *parent=0, const char *name=0,
+ FX_SetupImpl(TQWidget *tqparent=0, const char *name=0,
KConfig *config=0,
FXPluginHandler *fxpluginhandler=0);
~FX_SetupImpl();
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index 877c60a..bdf772c 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -55,9 +55,9 @@
#define KSAYITUI "ksayitui.rc"
#define ID_STATUS_MSG 1
-KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f,
+KSayItApp::KSayItApp(TQWidget* tqparent, const char* name, WFlags f,
const TQCString &objID)
- : KMainWindow(parent, name, f), DCOPObject(objID)
+ : KMainWindow(tqparent, name, f), DCOPObject(objID)
{
config = NULL;
view = NULL;
@@ -67,10 +67,10 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f,
bkManager = NULL;
bkHandler = NULL;
bkMenu = NULL;
- m_currentBookmarkFile = TQString::null;
+ m_currentBookmarkFile = TQString();
config=kapp->config();
- m_kttslib = new KTTSDLib(this, "KTTSD-Library", kapp);
+ m_kttslib = new KTTSDLib(TQT_TQOBJECT(this), "KTTSD-Library", kapp);
initView();
initStatusBar();
@@ -84,31 +84,31 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f,
// connect TTS plugin handler to this object
connect(m_kttslib, TQT_SIGNAL(signalFinished()),
- this, TQT_SLOT(slotTTSFinished()) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotTTSFinished()) );
// only used if library thinks it has to call the preferences dialog.
// e.g. when it detects a bad configuration.
connect(m_kttslib, TQT_SIGNAL(signalCallPreferences()),
- this, TQT_SLOT(slotPreferences()) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) );
// init Clipboard
- cb = TQApplication::clipboard();
- connect(cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardChanged()) );
+ cb = TQApplication::tqclipboard();
+ connect(cb, TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotClipboardChanged()) );
// create SystemTray object
tray = new KSayItSystemTray(this, "system_tray");
- connect(tray, TQT_SIGNAL(signalCallPreferences()), this, TQT_SLOT(slotPreferences()) );
- connect(tray, TQT_SIGNAL(signalSayActivated()), this, TQT_SLOT(slotSayText()) );
- connect(tray, TQT_SIGNAL(signalSayClipboard()), this, TQT_SLOT(slotSayClipboard()) );
- connect(tray, TQT_SIGNAL(signalShutUpActivated()), this, TQT_SLOT(slotStopActivated()) );
- connect(tray, TQT_SIGNAL(signalPauseActivated()), this, TQT_SLOT(slotPauseActivated()) );
- connect(tray, TQT_SIGNAL(signalNextActivated()), this, TQT_SLOT(slotNextSentenceActivated()) );
- connect(tray, TQT_SIGNAL(signalPrevActivated()), this, TQT_SLOT(slotPrevSentenceActivated()) );
+ connect(tray, TQT_SIGNAL(signalCallPreferences()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) );
+ connect(tray, TQT_SIGNAL(signalSayActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotSayText()) );
+ connect(tray, TQT_SIGNAL(signalSayClipboard()), TQT_TQOBJECT(this), TQT_SLOT(slotSayClipboard()) );
+ connect(tray, TQT_SIGNAL(signalShutUpActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotStopActivated()) );
+ connect(tray, TQT_SIGNAL(signalPauseActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotPauseActivated()) );
+ connect(tray, TQT_SIGNAL(signalNextActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotNextSentenceActivated()) );
+ connect(tray, TQT_SIGNAL(signalPrevActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()) );
tray->show();
tray->setEnabled(true);
// create the FX plugin handler
- m_fxpluginhandler = new FXPluginHandler(this, "fxpluginhandler", config);
+ m_fxpluginhandler = new FXPluginHandler(TQT_TQOBJECT(this), "fxpluginhandler", config);
m_fxpluginhandler->searchPlugins();
// create object for effectstack
@@ -141,61 +141,61 @@ KSayItApp::~KSayItApp()
void KSayItApp::initActions()
{
// Standard-Actions
- open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
- save = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
- saveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
- KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
- KStdAction::close(this, TQT_SLOT(slotCloseMainWindow()), actionCollection());
- cut = KStdAction::cut(view, TQT_SLOT(slotCut()), actionCollection());
- copy = KStdAction::copy(view, TQT_SLOT(slotCopy()), actionCollection());
- paste = KStdAction::paste(view, TQT_SLOT(slotPaste()), actionCollection());
- preferences = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection());
- KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbar()), actionCollection());
+ open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
+ save = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
+ saveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
+ KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotCloseMainWindow()), actionCollection());
+ cut = KStdAction::cut(TQT_TQOBJECT(view), TQT_SLOT(slotCut()), actionCollection());
+ copy = KStdAction::copy(TQT_TQOBJECT(view), TQT_SLOT(slotCopy()), actionCollection());
+ paste = KStdAction::paste(TQT_TQOBJECT(view), TQT_SLOT(slotPaste()), actionCollection());
+ preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actionCollection());
KStdAction::showToolbar("mainToolBar", actionCollection());
- statusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()), actionCollection());
+ statusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), actionCollection());
// User defined actions
say = new KAction (i18n("Say"),
- Qt::Key_F9,
- this, TQT_SLOT (slotSayText()),
+ TQt::Key_F9,
+ TQT_TQOBJECT(this), TQT_SLOT (slotSayText()),
actionCollection(),
"say_it");
pause = new KAction (i18n("Pause"),
- Qt::Key_Pause,
- this, TQT_SLOT (slotPauseActivated()),
+ TQt::Key_Pause,
+ TQT_TQOBJECT(this), TQT_SLOT (slotPauseActivated()),
actionCollection(),
"pause");
shutup = new KAction (i18n("Shut Up"),
- Qt::Key_F10,
- this, TQT_SLOT (slotStopActivated()),
+ TQt::Key_F10,
+ TQT_TQOBJECT(this), TQT_SLOT (slotStopActivated()),
actionCollection(),
"shut_up");
next_sentence = new KAction (i18n("Next Sentence"),
- Qt::Key_Next,
- this, TQT_SLOT (slotNextSentenceActivated()),
+ TQt::Key_Next,
+ TQT_TQOBJECT(this), TQT_SLOT (slotNextSentenceActivated()),
actionCollection(),
"next_sentence");
prev_sentence = new KAction (i18n("Previous Sentence"),
- Qt::Key_Prior,
- this, TQT_SLOT(slotPrevSentenceActivated()),
+ TQt::Key_Prior,
+ TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()),
actionCollection(),
"prev_sentence");
clear = new KAction (i18n("Clear"),
- Qt::Key_F12,
- this, TQT_SLOT(slotClear()),
+ TQt::Key_F12,
+ TQT_TQOBJECT(this), TQT_SLOT(slotClear()),
actionCollection(),
"clear");
edit = new KToggleAction( i18n("Edit Text"),
0,
- this, TQT_SLOT(slotEditToggled()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotEditToggled()),
actionCollection(),
"edittext");
@@ -293,7 +293,7 @@ void KSayItApp::slotChangeBookmarkFilename(const TQString &newname)
// copy old bookmarkfile to new file
if ( m_currentBookmarkFile != newbkFile ){
if ( TQFile::exists(m_currentBookmarkFile) ){
- TQString command = TQString("cp %1 %2").arg(m_currentBookmarkFile).arg(newbkFile);
+ TQString command = TQString("cp %1 %2").tqarg(m_currentBookmarkFile).tqarg(newbkFile);
system( command.ascii() );
}
// install new BookmarkHandler based on the new file
@@ -314,7 +314,7 @@ void KSayItApp::initStatusBar()
{
// STATUSBAR
statusBar()->insertItem(i18n("Ready."), ID_STATUS_MSG, 1);
- statusBar()->setItemAlignment(ID_STATUS_MSG, Qt::AlignLeft);
+ statusBar()->setItemAlignment(ID_STATUS_MSG, TQt::AlignLeft);
}
@@ -322,17 +322,17 @@ void KSayItApp::initView()
{
// create the main widget
view = new KSayItViewImpl(this);
- view->setMinimumSize(view->sizeHint());
+ view->setMinimumSize(view->tqsizeHint());
setCentralWidget(view);
// connections
connect( view, TQT_SIGNAL(signalEnableCopyCut(bool)),
- this, TQT_SLOT(slotEnableCopyCut(bool)));
- connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)),
- this, TQT_SLOT(slotStatusMsg(const TQString &)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotEnableCopyCut(bool)));
+ connect( view, TQT_SIGNAL(signalShowtqStatus(const TQString &)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &)));
connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)),
- this, TQT_SLOT(slotSetCaption(const TQString &)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotSetCaption(const TQString &)));
connect( view, TQT_SIGNAL(signalTextChanged(bool)),
- this, TQT_SLOT(slotTextChanged(bool)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotTextChanged(bool)) );
// DockWindow
TQDockWindow *docview = new TQDockWindow(TQDockWindow::InDock, this, "docview");
@@ -341,25 +341,25 @@ void KSayItApp::initView()
// treeview->clear();
docview->setWidget(treeview);
docview->setResizeEnabled(true);
- this->setDockEnabled(docview, Qt::DockTop, false);
- this->setDockEnabled(docview, Qt::DockBottom, false);
- this->moveDockWindow(docview, Qt::DockLeft);
+ this->setDockEnabled(docview, TQt::DockTop, false);
+ this->setDockEnabled(docview, TQt::DockBottom, false);
+ this->moveDockWindow(docview, TQt::DockLeft);
connect( treeview, TQT_SIGNAL(signalContentChanged(const TQString&)),
- this, TQT_SLOT(slotTreeViewChanged(const TQString&)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotTreeViewChanged(const TQString&)) );
connect( treeview, TQT_SIGNAL(signalSetText(const TQString&)),
- this, TQT_SLOT(slotSetText(const TQString&)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotSetText(const TQString&)) );
connect( treeview, TQT_SIGNAL(signalAllNodesProcessed()),
- this, TQT_SLOT(slotSayNode()) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotSayNode()) );
connect( treeview, TQT_SIGNAL(signalEnableTextedit(bool)),
- this, TQT_SLOT(slotEnableTextedit(bool)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotEnableTextedit(bool)) );
connect( treeview, TQT_SIGNAL(signalNotifyBookmarkManager(const TQString&, const TQString&)),
- this, TQT_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) );
connect( treeview, TQT_SIGNAL(signalSetBookmarkFilename(const TQString&)),
- this, TQT_SLOT(slotSetBookmarkFilename(const TQString&)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotSetBookmarkFilename(const TQString&)) );
connect( treeview, TQT_SIGNAL(signalChangeBookmarkFilename(const TQString&)),
- this, TQT_SLOT(slotChangeBookmarkFilename(const TQString&)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotChangeBookmarkFilename(const TQString&)) );
connect( treeview, TQT_SIGNAL(signalDeleteBookmark(const TQString&, const TQString&)),
- this, TQT_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) );
}
@@ -473,7 +473,7 @@ void KSayItApp::slotFileOpen()
// open filerequester
TQString fn;
TQString usershome( getenv("HOME") );
- KURL url = KFileDialog::getOpenURL(usershome, TQString::null, this, i18n("File to Speak") );
+ KURL url = KFileDialog::getOpenURL(usershome, TQString(), this, i18n("File to Speak") );
try{
if ( !url.isEmpty() ){
resetView();
@@ -549,7 +549,7 @@ void KSayItApp::slotEditKeys()
void KSayItApp::slotFileQuit()
{
slotStatusMsg(i18n("Exiting..."));
- int really = KMessageBox::questionYesNo( this, i18n("Do you really want to quit?"), TQString::null, KStdGuiItem::quit(), KStdGuiItem::cancel() );
+ int really = KMessageBox::questionYesNo( this, i18n("Do you really want to quit?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel() );
if (really == KMessageBox::Yes){
slotSaveOptions();
kapp->quit();
@@ -618,7 +618,7 @@ void KSayItApp::slotClipboardChanged()
return;
}
- if ( cb->data(QClipboard::Clipboard)->provides("text/plain") ){
+ if ( cb->data(TQClipboard::Clipboard)->provides("text/plain") ){
tray->changeState( StateWAIT::Instance() );
paste->setEnabled(true);
} else {
@@ -811,12 +811,12 @@ void KSayItApp::setActions(int actions)
{
// ACTIONS::PLAY | ACTIONS::STOP | ACTIONS::PAUSE | ACTIONS::FFWD | ACTIONS::FREV;
- // Get the mask of supported actions from the plugin.
- int mask = m_kttslib->getActions();
- kdDebug(100200) << TQString("KSayItApp:PSA: %1").arg(mask, 0, 2) << endl;
+ // Get the tqmask of supported actions from the plugin.
+ int tqmask = m_kttslib->getActions();
+ kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(tqmask, 0, 2) << endl;
// disable actions not supported by the plugin
- int ma = actions & mask;
+ int ma = actions & tqmask;
if (ma & ACTIONS::PLAY){
say->setEnabled(true);
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index fc8fef9..bf1e672 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -24,7 +24,7 @@
using namespace std;
-// include files for Qt
+// include files for TQt
#include <tqstringlist.h>
#include <tqclipboard.h>
@@ -68,12 +68,13 @@ class KSayItBookmarkHandler;
class KSayItApp : public KMainWindow, public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
/** construtor of KSayItApp, calls all init functions to create the application.
*/
- KSayItApp(TQWidget* parent=0, const char* name=0, WFlags f=0,
+ KSayItApp(TQWidget* tqparent=0, const char* name=0, WFlags f=0,
const TQCString &objID=0);
~KSayItApp();
@@ -114,7 +115,7 @@ private slots:
*/
void slotTreeViewChanged(const TQString &str);
- /** save general Options like all bar positions and status as well as the geometry to
+ /** save general Options like all bar positions and status as well as the tqgeometry to
* the configuration file.
*/
void slotSaveOptions();
@@ -265,7 +266,7 @@ public:
* Selects the item with the given ID in the TreeView.
* \param ID The ID of the item to select.
* \param title The title of the bookmark.
- * \returns <tt>TQString::null</tt>, if the operation was successfull,
+ * \returns <tt>TQString()</tt>, if the operation was successfull,
* an error message, if the ID was not found.
*/
TQString setItemByBookmark( const TQString &ID, const TQString &title );
@@ -315,7 +316,7 @@ private: // Methods
* \p ksayit/ksayit_bookmarks/.
* \param filename The name of the bookmark file.
* \returns The absolute pathname of the given bookmark file.
- * Returns \p TQString::null if the operation was not successfull.
+ * Returns \p TQString() if the operation was not successfull.
*/
TQString getBookmarkDir(const TQString &filename);
@@ -349,7 +350,7 @@ private:
KActionMenu *bookmarkmenu;
// Misc stuff
- QClipboard *cb;
+ TQClipboard *cb;
TQString clip;
KTTSDLib *m_kttslib;
FXPluginHandler *m_fxpluginhandler;
diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h
index 852c522..211ca36 100644
--- a/ksayit/src/ksayit_fxplugin.h
+++ b/ksayit/src/ksayit_fxplugin.h
@@ -30,14 +30,15 @@ using namespace Arts;
* derived from FXPlugin, include 'ksayit_fxplugin.h' and reimplement all the
* pure virtual functions provided herein.
* *Appl is a pointer to the main application as delivered by \p KApplication::kApplication().
- * It can be used for any reason i.e. to install a Qt translator.\n
+ * It can be used for any reason i.e. to install a TQt translator.\n
\author Robert Vogl
*/
-class FXPlugin : public QObject
+class FXPlugin : public TQObject
{
// Q_OBJECT
+ TQ_OBJECT
public:
- FXPlugin(TQObject *parent=0, const char* name=0){};
+ FXPlugin(TQObject *tqparent=0, const char* name=0){};
/** Sets the Main application object. Useful for config objects etc.
*/
diff --git a/ksayit/src/ksayit_ttsplugin.h b/ksayit/src/ksayit_ttsplugin.h
index e0f8d31..bb3e9f9 100644
--- a/ksayit/src/ksayit_ttsplugin.h
+++ b/ksayit/src/ksayit_ttsplugin.h
@@ -37,7 +37,7 @@
* \p createPlugin() returns a pointer to an instance of your class.
* The Plugin Handler of KSayIt calls this function with a parameter pointing
* to the main application instance, as delivered by \p KApplication::kApplication().
- * This pointer can be used for any reason i.e. to install a Qt translator.\n
+ * This pointer can be used for any reason i.e. to install a TQt translator.\n
* An instance of your class should be deleted by use of \p destroyPlugin().\n
* Example:
\code
@@ -54,7 +54,7 @@
}
};
\endcode
- * KSayIt expects two Qt-signals from the plugin:\n
+ * KSayIt expects two TQt-signals from the plugin:\n
* \p signalPluginFinished() must be emitted when the plugin is finished,
* i.e. a task to speak text has been finished.\n
* \p signalPluginFailed() is optional and shall emitted if the processing
@@ -62,10 +62,10 @@
\author Robert Vogl
*/
-class TTSPlugin : public QObject
+class TTSPlugin : public TQObject
{
protected:
- TTSPlugin(TQObject *parent, const char *name) : TQObject(parent, name){};
+ TTSPlugin(TQObject *tqparent, const char *name) : TQObject(tqparent, name){};
public:
/** Returns the name of the plugin. This name is the unique identifier
@@ -109,7 +109,7 @@ public:
* In this case, KSayIt uses a built-in audio player to play back
* the file via aRts.\n
* If this plugin provides its own audio output mechanisms, then return
- * \p TQString::null.\n
+ * \p TQString().\n
* The TTS processing shall be implemented non-blocking, i.e. this function has
* to return a valid string as soon as possible, before the typically time
* consuming TTS processing starts. The synchronization with KSayIt shall
diff --git a/ksayit/src/ksayitbookmarkhandler.cpp b/ksayit/src/ksayitbookmarkhandler.cpp
index 7a45247..8e838d5 100644
--- a/ksayit/src/ksayitbookmarkhandler.cpp
+++ b/ksayit/src/ksayitbookmarkhandler.cpp
@@ -10,7 +10,7 @@
//
//
-// Qt include
+// TQt include
#include <tqregexp.h>
// KDE includes
@@ -23,11 +23,11 @@
#include "ksayitbookmarkhandler.h"
#include "ksayit.h"
-KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* parent)
- : KBookmarkOwner(), m_bkManager(bkManager), m_parent(parent)
+KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* tqparent)
+ : KBookmarkOwner(), m_bkManager(bkManager), m_parent(tqparent)
{
- m_ID = TQString::null;
- m_title = TQString::null;
+ m_ID = TQString();
+ m_title = TQString();
}
KSayItBookmarkHandler::~KSayItBookmarkHandler()
@@ -49,10 +49,10 @@ void KSayItBookmarkHandler::openBookmarkURL(const TQString &url)
kdDebug(100200) << "KSayItBookmarkHandler::openBookmarkURL(" << url << ")" << endl;
TQString l_url = url;
- TQString title = TQString::null;
+ TQString title = TQString();
TQString type = l_url.section( "://", 0, 0 );
TQString ID = l_url.section( TQRegExp("/+"), 1, 1 );
- TQString err = TQString::null;
+ TQString err = TQString();
// Some checks
if ( type != "ksayit" ){
@@ -71,7 +71,7 @@ void KSayItBookmarkHandler::openBookmarkURL(const TQString &url)
title = bookmark.text();
}
- TQString result = TQString::null;
+ TQString result = TQString();
result = m_parent->setItemByBookmark( ID, title );
if ( !result.isNull() ){
KMessageBox::sorry( 0, result, i18n("Bookmark not found") );
@@ -228,7 +228,7 @@ void KSayItBookmarkHandler::traverseBookmarks(KBookmarkGroup bkGroup)
//
// Modifications on URL/Title END
- bkNew = bkGroup.addBookmark( m_bkManager, title, url, TQString::null, false );
+ bkNew = bkGroup.addBookmark( m_bkManager, title, url, TQString(), false );
bkGroup.moveItem( bkNew, bkPrev );
bkGroup.deleteBookmark( bk );
}
diff --git a/ksayit/src/ksayitbookmarkhandler.h b/ksayit/src/ksayitbookmarkhandler.h
index 018ea39..31be84c 100644
--- a/ksayit/src/ksayitbookmarkhandler.h
+++ b/ksayit/src/ksayitbookmarkhandler.h
@@ -12,7 +12,7 @@
#ifndef KSAYITBOOKMARKHANDLER_H
#define KSAYITBOOKMARKHANDLER_H
-// Qt includes
+// TQt includes
#include <tqstring.h>
// KDE includes
@@ -31,7 +31,7 @@ class KSayItApp;
class KSayItBookmarkHandler : public KBookmarkOwner
{
public:
- KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* parent=0);
+ KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* tqparent=0);
virtual ~KSayItBookmarkHandler();
public:
diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp
index e2001cd..e7054a2 100644
--- a/ksayit/src/ksayitsystemtray.cpp
+++ b/ksayit/src/ksayitsystemtray.cpp
@@ -26,8 +26,8 @@
// App specific includes
#include "ksayitsystemtray.h"
-KSayItSystemTray::KSayItSystemTray(TQWidget *parent, const char *name)
- : KSystemTray(parent,name)
+KSayItSystemTray::KSayItSystemTray(TQWidget *tqparent, const char *name)
+ : KSystemTray(tqparent,name)
{
initActions();
changeState( StateCLIPEMPTY::Instance() );
@@ -46,7 +46,7 @@ void KSayItSystemTray::initActions()
menu = this->contextMenu();
help = new KHelpMenu(this, kapp->aboutData(), false, actionCollection());
// Standard actions
- settings = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection());
+ settings = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection());
help_about = KStdAction::aboutApp(help, TQT_SLOT(aboutApplication()), actionCollection());
help_kde = KStdAction::aboutKDE(help, TQT_SLOT(aboutKDE()), actionCollection());
@@ -54,28 +54,28 @@ void KSayItSystemTray::initActions()
say = new KAction(i18n("Say"),
"player_play",
0,
- this, TQT_SLOT (slotSayActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT (slotSayActivated()),
actionCollection(),
"say_it");
shutup = new KAction(i18n("Shut Up"),
"player_stop",
0,
- this, TQT_SLOT (slotStopActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT (slotStopActivated()),
actionCollection(),
"shut_up");
pause = new KAction (i18n("Pause"),
"player_pause",
0,
- this, TQT_SLOT (slotPauseActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT (slotPauseActivated()),
actionCollection(),
"pause");
next_sentence = new KAction (i18n("Next Sentence"),
"2rightarrow",
0,
- this, TQT_SLOT (slotNextSentenceActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT (slotNextSentenceActivated()),
actionCollection(),
"next_sentence");
@@ -83,7 +83,7 @@ void KSayItSystemTray::initActions()
prev_sentence = new KAction (i18n("Previous Sentence"),
"2leftarrow",
0,
- this, TQT_SLOT(slotPrevSentenceActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()),
actionCollection(),
"prev_sentence");
@@ -253,7 +253,7 @@ void StateWAIT::setContext(KSayItSystemTray *caller)
void StateWAIT::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e)
{
- if (e->button()==LeftButton){ // left Mouse-button pressed
+ if (e->button()==Qt::LeftButton){ // left Mouse-button pressed
TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent)
} else {
mousePressEventCall(caller, e); // normal mouse-handling
@@ -262,7 +262,7 @@ void StateWAIT::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e)
void StateWAIT::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
{
- if (e->button()==LeftButton){ // left Mouse-button released
+ if (e->button()==Qt::LeftButton){ // left Mouse-button released
say(caller);
} else {
mouseReleaseEventCall(caller, e); // normal mouse-handling
@@ -294,7 +294,7 @@ void StateSAY::setContext(KSayItSystemTray *caller)
void StateSAY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e)
{
- if (e->button()==LeftButton){ // left Mouse-button pressed
+ if (e->button()==Qt::LeftButton){ // left Mouse-button pressed
TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent)
} else {
mousePressEventCall(caller, e); // normal mouse-handling
@@ -303,7 +303,7 @@ void StateSAY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e)
void StateSAY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
{
- if (e->button()==LeftButton){ // left Mouse-button released
+ if (e->button()==Qt::LeftButton){ // left Mouse-button released
TQWidget::mouseReleaseEvent(e); // do nothing (see mouseReleaseEvent)
} else {
mouseReleaseEventCall(caller, e); // normal mouse-handling
@@ -336,7 +336,7 @@ void StateCLIPEMPTY::setContext(KSayItSystemTray *caller)
void StateCLIPEMPTY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e)
{
- if (e->button()==LeftButton){ // left Mouse-button pressed
+ if (e->button()==Qt::LeftButton){ // left Mouse-button pressed
TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent)
} else {
mousePressEventCall(caller, e); // normal mouse-handling
@@ -345,7 +345,7 @@ void StateCLIPEMPTY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e)
void StateCLIPEMPTY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
{
- if (e->button()==LeftButton){ // left Mouse-button released
+ if (e->button()==Qt::LeftButton){ // left Mouse-button released
TQWidget::mouseReleaseEvent(e); // do nothing (see mouseReleaseEvent)
} else {
mouseReleaseEventCall(caller, e); // normal mouse-handling
diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h
index 90b15fb..cdeca47 100644
--- a/ksayit/src/ksayitsystemtray.h
+++ b/ksayit/src/ksayitsystemtray.h
@@ -39,11 +39,12 @@ class State;
*/
class KSayItSystemTray : public KSystemTray {
Q_OBJECT
+ TQ_OBJECT
friend class State;
public:
- KSayItSystemTray(TQWidget *parent=0, const char *name=0);
+ KSayItSystemTray(TQWidget *tqparent=0, const char *name=0);
~KSayItSystemTray();
signals:
@@ -149,6 +150,7 @@ private:
class State : public KSystemTray {
Q_OBJECT
+ TQ_OBJECT
public:
State();
~State();
diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp
index dfda154..07c5cdf 100644
--- a/ksayit/src/ksayitviewimpl.cpp
+++ b/ksayit/src/ksayitviewimpl.cpp
@@ -33,7 +33,7 @@ using namespace std;
// App specific includes
#include "ksayitviewimpl.h"
-KSayItViewImpl::KSayItViewImpl(TQWidget *parent, const char *name ) : KSayItView(parent,name) {
+KSayItViewImpl::KSayItViewImpl(TQWidget *tqparent, const char *name ) : KSayItView(tqparent,name) {
// some presets
@@ -51,9 +51,9 @@ void KSayItViewImpl::enableTextedit( bool enable )
{
// if enable==true, we are in Edit Mode => RTF-Mode off.
if ( enable ){
- TextEdit->setTextFormat( Qt::PlainText);
+ TextEdit->setTextFormat( TQt::PlainText);
} else {
- TextEdit->setTextFormat( Qt::RichText);
+ TextEdit->setTextFormat( TQt::RichText);
}
TextEdit->setReadOnly( !enable );
}
diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h
index eb288e7..fab7e49 100644
--- a/ksayit/src/ksayitviewimpl.h
+++ b/ksayit/src/ksayitviewimpl.h
@@ -33,14 +33,15 @@
class KSayItViewImpl : public KSayItView {
Q_OBJECT
+ TQ_OBJECT
public:
- KSayItViewImpl(TQWidget *parent=0, const char *name=0);
+ KSayItViewImpl(TQWidget *tqparent=0, const char *name=0);
~KSayItViewImpl();
signals:
void signalSetCaption(const TQString &caption);
- void signalShowStatus(const TQString &status);
+ void signalShowtqStatus(const TQString &status);
void signalEnableCopyCut(bool enable);
/** Emitted when the text in the TextEditor view cahnges.
diff --git a/ksayit/src/parasaxparser.cpp b/ksayit/src/parasaxparser.cpp
index 9a61e0a..a296e22 100644
--- a/ksayit/src/parasaxparser.cpp
+++ b/ksayit/src/parasaxparser.cpp
@@ -12,7 +12,7 @@
// #include <iostream> // cout
// using namespace std;
-// Qt includes
+// TQt includes
// KDE includes
#include <kdebug.h>
@@ -30,8 +30,8 @@ ParaSaxParser::ParaSaxParser()
m_reader->setEntityResolver(m_handler);
m_reader->setDeclHandler(m_handler);
- m_XmlInputHeader = TQString::null;
- m_XmlInputBody = TQString::null;
+ m_XmlInputHeader = TQString();
+ m_XmlInputBody = TQString();
}
ParaSaxParser::~ParaSaxParser()
diff --git a/ksayit/src/parasaxparser.h b/ksayit/src/parasaxparser.h
index 6f46156..3b9c72c 100644
--- a/ksayit/src/parasaxparser.h
+++ b/ksayit/src/parasaxparser.h
@@ -12,7 +12,7 @@
#ifndef PARASAXPARSER_H
#define PARASAXPARSER_H
-// Qt includes
+// TQt includes
#include <tqxml.h>
#include <tqstring.h>
diff --git a/ksayit/src/saxhandler.cpp b/ksayit/src/saxhandler.cpp
index 9f6354c..7e2d6aa 100644
--- a/ksayit/src/saxhandler.cpp
+++ b/ksayit/src/saxhandler.cpp
@@ -23,7 +23,7 @@
SaxHandler::SaxHandler()
: TQXmlDefaultHandler()
{
- m_output = TQString::null;
+ m_output = TQString();
m_rtf = true;
m_tagmap["action"] = "B";
m_tagmap["application"] = "B";
@@ -127,7 +127,7 @@ bool SaxHandler::characters(const TQString & ch)
bool SaxHandler::fatalError(const TQXmlParseException &exc)
{
TQString err = i18n("Fatal error while parsing XML-Paragraph:\n");
- err += i18n("%1, Line: %2").arg(exc.message()).arg(exc.lineNumber());
+ err += i18n("%1, Line: %2").tqarg(exc.message()).tqarg(exc.lineNumber());
KMessageBox::error(0, err, i18n("Fatal error") );
return false;
}
@@ -160,7 +160,7 @@ bool SaxHandler::internalEntityDecl(const TQString & name,
bool SaxHandler::skippedEntity(const TQString &name)
{
- TQString warn = i18n("Unresolved entity found: %1.\n").arg(name);
+ TQString warn = i18n("Unresolved entity found: %1.\n").tqarg(name);
warn += i18n("KSayIt does not support DocBook files with external entities. ");
warn += i18n("Parsing can continue, but the resulting text will contain gaps.");
@@ -181,7 +181,7 @@ void SaxHandler::getData( TQString &data ) const
void SaxHandler::reset()
{
- m_output = TQString::null;
+ m_output = TQString();
}
diff --git a/ksayit/src/saxhandler.h b/ksayit/src/saxhandler.h
index 4e611b7..397ecef 100644
--- a/ksayit/src/saxhandler.h
+++ b/ksayit/src/saxhandler.h
@@ -1,7 +1,7 @@
//
// C++ Interface: saxhandler
//
-// Description: Qt SAX2-Handler
+// Description: TQt SAX2-Handler
//
//
// Author: Robert Vogl <voglrobe@web.de>, (C) 2005
@@ -16,7 +16,7 @@
#include <map>
using namespace std;
-// Qt includes
+// TQt includes
#include <tqxml.h>
#include <tqstring.h>
@@ -26,7 +26,7 @@ typedef map<TQString, TQString> TagMapT;
/**
@author Robert Vogl
*/
-class SaxHandler : public QXmlDefaultHandler
+class SaxHandler : public TQXmlDefaultHandler
{
public:
SaxHandler();
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index d8df70a..50e4e1c 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -39,12 +39,12 @@
#include "fxpluginhandler.h"
#include "kttsdlib.h"
-VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString &caption,
+VoiceSetupDlg::VoiceSetupDlg(TQWidget *tqparent, const char *name, const TQString &caption,
bool modal,
KConfig *config,
FXPluginHandler *fxpluginhandler,
KTTSDLib *ttslib)
- : KDialogBase(IconList, caption, Ok|Cancel, Ok, parent, name, modal, true),
+ : KDialogBase(IconList, caption, Ok|Cancel, Ok, tqparent, name, modal, true),
m_config(config),
m_fxpluginhandler(fxpluginhandler),
m_kttslib(ttslib)
@@ -88,7 +88,7 @@ void VoiceSetupDlg::initFXPage()
connect( this, TQT_SIGNAL(signalReloadFX()), fxDialog, TQT_SLOT(slotReload()) );
// Disable/enable FX-Setup depending on TTS-libs capability
- int status = m_kttslib->getStatus() & TTS::AUDIOFILE;
+ int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE;
if ( status ){
m_fxPage->setEnabled(true);
} else {
@@ -105,7 +105,7 @@ void VoiceSetupDlg::slotPageChanged(TQWidget *page)
if ( page != m_fxPage )
return;
- int status = m_kttslib->getStatus() & TTS::AUDIOFILE;
+ int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE;
if ( status ){
m_fxPage->setEnabled(true);
} else {
@@ -120,7 +120,7 @@ void VoiceSetupDlg::slotOk()
{
kdDebug(100200) << "+++ entering VoiceSetupDlg::slotOK()" << endl;
- int status = m_kttslib->getStatus();
+ int status = m_kttslib->gettqStatus();
if ( (status & TTS::AUDIOFILE) == 0 ){
emit signalRemoveAllFX();
}
diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h
index c9063e4..10cc42e 100644
--- a/ksayit/src/voicesetupdlg.h
+++ b/ksayit/src/voicesetupdlg.h
@@ -33,9 +33,10 @@ class KTTSDLib;
*/
class VoiceSetupDlg : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- VoiceSetupDlg(TQWidget *parent=0, const char *name=0, const TQString &caption=NULL,
+ VoiceSetupDlg(TQWidget *tqparent=0, const char *name=0, const TQString &caption=NULL,
bool modal=true,
KConfig *config=0,
FXPluginHandler *fxpluginhandler=0,