summaryrefslogtreecommitdiffstats
path: root/keduca
diff options
context:
space:
mode:
Diffstat (limited to 'keduca')
-rw-r--r--keduca/keduca/Makefile.am4
-rw-r--r--keduca/keduca/configdialogbase.ui20
-rw-r--r--keduca/keduca/kcheckeduca.cpp12
-rw-r--r--keduca/keduca/kcheckeduca.h3
-rw-r--r--keduca/keduca/keduca.cpp20
-rw-r--r--keduca/keduca/keduca.h3
-rw-r--r--keduca/keduca/keduca_part.cpp8
-rw-r--r--keduca/keduca/keduca_part.h3
-rw-r--r--keduca/keduca/keducaprefs.cpp18
-rw-r--r--keduca/keduca/keducaprefs.h3
-rw-r--r--keduca/keduca/keducaview.cpp60
-rw-r--r--keduca/keduca/keducaview.h7
-rw-r--r--keduca/keduca/kgroupeduca.cpp10
-rw-r--r--keduca/keduca/kgroupeduca.h3
-rw-r--r--keduca/keduca/kquestion.cpp12
-rw-r--r--keduca/keduca/kquestion.h5
-rw-r--r--keduca/keduca/kradioeduca.cpp12
-rw-r--r--keduca/keduca/kradioeduca.h3
-rw-r--r--keduca/keducabuilder/kcontroladdedit.cpp40
-rw-r--r--keduca/keducabuilder/kcontroladdedit.h5
-rw-r--r--keduca/keducabuilder/kcontroladdeditbase.ui162
-rw-r--r--keduca/keducabuilder/kcontrolheader.cpp70
-rw-r--r--keduca/keducabuilder/kcontrolheader.h3
-rw-r--r--keduca/keducabuilder/kcontrolheaderbase.ui82
-rw-r--r--keduca/keducabuilder/keducabuilder.cpp86
-rw-r--r--keduca/keducabuilder/keducabuilder.h3
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialog.cpp8
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialog.h3
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialogbase.ui36
-rw-r--r--keduca/keducabuilder/klangcombo.cpp12
-rw-r--r--keduca/keducabuilder/klangcombo.h7
-rw-r--r--keduca/keducabuilder/ktagcombobox.cpp26
-rw-r--r--keduca/keducabuilder/ktagcombobox.h15
-rw-r--r--keduca/libkeduca/fileread.cpp98
-rw-r--r--keduca/libkeduca/fileread.h9
-rw-r--r--keduca/libkeduca/kgallerydialog.cpp4
-rw-r--r--keduca/libkeduca/kgallerydialog.h3
-rw-r--r--keduca/libkeduca/kgallerydialogbase.ui72
38 files changed, 483 insertions, 467 deletions
diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am
index fb713daf..a1199e17 100644
--- a/keduca/keduca/Makefile.am
+++ b/keduca/keduca/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I../libkeduca $(all_includes)
# The binary program keduca
bin_PROGRAMS = keduca
keduca_LDFLAGS = $(all_libraries)
-keduca_LDADD = $(LIB_KFILE) $(LIB_KPARTS) ../libkeduca/libkeduca.la
+keduca_LDADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) ../libkeduca/libkeduca.la
keduca_SOURCES = main.cpp keduca.cpp
# Convenience library
@@ -17,7 +17,7 @@ keduca_SOURCES = main.cpp keduca.cpp
# The KParts Component
kde_module_LTLIBRARIES = libkeducapart.la
-libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
libkeducapart_la_LIBADD = ../libkeduca/libkeduca.la $(LIB_KPARTS)
libkeducapart_la_SOURCES = keduca_part.cpp kradioeduca.cpp kquestion.cpp \
kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \
diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui
index bb526841..18446407 100644
--- a/keduca/keduca/configdialogbase.ui
+++ b/keduca/keduca/configdialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ConfigDialogBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>kcfg_ResultFinish</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>testEnd</cstring>
</property>
@@ -38,7 +38,7 @@
<string>At the end of the test</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>afterEachQuestion</cstring>
</property>
@@ -48,7 +48,7 @@
</widget>
</vbox>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>orderingButtonGroup</cstring>
</property>
@@ -59,7 +59,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_RandomQuestions</cstring>
</property>
@@ -67,7 +67,7 @@
<string>Show questions in random order</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_RandomAnswers</cstring>
</property>
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>51</height>
@@ -96,5 +96,5 @@
</spacer>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index a75c8478..996bbe04 100644
--- a/keduca/keduca/kcheckeduca.cpp
+++ b/keduca/keduca/kcheckeduca.cpp
@@ -21,7 +21,7 @@
#include <tqstyle.h>
#include <kaccelmanager.h>
-KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name)
+KCheckEduca::KCheckEduca(TQWidget *tqparent, const char *name ) : TQCheckBox(tqparent,name)
{
_doc = 0;
KAcceleratorManager::setNoAccel( this );
@@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
int extra_width, indicator_width;
extra_width = 8;
- indicator_width = style().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
+ indicator_width = tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0);
y = 0;
x = indicator_width + extra_width; //###
@@ -61,14 +61,14 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
yo = (cr.height()-rh)/2;
if ( !isEnabled() ) {
- TQColorGroup cg = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
cg.setColor( TQColorGroup::Text, cg.light() );
_doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0);
}
- _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
+ _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0);
if ( hasFocus() ) {
-// TQRect br = style().itemRect( p, x, y, rw, rh+yo,
+// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
// AlignLeft|AlignVCenter|ShowPrefix,
// isEnabled(),
// pixmap(), text().visual() );
@@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
br.setBottom( br.bottom()+2);
br = br.intersect( TQRect(0,0,rw, rh+yo ) );
- style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup());
}
}
diff --git a/keduca/keduca/kcheckeduca.h b/keduca/keduca/kcheckeduca.h
index 32ff3b81..ba854242 100644
--- a/keduca/keduca/kcheckeduca.h
+++ b/keduca/keduca/kcheckeduca.h
@@ -28,9 +28,10 @@
class KCheckEduca : public TQCheckBox {
Q_OBJECT
+ TQ_OBJECT
public:
- KCheckEduca(TQWidget *parent=0, const char *name=0);
+ KCheckEduca(TQWidget *tqparent=0, const char *name=0);
~KCheckEduca();
protected:
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index 2ab99ea0..a09c1b3a 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
keduca.cpp - description
-------------------
- begin : mié may 23 20:36:15 CEST 2001
+ begin : mi� may 23 20:36:15 CEST 2001
copyright : (C) 2001 by Javier Campos
email : javi@asyris.org
***************************************************************************/
@@ -30,13 +30,13 @@
#include <tqlabel.h>
-Keduca::Keduca( TQWidget* parent, const char *name, WFlags f )
- : KParts::MainWindow( parent, name, f ), _part( 0 )
+Keduca::Keduca( TQWidget* tqparent, const char *name, WFlags f )
+ : KParts::MainWindow( tqparent, name, f ), _part( 0 )
{
setXMLFile( "keducaui.rc" );
_part = KParts::ComponentFactory::createPartInstanceFromLibrary< KParts::ReadOnlyPart >
- ( "libkeducapart", this, name, this, "KEducaPart" );
+ ( "libkeducapart", this, name, TQT_TQOBJECT(this), "KEducaPart" );
if ( _part )
{
@@ -53,7 +53,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f )
kdFatal() << "The library \"libkeducapart\" could not be found. Aborting." << endl;
}
if (!initialGeometrySet())
- resize( TQSize(550, 450).expandedTo(minimumSizeHint()));
+ resize( TQSize(550, 450).expandedTo(tqminimumSizeHint()));
}
Keduca::~Keduca()
@@ -63,17 +63,17 @@ Keduca::~Keduca()
void Keduca::setupActions()
{
- KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() );
- (void)new KAction( i18n( "Open &Gallery..." ), 0, 0, this, TQT_SLOT( slotGallery() ),
+ KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() );
+ (void)new KAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ),
actionCollection(), "open_gallery" );
- _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &) ),
+ _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ),
actionCollection());
- KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
}
void Keduca::slotFileOpen()
{
- KURL url = KFileDialog::getOpenURL( TQString::null, "application/x-edu", this, i18n("Open Educa File") );
+ KURL url = KFileDialog::getOpenURL( TQString(), "application/x-edu", this, i18n("Open Educa File") );
if( !url.isEmpty() )
slotFileOpenURL( url );
}
diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h
index a997d36e..ad2d8f58 100644
--- a/keduca/keduca/keduca.h
+++ b/keduca/keduca/keduca.h
@@ -34,10 +34,11 @@
class Keduca : public KParts::MainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
/** construtor */
- Keduca(TQWidget* parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
+ Keduca(TQWidget* tqparent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
/** destructor */
~Keduca();
/** Open gallery window */
diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp
index bc9e5485..6b0e17aa 100644
--- a/keduca/keduca/keduca_part.cpp
+++ b/keduca/keduca/keduca_part.cpp
@@ -34,14 +34,14 @@
typedef KParts::GenericFactory<KEducaPart> KEducaPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory )
-KEducaPart::KEducaPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name,
+KEducaPart::KEducaPart( TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name,
const TQStringList &/*args*/ )
- : KParts::ReadOnlyPart( parent, name )
+ : KParts::ReadOnlyPart( tqparent, name )
{
setInstance( KEducaPartFactory::instance() );
- m_view = new KEducaView( parentWidget, widgetName );
+ m_view = new KEducaView( tqparentWidget, widgetName );
m_view->show();
setWidget( m_view );
diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h
index 418209a8..d19d597c 100644
--- a/keduca/keduca/keduca_part.h
+++ b/keduca/keduca/keduca_part.h
@@ -36,11 +36,12 @@ class KAboutData;
class KEducaPart : public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
/*
* Constructor.
*/
- KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+ KEducaPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList &args );
/*
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index bdd07677..1546e9ce 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -27,7 +27,7 @@
#include <tqbuttongroup.h>
-KEducaPrefs::KEducaPrefs(TQWidget *parent, const char *name, bool modal ) : KDialogBase(IconList, i18n("Configure"), Ok|Cancel, Ok, parent, name, modal, true)
+KEducaPrefs::KEducaPrefs(TQWidget *tqparent, const char *name, bool modal ) : KDialogBase(IconList, i18n("Configure"), Ok|Cancel, Ok, tqparent, name, modal, true)
{
setPageGeneral();
configRead();
@@ -45,10 +45,10 @@ void KEducaPrefs::setPageGeneral()
TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" );
buttonGroup1->setTitle( i18n( "General" ) );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
- buttonGroup1->layout()->setSpacing( 0 );
- buttonGroup1->layout()->setMargin( 0 );
- TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() );
- buttonGroup1Layout->setAlignment( Qt::AlignTop );
+ buttonGroup1->tqlayout()->setSpacing( 0 );
+ buttonGroup1->tqlayout()->setMargin( 0 );
+ TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
+ buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
buttonGroup1Layout->setSpacing( 6 );
buttonGroup1Layout->setMargin( 11 );
@@ -63,10 +63,10 @@ void KEducaPrefs::setPageGeneral()
TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" );
GroupBox1->setTitle( i18n( "Order" ) );
GroupBox1->setColumnLayout(0, Qt::Vertical );
- GroupBox1->layout()->setSpacing( 0 );
- GroupBox1->layout()->setMargin( 0 );
- TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
- GroupBox1Layout->setAlignment( Qt::AlignTop );
+ GroupBox1->tqlayout()->setSpacing( 0 );
+ GroupBox1->tqlayout()->setMargin( 0 );
+ TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
+ GroupBox1Layout->tqsetAlignment( TQt::AlignTop );
GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 );
diff --git a/keduca/keduca/keducaprefs.h b/keduca/keduca/keducaprefs.h
index 39efb2e2..5693489d 100644
--- a/keduca/keduca/keducaprefs.h
+++ b/keduca/keduca/keducaprefs.h
@@ -29,9 +29,10 @@
class KEducaPrefs : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- KEducaPrefs(TQWidget *parent=0, const char *name=0, bool modal=true);
+ KEducaPrefs(TQWidget *tqparent=0, const char *name=0, bool modal=true);
~KEducaPrefs();
private:
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index 5c07c9c3..6207760f 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -37,8 +37,8 @@
#include <tqlabel.h>
#include <tqtextedit.h>
-KEducaView::KEducaView( TQWidget *parent, const char *name )
- : TQWidgetStack( parent, name ), _keducaFile( 0 ), _timeoutTimer( 0 )
+KEducaView::KEducaView( TQWidget *tqparent, const char *name )
+ : TQWidgetStack( tqparent, name ), _keducaFile( 0 ), _timeoutTimer( 0 )
{
init();
}
@@ -59,8 +59,8 @@ void KEducaView::init()
{
// Intro Screen
_introWidget = new TQLabel( this, "introScreen" );
- _introWidget->setBackgroundColor( Qt::white );
- _introWidget->setAlignment( AlignCenter );
+ _introWidget->setBackgroundColor( TQt::white );
+ _introWidget->tqsetAlignment( AlignCenter );
_introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) );
addWidget( _introWidget, 0 );
@@ -74,7 +74,7 @@ void KEducaView::init()
// Question Widget
_questionWidget = new TQVBox( this, "questionWidget" );
- _split = new TQSplitter( TQSplitter::Vertical, _questionWidget );
+ _split = new TQSplitter( Qt::Vertical, _questionWidget );
_questionText = new KQuestion( _split, "kquestion" );
_buttonGroup = new KGroupEduca( _split, "ButtonGroup" );
_buttonGroup->setRadioButtonExclusive( true );
@@ -121,7 +121,7 @@ void KEducaView::slotButtonNext()
_questionText->countdown(0);
}
- if( ( visibleWidget() == _questionWidget ) && !_isInitStatus )
+ if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus )
setResults();
_buttonGroup->clearAnswers();
@@ -147,7 +147,7 @@ void KEducaView::slotButtonNext()
/** Button Save action */
void KEducaView::slotButtonSave()
{
- KFileDialog *dialog=new KFileDialog(TQString::null, TQString::null, this, "file dialog", true);
+ KFileDialog *dialog=new KFileDialog(TQString(), TQString(), this, "file dialog", true);
dialog->setCaption( i18n("Save Results As") );
dialog->setKeepLocation( true );
dialog->setOperationMode( KFileDialog::Saving );
@@ -209,16 +209,16 @@ void KEducaView::showRecord()
// SHOW QUESTION *******************************************************************
_questionText->setPixmap( _keducaFile->getPicturePixmap() );
questionTextTemp = "<table width=100%><tr><td><b>"
- + i18n("Question %1").arg(_keducaFileIndex) + "</b>";
+ + i18n("Question %1").tqarg(_keducaFileIndex) + "</b>";
if( _keducaFile->getTotalPoints() > 0 )
questionTextTemp += "</td><td align=center bgColor=#336699><font color=#ffffff><b>"
- + _keducaFile->getQuestion( FileRead::QF_POINTS )
+ + _keducaFile->getQuestion( FileRead::TQF_POINTS )
+ " " + i18n("Points")
+ "</b></font>";
questionTextTemp += "</tr></td></table><hr/><table><tr><td>"
- + _keducaFile->getQuestion( FileRead::QF_TEXT )
+ + _keducaFile->getQuestion( FileRead::TQF_TEXT )
+ "</td></tr></table>";
_questionText->setText( questionTextTemp );
@@ -261,15 +261,15 @@ void KEducaView::showRecord()
// START THE TIMER *****************************************************************
- if( _keducaFile->getQuestionInt(FileRead::QF_TIME) > 0 )
+ if( _keducaFile->getQuestionInt(FileRead::TQF_TIME) > 0 )
{
KMessageBox::information( this,
i18n( "You have %1 seconds to complete this question.\n\n"
"Press OK when you are ready." )
- .arg( _keducaFile->getQuestion(FileRead::QF_TIME) ) );
+ .tqarg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) );
}
- int timeout = _keducaFile->getQuestionInt(FileRead::QF_TIME);
+ int timeout = _keducaFile->getQuestionInt(FileRead::TQF_TIME);
if (timeout > 0)
{
if (!_timeoutTimer)
@@ -290,7 +290,7 @@ void KEducaView::showRecord()
void KEducaView::questionTimedOut()
{
- _currentTime += _keducaFile->getQuestionInt(FileRead::QF_TIME);
+ _currentTime += _keducaFile->getQuestionInt(FileRead::TQF_TIME);
slotButtonNext();
}
@@ -353,13 +353,13 @@ void KEducaView::setResults()
{
_correctAnswer++;
if( _keducaFile->getTotalPoints() > 0 )
- _correctPoints += _keducaFile->getQuestionInt(FileRead::QF_POINTS);
+ _correctPoints += _keducaFile->getQuestionInt(FileRead::TQF_POINTS);
}
else
{
_incorrectAnswer++;
if( _keducaFile->getTotalPoints() > 0 )
- _incorrectPoints += _keducaFile->getQuestionInt(FileRead::QF_POINTS);
+ _incorrectPoints += _keducaFile->getQuestionInt(FileRead::TQF_POINTS);
}
_results += getTableQuestion( isCorrect, correctAnswer, yourAnswer );
@@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url)
if ( !_keducaFile->openFile( url ) )
return false;
- _isInitStatus = true;
+ _isInittqStatus = true;
_results = "<HTML>";
_correctAnswer = 0;
_correctPoints = 0;
@@ -436,12 +436,12 @@ void KEducaView::configWrite()
Settings::writeConfig();
}
-/** current Status Points */
+/** current tqStatus Points */
TQString KEducaView::currentStatusPoints()
{
- TQString tempStatus;
+ TQString temptqStatus;
- tempStatus = insertTable()
+ temptqStatus = insertTable()
+ insertRow( i18n("Statistics"), true, 4)
+ insertRow( i18n("Correct questions"),
TQString().setNum( _correctAnswer ),
@@ -449,20 +449,20 @@ TQString KEducaView::currentStatusPoints()
TQString().setNum( _incorrectAnswer ), true);
if( _keducaFile->getTotalPoints() > 0 )
- tempStatus += insertRow( i18n("Total points"), true, 4 )
+ temptqStatus += insertRow( i18n("Total points"), true, 4 )
+ insertRow( i18n("Correct points"),
TQString().setNum( _correctPoints ),
i18n("Incorrect points"),
TQString().setNum( _incorrectPoints ), true );
if( _keducaFile->getTotalTime() > 0 )
- tempStatus += insertRow( i18n("Time"), true, 4 )
+ temptqStatus += insertRow( i18n("Time"), true, 4 )
+ insertRow( i18n("Total time"),
TQString().setNum( _keducaFile->getTotalTime() ),
i18n("Time in tests"),
TQString().setNum( _currentTime ), true );
- tempStatus += insertTableClose();
- return tempStatus;
+ temptqStatus += insertTableClose();
+ return temptqStatus;
}
/** Set HTML table view with correct and incorrect answers */
@@ -476,10 +476,10 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct,
_currentResults += "></TD><TD VALIGN=TOP>";
- _currentResults += "<B><FONT COLOR=#336699>" + _keducaFile->getQuestion( FileRead::QF_TEXT ) + "</FONT></B>";
+ _currentResults += "<B><FONT COLOR=#336699>" + _keducaFile->getQuestion( FileRead::TQF_TEXT ) + "</FONT></B>";
- if( _keducaFile->getQuestionInt(FileRead::QF_POINTS) > 0 )
- _currentResults += "<SMALL> ( " + _keducaFile->getQuestion(FileRead::QF_POINTS) + " " + i18n("Points") + " )</SMALL>";
+ if( _keducaFile->getQuestionInt(FileRead::TQF_POINTS) > 0 )
+ _currentResults += "<SMALL> ( " + _keducaFile->getQuestion(FileRead::TQF_POINTS) + " " + i18n("Points") + " )</SMALL>";
_currentResults += "<HR><SMALL>";
@@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct,
/** Define the next questions (random, secuencial) */
bool KEducaView::questionNext()
{
- if( !Settings::randomQuestions() && !_isInitStatus )
+ if( !Settings::randomQuestions() && !_isInittqStatus )
{
_keducaFile->recordNext();
return _keducaFile->recordEOF() ? false : true;
}
- if( _isInitStatus )
+ if( _isInittqStatus )
{
- _isInitStatus = false;
+ _isInittqStatus = false;
if( !Settings::randomQuestions() ) return true;
}
diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h
index aa04df5e..0e70edd3 100644
--- a/keduca/keduca/keducaview.h
+++ b/keduca/keduca/keducaview.h
@@ -40,12 +40,13 @@ class KGroupEduca;
*@author Javier Campos
*/
-class KEducaView : public QWidgetStack
+class KEducaView : public TQWidgetStack
{
Q_OBJECT
+ TQ_OBJECT
public:
- KEducaView(TQWidget *parent=0, const char *name=0);
+ KEducaView(TQWidget *tqparent=0, const char *name=0);
~KEducaView();
/** Open url */
bool openURL( const KURL &url);
@@ -114,7 +115,7 @@ private:
/** Current results */
TQString _currentResults;
/** If is init window */
- bool _isInitStatus;
+ bool _isInittqStatus;
TQTimer *_timeoutTimer;
/** Num of correct answers */
int _correctAnswer;
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index 9f7a2413..958134e2 100644
--- a/keduca/keduca/kgroupeduca.cpp
+++ b/keduca/keduca/kgroupeduca.cpp
@@ -22,7 +22,7 @@
#include <klocale.h>
-KGroupEduca::KGroupEduca(TQWidget *parent, const char *name ) : TQVButtonGroup(i18n("Answers"), parent, name)
+KGroupEduca::KGroupEduca(TQWidget *tqparent, const char *name ) : TQVButtonGroup(i18n("Answers"), tqparent, name)
{
_sv = new TQScrollView(this);
_sv->setVScrollBarMode(TQScrollView::Auto);
@@ -54,7 +54,7 @@ void KGroupEduca::insertAnswer( const TQString& text)
answer = new KCheckEduca( _vbox2 );
break;
}
- answer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) );
+ answer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) );
answer->setText( text );
answer->show();
insert(answer);
@@ -73,7 +73,7 @@ void KGroupEduca::clearAnswers()
for( unsigned int i=0 ; i<maxButton ; ++i )
{
TQButton *tmpButton;
- if( (tmpButton = find(i)) )
+ if( (tmpButton = tqfind(i)) )
remove(tmpButton);
delete tmpButton;
}
@@ -87,13 +87,13 @@ bool KGroupEduca::isChecked(int id)
{
case Radio:
{
- KRadioEduca *tmpRadioButton = (KRadioEduca*) find(id);
+ KRadioEduca *tmpRadioButton = (KRadioEduca*) tqfind(id);
if(tmpRadioButton != 0) return tmpRadioButton->isChecked();
}
break;
case Check:
{
- KCheckEduca *tmpCheckButton = (KCheckEduca*) find(id);
+ KCheckEduca *tmpCheckButton = (KCheckEduca*) tqfind(id);
if(tmpCheckButton != 0) return tmpCheckButton->isChecked();
}
break;
diff --git a/keduca/keduca/kgroupeduca.h b/keduca/keduca/kgroupeduca.h
index 532bb890..c7e574ca 100644
--- a/keduca/keduca/kgroupeduca.h
+++ b/keduca/keduca/kgroupeduca.h
@@ -27,11 +27,12 @@
*/
class KGroupEduca : public TQVButtonGroup {
Q_OBJECT
+ TQ_OBJECT
public:
enum ButtonType { Radio, Check };
- KGroupEduca(TQWidget *parent=0, const char *name=0);
+ KGroupEduca(TQWidget *tqparent=0, const char *name=0);
~KGroupEduca();
/** Insert a check or radio button */
void insertAnswer( const TQString& text);
diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp
index 69a90fdd..d3473275 100644
--- a/keduca/keduca/kquestion.cpp
+++ b/keduca/keduca/kquestion.cpp
@@ -27,8 +27,8 @@
#include <kprogress.h>
#include <klocale.h>
-KQuestion::KQuestion( TQWidget *parent, const char *name )
- : TQHBox( parent, name ), _countdownTimer( 0 )
+KQuestion::KQuestion( TQWidget *tqparent, const char *name )
+ : TQHBox( tqparent, name ), _countdownTimer( 0 )
{
initGUI();
}
@@ -42,16 +42,16 @@ void KQuestion::initGUI()
{
setFrameShape( TQFrame::Box );
setFrameShadow( TQFrame::Plain );
- setPalette( TQPalette( Qt::white ) );
+ setPalette( TQPalette( TQt::white ) );
TQVBox *picBox = new TQVBox( this );
_picture = new TQLabel( picBox, "PixmapLabel1" );
_picture->setScaledContents( FALSE );
- _picture->setPalette( TQPalette( Qt::white ) );
+ _picture->setPalette( TQPalette( TQt::white ) );
_countdownWidget = new KProgress( picBox );
- _countdownWidget->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred,
+ _countdownWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred,
TQSizePolicy::Preferred ) );
_countdownWidget->setFormat( i18n( "%v seconds left" ) );
@@ -60,7 +60,7 @@ void KQuestion::initGUI()
_view->setFrameShape( TQTextEdit::NoFrame );
_view->setHScrollBarMode( TQTextEdit::AlwaysOff );
_view->setTextFormat( TQTextEdit::RichText );
- _view->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
+ _view->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
}
/** Set text */
diff --git a/keduca/keduca/kquestion.h b/keduca/keduca/kquestion.h
index 0f349580..b3368e5c 100644
--- a/keduca/keduca/kquestion.h
+++ b/keduca/keduca/kquestion.h
@@ -30,12 +30,13 @@ class KProgress;
* The Widget that is used to display the Question.
*@author Javier Campos Morales
*/
-class KQuestion : public QHBox
+class KQuestion : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- KQuestion(TQWidget *parent=0, const char *name=0);
+ KQuestion(TQWidget *tqparent=0, const char *name=0);
~KQuestion();
/** Set pixmap */
void setPixmap( const TQPixmap pixmap);
diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp
index 89b3e830..80c9cf89 100644
--- a/keduca/keduca/kradioeduca.cpp
+++ b/keduca/keduca/kradioeduca.cpp
@@ -20,7 +20,7 @@
#include <tqstyle.h>
#include <kaccelmanager.h>
-KRadioEduca::KRadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
+KRadioEduca::KRadioEduca(TQWidget *tqparent, const char *name) : TQRadioButton(tqparent,name)
{
_doc=0;
KAcceleratorManager::setNoAccel(this);
@@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
int x, y, w, h;
int extra_width, indicator_width;
extra_width = 8;
- indicator_width = style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
+ indicator_width = tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
y = 0;
x = indicator_width + extra_width; //###
@@ -60,14 +60,14 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
yo = (cr.height()-rh)/2;
if (!isEnabled() ) {
- TQColorGroup cg = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
cg.setColor( TQColorGroup::Text, cg.light() );
_doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0);
}
- _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
+ _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0);
if ( hasFocus() ) {
-// TQRect br = style().itemRect( p, x, y, rw, rh+yo,
+// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
// AlignLeft|AlignVCenter|ShowPrefix,
// isEnabled(),
// pixmap(), text().visual() );
@@ -78,6 +78,6 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
br.setTop( br.top()-2 );
br.setBottom( br.bottom()+2);
br = br.intersect( TQRect(0,0,rw, rh+yo ) );
- style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup());
}
}
diff --git a/keduca/keduca/kradioeduca.h b/keduca/keduca/kradioeduca.h
index f23c74a1..cf1a0b56 100644
--- a/keduca/keduca/kradioeduca.h
+++ b/keduca/keduca/kradioeduca.h
@@ -27,9 +27,10 @@
*/
class KRadioEduca : public TQRadioButton {
Q_OBJECT
+ TQ_OBJECT
public:
- KRadioEduca(TQWidget *parent=0, const char *name=0);
+ KRadioEduca(TQWidget *tqparent=0, const char *name=0);
~KRadioEduca();
protected:
diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index f8b60562..c6182e8d 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -27,12 +27,12 @@
#include <klistview.h>
//#include <.h>
-// Qt includes
+// TQt includes
#include <tqlabel.h>
#include <tqtextedit.h>
-KControlAddEdit::KControlAddEdit(TQWidget *parent, const char *name, bool modal, WFlags f)
- : KControlAddEditBase(parent, name, modal, f),
+KControlAddEdit::KControlAddEdit(TQWidget *tqparent, const char *name, bool modal, WFlags f)
+ : KControlAddEditBase(tqparent, name, modal, f),
_currentAnswerItem(0)
{
configRead();
@@ -72,19 +72,19 @@ void KControlAddEdit::init(FileRead *keducaFile, bool edit)
/** Fill page of current record */
void KControlAddEdit::fillPage()
{
- _questionText->setText( _keducaFile->getQuestion( FileRead::QF_TEXT ) );
- if( !_keducaFile->getQuestion( FileRead::QF_PICTURE ).isEmpty() )
+ _questionText->setText( _keducaFile->getQuestion( FileRead::TQF_TEXT ) );
+ if( !_keducaFile->getQuestion( FileRead::TQF_PICTURE ).isEmpty() )
{
- _questionPreview->setPixmap(_keducaFile->getQuestion(FileRead::QF_PICTURE));
- _answerPreview->setPixmap(_keducaFile->getQuestion(FileRead::QF_PICTURE));
- _questionPicture->setURL( _keducaFile->getQuestion( FileRead::QF_PICTURE ) );
+ _questionPreview->setPixmap(_keducaFile->getQuestion(FileRead::TQF_PICTURE));
+ _answerPreview->setPixmap(_keducaFile->getQuestion(FileRead::TQF_PICTURE));
+ _questionPicture->setURL( _keducaFile->getQuestion( FileRead::TQF_PICTURE ) );
}
- _questionType->setCurrentItem( _keducaFile->getQuestionInt( FileRead::QF_TYPE )-1 );
+ _questionType->setCurrentItem( _keducaFile->getQuestionInt( FileRead::TQF_TYPE )-1 );
slotQuestionTypeChanged( _questionType->currentItem() );
- _questionPoint->setValue( _keducaFile->getQuestionInt( FileRead::QF_POINTS ) );
- _questionTip->setText( _keducaFile->getQuestion( FileRead::QF_TIP ) );
- _questionExplain->setText( _keducaFile->getQuestion( FileRead::QF_EXPLAIN ) );
- _questionTime->setValue( _keducaFile->getQuestionInt( FileRead::QF_TIME ) );
+ _questionPoint->setValue( _keducaFile->getQuestionInt( FileRead::TQF_POINTS ) );
+ _questionTip->setText( _keducaFile->getQuestion( FileRead::TQF_TIP ) );
+ _questionExplain->setText( _keducaFile->getQuestion( FileRead::TQF_EXPLAIN ) );
+ _questionTime->setValue( _keducaFile->getQuestionInt( FileRead::TQF_TIME ) );
_listAnswers->clear();
_keducaFile->recordAnswerFirst();
@@ -204,13 +204,13 @@ void KControlAddEdit::accept()
/** Add question with form data */
void KControlAddEdit::addQuestion()
{
- _keducaFile->setQuestion( FileRead::QF_TEXT, _questionText->text() );
- _keducaFile->setQuestion( FileRead::QF_TYPE, _questionType->currentItem()+1 );
- _keducaFile->setQuestion( FileRead::QF_PICTURE, _questionPicture->url() );
- _keducaFile->setQuestion( FileRead::QF_POINTS, _questionPoint->value() );
- _keducaFile->setQuestion( FileRead::QF_TIME, _questionTime->value() );
- _keducaFile->setQuestion( FileRead::QF_TIP, _questionTip->text() );
- _keducaFile->setQuestion( FileRead::QF_EXPLAIN, _questionExplain->text() );
+ _keducaFile->setQuestion( FileRead::TQF_TEXT, _questionText->text() );
+ _keducaFile->setQuestion( FileRead::TQF_TYPE, _questionType->currentItem()+1 );
+ _keducaFile->setQuestion( FileRead::TQF_PICTURE, _questionPicture->url() );
+ _keducaFile->setQuestion( FileRead::TQF_POINTS, _questionPoint->value() );
+ _keducaFile->setQuestion( FileRead::TQF_TIME, _questionTime->value() );
+ _keducaFile->setQuestion( FileRead::TQF_TIP, _questionTip->text() );
+ _keducaFile->setQuestion( FileRead::TQF_EXPLAIN, _questionExplain->text() );
_keducaFile->clearAnswers();
TQListViewItem *item = _listAnswers->firstChild();
diff --git a/keduca/keducabuilder/kcontroladdedit.h b/keduca/keducabuilder/kcontroladdedit.h
index cb93329e..fb867c23 100644
--- a/keduca/keducabuilder/kcontroladdedit.h
+++ b/keduca/keducabuilder/kcontroladdedit.h
@@ -21,7 +21,7 @@
#include "../libkeduca/fileread.h"
#include "kcontroladdeditbase.h"
-// Qt forward declarations
+// TQt forward declarations
class TQListViewItem;
/**Add or edit questions
@@ -35,9 +35,10 @@ class TQListViewItem;
class KControlAddEdit : public KControlAddEditBase {
Q_OBJECT
+ TQ_OBJECT
public:
- KControlAddEdit(TQWidget *parent = 0, const char *name = 0, bool modal = true, WFlags f = 0);
+ KControlAddEdit(TQWidget *tqparent = 0, const char *name = 0, bool modal = true, WFlags f = 0);
~KControlAddEdit();
/** Init keducaFile pointer and EditMode */
void init(FileRead *keducaFile, bool editMode);
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index 0292edf2..af9df10a 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KControlAddEditBase</class>
-<widget class="QWizard">
+<widget class="TQWizard">
<property name="name">
<cstring>KControlAddEditBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -12,7 +12,7 @@
<height>480</height>
</rect>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>_pageQuestion</cstring>
</property>
@@ -26,17 +26,17 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame3</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -55,17 +55,17 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>_questionPreview</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>100</width>
<height>100</height>
@@ -101,14 +101,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -139,7 +139,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame5</cstring>
</property>
@@ -153,42 +153,42 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
<property name="text">
<string>&amp;Question:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_questionText</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
<property name="text">
<string>&amp;Type:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_questionType</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
<property name="text">
<string>&amp;Picture:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -220,80 +220,80 @@
<cstring>_questionType</cstring>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
<property name="text">
<string>P&amp;oint:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_questionPoint</cstring>
</property>
</widget>
- <widget class="QLabel" row="4" column="0">
+ <widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>textLabel6</cstring>
</property>
<property name="text">
<string>Ti&amp;me:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_questionTime</cstring>
</property>
</widget>
- <widget class="QLabel" row="5" column="0">
+ <widget class="TQLabel" row="5" column="0">
<property name="name">
<cstring>textLabel7</cstring>
</property>
<property name="text">
<string>T&amp;ip:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_questionTip</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="5" column="1">
+ <widget class="TQLineEdit" row="5" column="1">
<property name="name">
<cstring>_questionTip</cstring>
</property>
</widget>
- <widget class="QLabel" row="6" column="0">
+ <widget class="TQLabel" row="6" column="0">
<property name="name">
<cstring>textLabel8</cstring>
</property>
<property name="text">
<string>&amp;Explain:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_questionExplain</cstring>
</property>
</widget>
- <widget class="QTextEdit" row="0" column="1">
+ <widget class="TQTextEdit" row="0" column="1">
<property name="name">
<cstring>_questionText</cstring>
</property>
</widget>
- <widget class="QTextEdit" row="6" column="1">
+ <widget class="TQTextEdit" row="6" column="1">
<property name="name">
<cstring>_questionExplain</cstring>
</property>
</widget>
- <widget class="QLayoutWidget" row="4" column="1">
+ <widget class="TQLayoutWidget" row="4" column="1">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -323,9 +323,9 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="3" column="1">
+ <widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>20</height>
@@ -359,7 +359,7 @@
</widget>
</hbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>_pageAnswer</cstring>
</property>
@@ -373,17 +373,17 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame3_2</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -402,17 +402,17 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>_answerPreview</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>100</width>
<height>100</height>
@@ -448,14 +448,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2_2</cstring>
</property>
@@ -477,7 +477,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -486,7 +486,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame6</cstring>
</property>
@@ -500,17 +500,17 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="2" column="1">
+ <widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -531,7 +531,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -540,48 +540,48 @@
</spacer>
</hbox>
</widget>
- <widget class="QTextEdit" row="0" column="1">
+ <widget class="TQTextEdit" row="0" column="1">
<property name="name">
<cstring>_answerText</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="text">
<string>&amp;Answer:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_answerText</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2_3</cstring>
</property>
<property name="text">
<string>&amp;Value:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>_answerValue</cstring>
</property>
</widget>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<item>
<property name="text">
<string>False</string>
@@ -598,14 +598,14 @@
</widget>
</hbox>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel3_2</cstring>
</property>
<property name="text">
<string>&amp;Points:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -628,9 +628,9 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>tqlayout17</cstring>
</property>
<hbox>
<property name="name">
@@ -677,15 +677,15 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>tqlayout16</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>_buttonInsert</cstring>
</property>
@@ -696,7 +696,7 @@
<string>&amp;Add</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>_buttonRemove</cstring>
</property>
@@ -717,14 +717,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>_buttonUp</cstring>
</property>
@@ -735,7 +735,7 @@
<string>Move &amp;Up</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>_buttonDown</cstring>
</property>
@@ -756,7 +756,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -786,9 +786,9 @@
</connection>
<connection>
<sender>_questionPicture</sender>
- <signal>urlSelected(const QString&amp;)</signal>
+ <signal>urlSelected(const TQString&amp;)</signal>
<receiver>KControlAddEditBase</receiver>
- <slot>slotPreviewImage(const QString&amp;)</slot>
+ <slot>slotPreviewImage(const TQString&amp;)</slot>
</connection>
<connection>
<sender>_questionType</sender>
@@ -822,9 +822,9 @@
</connection>
<connection>
<sender>_listAnswers</sender>
- <signal>selectionChanged(QListViewItem*)</signal>
+ <signal>selectionChanged(TQListViewItem*)</signal>
<receiver>KControlAddEditBase</receiver>
- <slot>slotAnswerSelected(QListViewItem*)</slot>
+ <slot>slotAnswerSelected(TQListViewItem*)</slot>
</connection>
<connection>
<sender>_answerText</sender>
@@ -850,17 +850,17 @@
<tabstop>_questionTip</tabstop>
<tabstop>_questionExplain</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot access="private" specifier="pure virtual">slotAddAnswer()</slot>
<slot access="private" specifier="pure virtual">slotRemoveAnswer()</slot>
<slot access="private" specifier="pure virtual">slotMoveUpAnswer()</slot>
<slot access="private" specifier="pure virtual">slotMoveDownAnswer()</slot>
- <slot access="private" specifier="pure virtual">slotPreviewImage(const QString &amp;)</slot>
+ <slot access="private" specifier="pure virtual">slotPreviewImage(const TQString &amp;)</slot>
<slot access="private" specifier="pure virtual">slotQuestionTypeChanged(int index)</slot>
<slot access="private" specifier="pure virtual">slotDataChanged()</slot>
- <slot access="private" specifier="pure virtual">slotAnswerSelected(QListViewItem *)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+ <slot access="private" specifier="pure virtual">slotAnswerSelected(TQListViewItem *)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index e46bfdc4..4c1081a2 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -27,7 +27,7 @@
#include <tqlayout.h>
#include <tqlabel.h>
-KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *parent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, parent, name, true, true)
+KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *tqparent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, tqparent, name, true, true)
{
_keducaFile = keducaFile;
init();
@@ -82,10 +82,10 @@ void KControlHeader::init()
TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" );
GroupBox7->setTitle( i18n( "Description" ) );
GroupBox7->setColumnLayout(0, Qt::Vertical );
- GroupBox7->layout()->setSpacing( 0 );
- GroupBox7->layout()->setMargin( 0 );
- TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() );
- GroupBox7Layout->setAlignment( Qt::AlignTop );
+ GroupBox7->tqlayout()->setSpacing( 0 );
+ GroupBox7->tqlayout()->setMargin( 0 );
+ TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() );
+ GroupBox7Layout->tqsetAlignment( TQt::AlignTop );
GroupBox7Layout->setSpacing( 6 );
GroupBox7Layout->setMargin( 11 );
@@ -95,7 +95,7 @@ void KControlHeader::init()
TQLabel *TextLabel10 = new TQLabel( GroupBox7, "TextLabel10" );
TextLabel10->setText( i18n( "Type:" ));
- TextLabel10->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel10->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel10, 2, 0 );
@@ -108,7 +108,7 @@ void KControlHeader::init()
TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" );
TextLabel11->setText( i18n( "Level:" ));
- TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel11->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout12->addWidget( TextLabel11 );
_headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" );
@@ -117,7 +117,7 @@ void KControlHeader::init()
TQLabel *TextLabel12 = new TQLabel( GroupBox7, "TextLabel12" );
TextLabel12->setText( i18n( "Language:" ));
- TextLabel12->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel12->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel12, 3, 0 );
_headerLang = new KLanguageCombo( GroupBox7, "_headerLang" );
@@ -126,7 +126,7 @@ void KControlHeader::init()
TQLabel *TextLabel9 = new TQLabel( GroupBox7, "TextLabel9" );
TextLabel9->setText( i18n( "Category:" ));
- TextLabel9->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel9->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel9, 1, 0 );
@@ -138,7 +138,7 @@ void KControlHeader::init()
TQLabel *TextLabel8 = new TQLabel( GroupBox7, "TextLabel8" );
TextLabel8->setText( i18n( "Title:" ));
- TextLabel8->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel8->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel8, 0, 0 );
GroupBox7Layout->addLayout( Layout13 );
@@ -147,10 +147,10 @@ void KControlHeader::init()
TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" );
GroupBox8->setTitle( i18n( "Picture" ) );
GroupBox8->setColumnLayout(0, Qt::Vertical );
- GroupBox8->layout()->setSpacing( 0 );
- GroupBox8->layout()->setMargin( 0 );
- TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() );
- GroupBox8Layout->setAlignment( Qt::AlignTop );
+ GroupBox8->tqlayout()->setSpacing( 0 );
+ GroupBox8->tqlayout()->setMargin( 0 );
+ TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() );
+ GroupBox8Layout->tqsetAlignment( TQt::AlignTop );
GroupBox8Layout->setSpacing( 6 );
GroupBox8Layout->setMargin( 11 );
@@ -165,10 +165,10 @@ void KControlHeader::init()
TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" );
GroupBox6->setTitle( i18n( "Author" ) );
GroupBox6->setColumnLayout(0, Qt::Vertical );
- GroupBox6->layout()->setSpacing( 0 );
- GroupBox6->layout()->setMargin( 0 );
- TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() );
- GroupBox6Layout->setAlignment( Qt::AlignTop );
+ GroupBox6->tqlayout()->setSpacing( 0 );
+ GroupBox6->tqlayout()->setMargin( 0 );
+ TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() );
+ GroupBox6Layout->tqsetAlignment( TQt::AlignTop );
GroupBox6Layout->setSpacing( 6 );
GroupBox6Layout->setMargin( 11 );
@@ -182,19 +182,19 @@ void KControlHeader::init()
TQLabel *TextLabel7 = new TQLabel( GroupBox6, "TextLabel7" );
TextLabel7->setText( i18n( "Web page:" ));
- TextLabel7->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel7->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel7, 2, 0 );
TQLabel *TextLabel6 = new TQLabel( GroupBox6, "TextLabel6" );
TextLabel6->setText( i18n( "Email:" ));
- TextLabel6->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel6->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel6, 1, 0 );
TQLabel *TextLabel5 = new TQLabel( GroupBox6, "TextLabel5" );
TextLabel5->setText( i18n( "Name:" ));
- TextLabel5->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel5->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel5, 0, 0 );
@@ -246,12 +246,12 @@ void KControlHeader::insertHeader()
/** Load country list */
void KControlHeader::loadCountryList(KLanguageCombo *combo)
{
- TQString sub = TQString::fromLatin1("l10n/");
+ TQString sub = TQString::tqfromLatin1("l10n/");
// clear the list
combo->clear();
- TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
+ TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
regionlist.sort();
for ( TQStringList::ConstIterator it = regionlist.begin();
@@ -261,35 +261,35 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo)
TQString tag = *it;
int index;
- index = tag.findRev('/');
+ index = tag.tqfindRev('/');
if (index != -1) tag = tag.mid(index + 1);
- index = tag.findRev('.');
+ index = tag.tqfindRev('.');
if (index != -1) tag.truncate(index);
KSimpleConfig entry(*it);
- entry.setGroup(TQString::fromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::fromLatin1("Name"));
+ entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
combo->insertSubmenu( name, '-' + tag, sub );
}
// add all languages to the list
- TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
+ TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop"));
countrylist.sort();
for ( TQStringList::ConstIterator it = countrylist.begin();
it != countrylist.end(); ++it )
{
KSimpleConfig entry(*it);
- entry.setGroup(TQString::fromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::fromLatin1("Name"));
- TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region"));
+ entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
+ TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region"));
TQString tag = *it;
- int index = tag.findRev('/');
+ int index = tag.tqfindRev('/');
tag.truncate(index);
- index = tag.findRev('/');
+ index = tag.tqfindRev('/');
tag = tag.mid(index+1);
combo->insertLanguage(tag, name, sub, submenu);
}
@@ -312,12 +312,12 @@ void KControlHeader::configRead()
config->setGroup("UserInfo");
if( _keducaFile->getHeader( "name" ).isEmpty() )
- _headerName->setText(config->readEntry("FullName", TQString::null ));
+ _headerName->setText(config->readEntry("FullName", TQString() ));
else
_headerName->setText( _keducaFile->getHeader("name") );
if( _keducaFile->getHeader( "email" ).isEmpty() )
- _headerEmail->setText(config->readEntry("EmailAddress", TQString::null ));
+ _headerEmail->setText(config->readEntry("EmailAddress", TQString() ));
else
_headerEmail->setText( _keducaFile->getHeader("email") );
diff --git a/keduca/keducabuilder/kcontrolheader.h b/keduca/keducabuilder/kcontrolheader.h
index ff1e64ff..8370758d 100644
--- a/keduca/keducabuilder/kcontrolheader.h
+++ b/keduca/keducabuilder/kcontrolheader.h
@@ -33,9 +33,10 @@
class KControlHeader : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- KControlHeader(FileRead *keducaFile, TQWidget *parent=0, const char *name=0);
+ KControlHeader(FileRead *keducaFile, TQWidget *tqparent=0, const char *name=0);
~KControlHeader();
private:
diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui
index 04f2411b..86fedce7 100644
--- a/keduca/keducabuilder/kcontrolheaderbase.ui
+++ b/keduca/keducabuilder/kcontrolheaderbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>MyDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>MyDialog</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -19,17 +19,17 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame3</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>50</height>
@@ -55,17 +55,17 @@
<property name="margin">
<number>2</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame4</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -84,7 +84,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -104,14 +104,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>60</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel6</cstring>
</property>
@@ -121,7 +121,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -132,47 +132,47 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel11</cstring>
</property>
<property name="text">
<string>Title:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel9</cstring>
</property>
<property name="text">
<string>Language:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel10</cstring>
</property>
<property name="text">
<string>Category:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel7</cstring>
</property>
<property name="text">
<string>Type:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -186,9 +186,9 @@
<cstring>_headerTitle</cstring>
</property>
</widget>
- <widget class="QLayoutWidget" row="2" column="1">
+ <widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -209,21 +209,21 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel8</cstring>
</property>
<property name="text">
<string>Level:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -244,7 +244,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -255,14 +255,14 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
<property name="text">
<string>Default picture:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignJustify|AlignVCenter</set>
</property>
</widget>
@@ -273,7 +273,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@@ -284,14 +284,14 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
<property name="text">
<string>Name:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -310,25 +310,25 @@
<cstring>_headerEmail</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
<property name="text">
<string>Web page:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
<property name="text">
<string>Email:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>40</height>
@@ -365,7 +365,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -389,14 +389,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -410,7 +410,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -459,7 +459,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index fa7da986..93dbb334 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -60,8 +60,8 @@ static const char* const keducabuilder_data[] = {
".#############.",
"..............."};
-KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f )
- : KMainWindow(parent,name,f),
+KEducaBuilder::KEducaBuilder(TQWidget* tqparent, const char *name, WFlags f )
+ : KMainWindow(tqparent,name,f),
_nativeFormat("application/x-edu")
{
_keducaFile = new FileRead();
@@ -88,12 +88,12 @@ void KEducaBuilder::init()
form2Layout->setMargin( 0 );
_split = new TQSplitter( mainView );
- _split->setOrientation( TQSplitter::Vertical );
+ _split->setOrientation( Qt::Vertical );
_listAnswer = new KListBox( _split, "_listAnswer" );
- _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
- connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), this, TQT_SLOT( slotPreview(TQListBoxItem *) ) );
- connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
+ _listAnswer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
+ connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) );
+ connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
_preview = new TQTextView( _split, "_preview" );
_preview->setFrameShape( TQTextView::NoFrame );
@@ -103,7 +103,7 @@ void KEducaBuilder::init()
setCentralWidget( mainView );
if (!initialGeometrySet())
- resize( TQSize(500, 400).expandedTo(minimumSizeHint()));
+ resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()));
setupGUI( ToolBar | Keys | StatusBar | Create, "keducabuilderui.rc" );
setAutoSaveSettings();
}
@@ -111,21 +111,21 @@ void KEducaBuilder::init()
/** Init menu bar settings */
void KEducaBuilder::initMenuBar()
{
- KStdAction::openNew(this, TQT_SLOT( slotFileOpenNew() ), actionCollection());
- KStdAction::open (this, TQT_SLOT( slotFileOpen() ), actionCollection());
- (void)new KAction(i18n("Open &Gallery..."), 0, 0, this, TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
- _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection());
- KStdAction::save (this, TQT_SLOT( slotFileSave() ), actionCollection());
- KStdAction::saveAs (this, TQT_SLOT( slotFileSaveAs() ), actionCollection());
- KStdAction::print (this, TQT_SLOT( slotFilePrint() ), actionCollection());
- (void)new KAction(i18n("Document Info"), "info", 0, this, TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
- KStdAction::quit(this, TQT_SLOT( close() ), actionCollection());
-
- (void)new KAction(i18n("&Add..."), "addquestion", 0, this, TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
- (void)new KAction(i18n("&Edit..."), "editquestion", 0, this, TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
- (void)new KAction(i18n("&Remove"), "delquestion", 0, this, TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
- (void)new KAction(i18n("&Up"), "up", 0, this, TQT_SLOT( slotUp() ), actionCollection(), "question_up");
- (void)new KAction(i18n("&Down"), "down", 0, this, TQT_SLOT( slotDown() ), actionCollection(), "question_down");
+ KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection());
+ KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection());
+ (void)new KAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
+ _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection());
+ KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection());
+ KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection());
+ KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection());
+ (void)new KAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
+
+ (void)new KAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
+ (void)new KAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
+ (void)new KAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
+ (void)new KAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up");
+ (void)new KAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down");
}
/** Delete current document and start new */
@@ -148,7 +148,7 @@ void KEducaBuilder::slotFileOpenNew()
/** Open new document. */
void KEducaBuilder::slotFileOpen()
{
- KURL url = KFileDialog::getOpenURL( TQString::null, _nativeFormat, this, i18n("Open Educa File") );
+ KURL url = KFileDialog::getOpenURL( TQString(), _nativeFormat, this, i18n("Open Educa File") );
if( !url.isEmpty() )
slotFileOpenURL( url );
@@ -171,7 +171,7 @@ void KEducaBuilder::slotFileOpenURL( const KURL &url )
_keducaFile->recordFirst();
while( !_keducaFile->recordEOF() )
{
- _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::QF_TEXT ) );
+ _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::TQF_TEXT ) );
_keducaFile->recordNext();
}
}
@@ -199,7 +199,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item )
tmpListanswer += "<TR>";
tmpListanswer += "<TD WIDTH=3% BGCOLOR=";
_keducaFile->getAnswerValue() ? tmpListanswer += "#006b6b>" : tmpListanswer += "#b84747>";
- if( _keducaFile->getQuestionInt( FileRead::QF_TYPE ) == 3 )
+ if( _keducaFile->getQuestionInt( FileRead::TQF_TYPE ) == 3 )
{
tmpListanswer += "<FONT COLOR=#ffffff><b>"
+ _keducaFile->getAnswer( FileRead::AF_POINT )
@@ -214,40 +214,40 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item )
};
tmpListanswer += "</TABLE>";
- if( !_keducaFile->getQuestion( FileRead::QF_PICTURE ).isEmpty() )
+ if( !_keducaFile->getQuestion( FileRead::TQF_PICTURE ).isEmpty() )
{
tmpListanswer += "<table><tr><td><img src=";
tmpListanswer += _keducaFile->getPicture();
tmpListanswer += "></td>";
tmpListanswer += "<td align=right><b>" + i18n("Question Image") + "</b><hr>";
- tmpListanswer += _keducaFile->getQuestion( FileRead::QF_PICTURE ) + "</td></tr></table>";
+ tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_PICTURE ) + "</td></tr></table>";
};
- if( _keducaFile->getQuestionInt( FileRead::QF_POINTS ) > 0 )
+ if( _keducaFile->getQuestionInt( FileRead::TQF_POINTS ) > 0 )
{
tmpListanswer += "<p><b>" + i18n("Question point") + ":</b> ";
- tmpListanswer += _keducaFile->getQuestion( FileRead::QF_POINTS );
+ tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_POINTS );
}
- if( _keducaFile->getQuestionInt( FileRead::QF_TIME ) > 0 )
+ if( _keducaFile->getQuestionInt( FileRead::TQF_TIME ) > 0 )
{
tmpListanswer += "<p><b>"+i18n("Time")+":</b> ";
- tmpListanswer += _keducaFile->getQuestion( FileRead::QF_TIME );
+ tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_TIME );
tmpListanswer += i18n(" seconds</p>");
}
- if( !_keducaFile->getQuestion( FileRead::QF_TIP ).isEmpty() )
+ if( !_keducaFile->getQuestion( FileRead::TQF_TIP ).isEmpty() )
{
tmpListanswer += "<p><b>" + i18n("Tip") +":</b> ";
- tmpListanswer += _keducaFile->getQuestion( FileRead::QF_TIP );
+ tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_TIP );
tmpListanswer += "</p>";
}
- if( !_keducaFile->getQuestion( FileRead::QF_EXPLAIN ).isEmpty() )
+ if( !_keducaFile->getQuestion( FileRead::TQF_EXPLAIN ).isEmpty() )
{
tmpListanswer += "<p><b>"
+ i18n("Explain") + ":</b>"
- + _keducaFile->getQuestion( FileRead::QF_EXPLAIN )
+ + _keducaFile->getQuestion( FileRead::TQF_EXPLAIN )
+ "</p>";
}
@@ -284,7 +284,7 @@ bool KEducaBuilder::currentFileMayBeReplaced()
int res = KMessageBox::warningYesNoCancel( widget(),
// ask the user to save
i18n( "The document \"%1\" has been modified.\n"
- "Do you want to save it?" ).arg( _keducaFile->getCurrentURL().fileName() ),
+ "Do you want to save it?" ).tqarg( _keducaFile->getCurrentURL().fileName() ),
i18n( "Save Document?" ), KStdGuiItem::save(), KStdGuiItem::discard() );
switch (res)
{
@@ -324,7 +324,7 @@ void KEducaBuilder::slotAdd()
edit.init( _keducaFile, false );
if( !edit.exec() ) return;
- _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::QF_TEXT ) );
+ _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::TQF_TEXT ) );
_listAnswer->setCurrentItem( _listAnswer->count()-1 );
slotPreview( _listAnswer->item(_listAnswer->currentItem()) );
}
@@ -340,7 +340,7 @@ void KEducaBuilder::slotEdit()
edit.init( _keducaFile, true );
if( edit.exec() )
{
- _listAnswer->changeItem( image0, _keducaFile->getQuestion( FileRead::QF_TEXT ), _listAnswer->currentItem() );
+ _listAnswer->changeItem( image0, _keducaFile->getQuestion( FileRead::TQF_TEXT ), _listAnswer->currentItem() );
slotPreview( _listAnswer->item(_listAnswer->currentItem()) );
}
}
@@ -409,7 +409,7 @@ bool KEducaBuilder::fileSaveAs()
TQCheckBox *saveCompressedCheckBox = new TQCheckBox( i18n( "Compress the file" ), 0 );
saveCompressedCheckBox->setChecked( true );
- KFileDialog *dialog=new KFileDialog(TQString::null, TQString::null, this, "file dialog", true, saveCompressedCheckBox);
+ KFileDialog *dialog=new KFileDialog(TQString(), TQString(), this, "file dialog", true, saveCompressedCheckBox);
dialog->setCaption( i18n("Save Document As") );
dialog->setKeepLocation( true );
dialog->setOperationMode( KFileDialog::Saving );
@@ -485,7 +485,7 @@ void KEducaBuilder::slotFilePrint()
TQString file = _keducaFile->getCurrentURL().fileName();
if (file.isEmpty())
file = i18n("Test");
- if(printer->setup(this, i18n("Print %1").arg(file)))
+ if(printer->setup(this, i18n("Print %1").tqarg(file)))
{
TQPaintDeviceMetrics metrics(printer);
TQPainter p;
@@ -502,7 +502,7 @@ void KEducaBuilder::slotFilePrint()
while(!_keducaFile->recordEOF())
{
p.drawText( 10, yPos+margin, metrics.width(), fm.lineSpacing(),
- ExpandTabs | DontClip, _keducaFile->getQuestion(FileRead::QF_TEXT) );
+ ExpandTabs | DontClip, _keducaFile->getQuestion(FileRead::TQF_TEXT) );
yPos += fm.lineSpacing();
p.drawLine(10, yPos+margin, metrics.width(), yPos+margin);
@@ -533,7 +533,7 @@ bool KEducaBuilder::checkSave()
_keducaFile->getHeader("level").isEmpty() ||
_keducaFile->getHeader("language").isEmpty() )
{
- if (KMessageBox::warningContinueCancel(this, i18n("Unable to save file.\n\nYou must complete the Document Info\n(Only the description is necessary)"), TQString::null, i18n("Complete Document Info..."))
+ if (KMessageBox::warningContinueCancel(this, i18n("Unable to save file.\n\nYou must complete the Document Info\n(Only the description is necessary)"), TQString(), i18n("Complete Document Info..."))
== KMessageBox::Continue) {
if (slotHeader()!=KControlHeader::Accepted)
return false;
@@ -544,7 +544,7 @@ bool KEducaBuilder::checkSave()
if( _listAnswer->count() < 1 )
{
if (KMessageBox::warningContinueCancel(this, i18n("Unable to save file.\n\nYou must insert a question."),
- TQString::null, i18n("Insert Question"))==KMessageBox::Continue)
+ TQString(), i18n("Insert Question"))==KMessageBox::Continue)
slotAdd();
else
return false;
diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h
index c3a736a7..93d9cce1 100644
--- a/keduca/keducabuilder/keducabuilder.h
+++ b/keduca/keducabuilder/keducabuilder.h
@@ -36,9 +36,10 @@
class KEducaBuilder : public KMainWindow {
Q_OBJECT
+ TQ_OBJECT
public:
- KEducaBuilder(TQWidget* parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
+ KEducaBuilder(TQWidget* tqparent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
~KEducaBuilder();
/** start a dialog that asks the user what he wants to do to start*/
bool startChooser();
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 8528b6ba..a8fd5aaa 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -29,8 +29,8 @@
/**
*/
-KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const char* name, bool modal, WFlags fl)
- :KEducaEditorStartDialogBase(parent, name, modal, fl),
+KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * tqparent, const char* name, bool modal, WFlags fl)
+ :KEducaEditorStartDialogBase(tqparent, name, modal, fl),
_choice(NewDoc),
_maxRecentDocumentItems(20)
{
@@ -62,8 +62,8 @@ void KEducaEditorStartDialog::buildRecentFilesList()
// read file list
for( unsigned int i = 1 ; i <= _maxRecentDocumentItems ; i++ )
{
- key = TQString( "File%1" ).arg( i );
- value = config->readEntry( key, TQString::null );
+ key = TQString( "File%1" ).tqarg( i );
+ value = config->readEntry( key, TQString() );
if (!value.isNull())
recentDocumentCB->insertURL( KURL(value) );
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.h b/keduca/keducabuilder/keducaeditorstartdialog.h
index dd163848..1823c3d7 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.h
+++ b/keduca/keducabuilder/keducaeditorstartdialog.h
@@ -31,11 +31,12 @@ class KEducaBuilder;
*/
class KEducaEditorStartDialog : public KEducaEditorStartDialogBase{
Q_OBJECT
+ TQ_OBJECT
public:
enum {Rejected=0, OpenDoc=1, OpenRecentDoc=2, Gallery=3, NewDoc=4}StartChoice;
/** Constructor.
*/
- KEducaEditorStartDialog(KEducaBuilder * parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ KEducaEditorStartDialog(KEducaBuilder * tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
/** Destructor.
*/
virtual ~KEducaEditorStartDialog();
diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
index 0cb69e39..65ad01f3 100644
--- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui
+++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KEducaEditorStartDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>KEducaEditorStartDialogBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -28,7 +28,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>startChoiceBtnGrp</cstring>
</property>
@@ -51,7 +51,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout13</cstring>
</property>
@@ -65,7 +65,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>openDocumentRB</cstring>
</property>
@@ -76,7 +76,7 @@
<string>Open an &amp;existing document:</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout4</cstring>
</property>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -116,7 +116,7 @@
</widget>
</vbox>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>openRecentDocumentRB</cstring>
</property>
@@ -130,7 +130,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout15</cstring>
</property>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -168,7 +168,7 @@
</widget>
</hbox>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton4</cstring>
</property>
@@ -176,7 +176,7 @@
<string>Open with Internet gallery browser</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>newDocumentRB</cstring>
</property>
@@ -203,7 +203,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -217,7 +217,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonHelp</cstring>
</property>
@@ -238,14 +238,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -259,7 +259,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -312,7 +312,7 @@
<tabstop>openDocumentRB</tabstop>
<tabstop>openRecentDocumentRB</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp
index 1d86c09e..0371b7af 100644
--- a/keduca/keducabuilder/klangcombo.cpp
+++ b/keduca/keducabuilder/klangcombo.cpp
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999-2000 Hans Petter Bieker <bieker@kde.org>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -31,21 +31,21 @@ KLanguageCombo::~KLanguageCombo ()
{
}
-KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
- : KTagComboBox(parent, name)
+KLanguageCombo::KLanguageCombo (TQWidget * tqparent, const char *name)
+ : KTagComboBox(tqparent, name)
{
}
void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu)
{
- TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
- TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
+ TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
+ TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
insertItem(TQIconSet(flag), output, path, submenu);
}
void KLanguageCombo::changeLanguage(const TQString& name, int i)
{
if (i < 0 || i >= count()) return;
- TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
+ TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
changeItem(output, i);
}
diff --git a/keduca/keducabuilder/klangcombo.h b/keduca/keducabuilder/klangcombo.h
index 2aca5753..0dc13d01 100644
--- a/keduca/keducabuilder/klangcombo.h
+++ b/keduca/keducabuilder/klangcombo.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999-2000 Hans Petter Bieker <bieker@kde.org>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -35,12 +35,13 @@
class KLanguageCombo : public KTagComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- KLanguageCombo(TQWidget *parent=0, const char *name=0);
+ KLanguageCombo(TQWidget *tqparent=0, const char *name=0);
~KLanguageCombo();
- void insertLanguage(const TQString& path, const TQString& name, const TQString& sub = TQString::null, const TQString &submenu = TQString::null);
+ void insertLanguage(const TQString& path, const TQString& name, const TQString& sub = TQString(), const TQString &submenu = TQString());
void changeLanguage(const TQString& name, int i);
};
diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp
index 5a84574c..f89f14df 100644
--- a/keduca/keducabuilder/ktagcombobox.cpp
+++ b/keduca/keducabuilder/ktagcombobox.cpp
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999-2000 Hans Petter Bieker <bieker@kde.org>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -36,8 +36,8 @@ KTagComboBox::~KTagComboBox ()
delete _tags;
}
-KTagComboBox::KTagComboBox (TQWidget * parent, const char *name)
- : TQComboBox(parent, name)
+KTagComboBox::KTagComboBox (TQWidget * tqparent, const char *name)
+ : TQComboBox(tqparent, name)
{
_popup = new TQPopupMenu(this);
_tags = new TQStringList;
@@ -84,7 +84,7 @@ void KTagComboBox::internalActivate( int index )
if (_current == index) return;
_current = index;
emit activated( index );
- repaint();
+ tqrepaint();
}
void KTagComboBox::internalHighlight( int index )
@@ -105,12 +105,12 @@ int KTagComboBox::count() const
static inline TQPopupMenu *checkInsertIndex(TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu, int *index)
{
- int pos = tags->findIndex(submenu);
+ int pos = tags->tqfindIndex(submenu);
TQPopupMenu *pi = 0;
if (pos != -1)
{
- TQMenuItem *p = popup->findItem(popup->idAt(pos));
+ TQMenuItem *p = popup->tqfindItem(popup->idAt(pos));
pi = p?p->popup():0;
}
if (!pi) pi = popup;
@@ -139,7 +139,7 @@ void KTagComboBox::insertSeparator(const TQString &submenu, int index)
{
TQPopupMenu *pi = checkInsertIndex(_popup, _tags, submenu, &index);
pi->insertSeparator(index);
- _tags->append(TQString::null);
+ _tags->append(TQString());
}
void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu, int index)
@@ -158,7 +158,7 @@ void KTagComboBox::changeItem( const TQString &text, int index )
{
_popup->changeItem( text, index);
if (index == _current)
- repaint();
+ tqrepaint();
}
void KTagComboBox::paintEvent( TQPaintEvent * ev)
@@ -170,7 +170,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
// Text
TQRect clip(2, 2, width() - 4, height() - 4);
if ( hasFocus())
- p.setPen( colorGroup().highlightedText() );
+ p.setPen( tqcolorGroup().highlightedText() );
p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current ));
// Icon
@@ -183,7 +183,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
bool KTagComboBox::containsTag( const TQString &str ) const
{
- return _tags->contains(str) > 0;
+ return _tags->tqcontains(str) > 0;
}
TQString KTagComboBox::currentTag() const
@@ -196,7 +196,7 @@ TQString KTagComboBox::tag(int i) const
if (i < 0 || i >= count())
{
kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl;
- return TQString::null;
+ return TQString();
}
return *_tags->at(i);
}
@@ -210,12 +210,12 @@ void KTagComboBox::setCurrentItem(int i)
{
if (i < 0 || i >= count()) return;
_current = i;
- repaint();
+ tqrepaint();
}
void KTagComboBox::setCurrentItem(const TQString &code)
{
- int i = _tags->findIndex(code);
+ int i = _tags->tqfindIndex(code);
if (code.isNull())
i = 0;
if (i != -1)
diff --git a/keduca/keducabuilder/ktagcombobox.h b/keduca/keducabuilder/ktagcombobox.h
index ffeb2cda..ef0042ec 100644
--- a/keduca/keducabuilder/ktagcombobox.h
+++ b/keduca/keducabuilder/ktagcombobox.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999-2000 Hans Petter Bieker <bieker@kde.org>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -36,18 +36,19 @@ class TQStringList;
*
* It has also support for sub menues.
*/
-class KTagComboBox : public QComboBox
+class KTagComboBox : public TQComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- KTagComboBox(TQWidget *parent=0, const char *name=0);
+ KTagComboBox(TQWidget *tqparent=0, const char *name=0);
~KTagComboBox();
- void insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 );
- void insertItem(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 );
- void insertSeparator(const TQString &submenu = TQString::null, int index=-1 );
- void insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1);
+ void insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu = TQString(), int index=-1 );
+ void insertItem(const TQString &text, const TQString &tag, const TQString &submenu = TQString(), int index=-1 );
+ void insertSeparator(const TQString &submenu = TQString(), int index=-1 );
+ void insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu = TQString(), int index=-1);
void changeItem( const TQString &text, int index );
int count() const;
diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp
index 7632b6fd..1fb03518 100644
--- a/keduca/libkeduca/fileread.cpp
+++ b/keduca/libkeduca/fileread.cpp
@@ -29,8 +29,8 @@
#include <tqpixmap.h>
#include <tqbuffer.h>
-FileRead::FileRead( TQObject *parent, const char *name )
- :TQObject(parent, name),
+FileRead::FileRead( TQObject *tqparent, const char *name )
+ :TQObject(tqparent, name),
_changed(false),
_tmpfile(0)
{
@@ -79,7 +79,7 @@ bool FileRead::loadFile(const TQString &filename)
}
else
{
- doc.setContent(qUncompress(file.readAll()));
+ doc.setContent(tqUncompress(file.readAll()));
}
TQDomElement docElem = doc.documentElement();
@@ -118,21 +118,21 @@ bool FileRead::loadFile(const TQString &filename)
insertQuestion();
// --------------------- QUESTION ATTRIBUTE------------------------
TQDomElement elementNODE = dnList.item(i).toElement();
- setQuestion( QF_TYPE, elementNODE.attribute( "type", "1" ).toInt() );
- setQuestion( QF_PICTURE, elementNODE.attribute( "image", "" ) );
- setQuestion( QF_TIME, elementNODE.attribute( "time", "0" ).toInt() );
- setQuestion( QF_POINTS, elementNODE.attribute( "points", "0" ).toInt() );
+ setQuestion( TQF_TYPE, elementNODE.attribute( "type", "1" ).toInt() );
+ setQuestion( TQF_PICTURE, elementNODE.attribute( "image", "" ) );
+ setQuestion( TQF_TIME, elementNODE.attribute( "time", "0" ).toInt() );
+ setQuestion( TQF_POINTS, elementNODE.attribute( "points", "0" ).toInt() );
TQDomNodeList quList = elementNODE.childNodes();
for( unsigned int x = 0; x < quList.count(); ++x)
{
// --------------------- QUESTION AND RESPONSES------------------
TQDomElement element = quList.item(x).toElement();
- if( element.tagName() == "text" ) setQuestion( QF_TEXT, element.text() );
+ if( element.tagName() == "text" ) setQuestion( TQF_TEXT, element.text() );
if( element.tagName() == "true" ) setAnswer( element.text(), true, element.attribute( "points", "0" ).toInt() );
if( element.tagName() == "false" ) setAnswer( element.text(), false,element.attribute( "points", "0" ).toInt() );
- if( element.tagName() == "tip" ) setQuestion( QF_TIP, element.text() );
- if( element.tagName() == "explain" ) setQuestion( QF_EXPLAIN, element.text() );
+ if( element.tagName() == "tip" ) setQuestion( TQF_TIP, element.text() );
+ if( element.tagName() == "explain" ) setQuestion( TQF_EXPLAIN, element.text() );
}
}
@@ -164,19 +164,19 @@ bool FileRead::loadFile(const TQString &filename)
void FileRead::setQuestion( QuestionField field, const TQString& text)
{
-// QF_text, QF_picture, QF_type, QF_time, QF_tip, QF_explain
+// TQF_text, TQF_picture, TQF_type, TQF_time, TQF_tip, TQF_explain
switch( field )
{
- case QF_TEXT:
+ case TQF_TEXT:
(*_recordQuestions).text = text;
break;
- case QF_PICTURE:
+ case TQF_PICTURE:
(*_recordQuestions).picture = text;
break;
- case QF_TIP:
+ case TQF_TIP:
(*_recordQuestions).tip = text;
break;
- case QF_EXPLAIN:
+ case TQF_EXPLAIN:
(*_recordQuestions).explain = text;
break;
default:
@@ -190,13 +190,13 @@ void FileRead::setQuestion( QuestionField field, int value )
{
switch( field )
{
- case QF_TYPE:
+ case TQF_TYPE:
(*_recordQuestions).type = value;
break;
- case QF_TIME:
+ case TQF_TIME:
(*_recordQuestions).time = value;
break;
- case QF_POINTS:
+ case TQF_POINTS:
(*_recordQuestions).points = value;
break;
default:
@@ -208,7 +208,7 @@ void FileRead::setQuestion( QuestionField field, int value )
void FileRead::setResult( ResultField field, const TQString& text)
{
-// RS_text, QF_picture
+// RS_text, TQF_picture
switch( field )
{
case RS_TEXT:
@@ -407,26 +407,26 @@ unsigned int FileRead::recordAnswerCount()
TQString FileRead::getQuestion( QuestionField field )
{
-// QF_text, QF_picture, QF_type, QF_time, QF_tip, QF_explain
+// TQF_text, TQF_picture, TQF_type, TQF_time, TQF_tip, TQF_explain
switch( field )
{
- case QF_TEXT:
+ case TQF_TEXT:
return (*_recordQuestions).text;
break;
- case QF_PICTURE:
+ case TQF_PICTURE:
// return getPictureLocal( (*_recordQuestions).picture );
return( (*_recordQuestions).picture );
break;
- case QF_POINTS:
+ case TQF_POINTS:
return TQString().setNum( (*_recordQuestions).points );
break;
- case QF_TIME:
+ case TQF_TIME:
return TQString().setNum( (*_recordQuestions).time );
break;
- case QF_TIP:
+ case TQF_TIP:
return (*_recordQuestions).tip;
break;
- case QF_EXPLAIN:
+ case TQF_EXPLAIN:
return (*_recordQuestions).explain;
break;
default:
@@ -440,13 +440,13 @@ int FileRead::getQuestionInt( QuestionField field )
{
switch( field )
{
- case QF_TYPE:
+ case TQF_TYPE:
return (*_recordQuestions).type;
break;
- case QF_TIME:
+ case TQF_TIME:
return (*_recordQuestions).time;
break;
- case QF_POINTS:
+ case TQF_POINTS:
return (*_recordQuestions).points;
break;
default:
@@ -559,8 +559,8 @@ TQString FileRead::getPicture()
{
TQString picture;
- if( !getQuestion(QF_PICTURE).isEmpty() )
- picture = getQuestion(QF_PICTURE);
+ if( !getQuestion(TQF_PICTURE).isEmpty() )
+ picture = getQuestion(TQF_PICTURE);
else if( !(_header["image"]).isEmpty() )
picture = _header["image"];
else
@@ -689,7 +689,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom
TQFile file(filename);
TQStringList copyJOB;
- stream.setDevice(&buffer);
+ stream.setDevice(TQT_TQIODEVICE(&buffer));
if ( (!file.open(IO_WriteOnly)) || (!buffer.open(IO_WriteOnly)) )
{
@@ -750,20 +750,20 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom
while ( !recordEOF() )
{
TQDomElement question = doc.createElement("question");
- if( !getQuestion( QF_PICTURE ).isEmpty() )
+ if( !getQuestion( TQF_PICTURE ).isEmpty() )
{
if( copyimages )
{
- copyJOB.append( getQuestion( QF_PICTURE ) );
- question.setAttribute("image", TQFileInfo( getQuestion( QF_PICTURE ) ).fileName() );
+ copyJOB.append( getQuestion( TQF_PICTURE ) );
+ question.setAttribute("image", TQFileInfo( getQuestion( TQF_PICTURE ) ).fileName() );
} else {
- question.setAttribute("image", getQuestion( QF_PICTURE ) );
+ question.setAttribute("image", getQuestion( TQF_PICTURE ) );
}
}
- question.setAttribute( "type", getQuestionInt( QF_TYPE ) );
- if( getQuestionInt( QF_POINTS ) > 0 ) question.setAttribute( "points", getQuestion( QF_POINTS ) );
- if( getQuestionInt( QF_TIME ) > 0 ) question.setAttribute( "time", getQuestion( QF_TIME ) );
- insertXML( doc, question, "text", getQuestion( QF_TEXT ) );
+ question.setAttribute( "type", getQuestionInt( TQF_TYPE ) );
+ if( getQuestionInt( TQF_POINTS ) > 0 ) question.setAttribute( "points", getQuestion( TQF_POINTS ) );
+ if( getQuestionInt( TQF_TIME ) > 0 ) question.setAttribute( "time", getQuestion( TQF_TIME ) );
+ insertXML( doc, question, "text", getQuestion( TQF_TEXT ) );
recordAnswerFirst();
while( !recordAnswerEOF() )
@@ -786,8 +786,8 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom
recordAnswerNext();
};
- if( !getQuestion( QF_TIP ).isEmpty() ) insertXML( doc, question, "tip", getQuestion( QF_TIP ) );
- if( !getQuestion( QF_EXPLAIN ).isEmpty() ) insertXML( doc, question, "explain", getQuestion( QF_EXPLAIN ) );
+ if( !getQuestion( TQF_TIP ).isEmpty() ) insertXML( doc, question, "tip", getQuestion( TQF_TIP ) );
+ if( !getQuestion( TQF_EXPLAIN ).isEmpty() ) insertXML( doc, question, "explain", getQuestion( TQF_EXPLAIN ) );
NodeData.appendChild( question );
recordNext();
@@ -796,7 +796,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom
doc.save( stream, 4);
buffer.close();
if ( saveCompressed )
- file.writeBlock(qCompress(data));
+ file.writeBlock(tqCompress(data));
else
file.writeBlock(data);
file.close();
@@ -862,7 +862,7 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results )
TQFile file(filename);
TQStringList copyJOB;
- stream.setDevice(&file);
+ stream.setDevice(TQT_TQIODEVICE(&file));
if(!file.open(IO_WriteOnly))
{
@@ -875,20 +875,20 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results )
}
/** Insert xml format data */
-void FileRead::insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &tagName, const TQString &data)
+void FileRead::insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &tagName, const TQString &data)
{
TQDomElement domELEMENT = doc.createElement( tagName );
TQDomText DATAelement = doc.createTextNode( data );
- parent.appendChild( domELEMENT );
+ tqparent.appendChild( domELEMENT );
domELEMENT.appendChild( DATAelement );
}
/** Insert xml data format */
-void FileRead::insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &data)
+void FileRead::insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &data)
{
TQDomText DATAelement = doc.createTextNode( data );
- parent.appendChild( DATAelement );
+ tqparent.appendChild( DATAelement );
}
/** Get Header */
@@ -905,7 +905,7 @@ void FileRead::setHeader( const TQString field, const TQString value)
if( (_header[field]).isEmpty() )
_header.insert( field, value );
else
- _header.replace( field, value );
+ _header.tqreplace( field, value );
}
/** is Multi Answer */
diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h
index cbc89449..9240f938 100644
--- a/keduca/libkeduca/fileread.h
+++ b/keduca/libkeduca/fileread.h
@@ -34,11 +34,12 @@ class TQFile;
class FileRead : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- FileRead( TQObject *parent=0, const char *name=0 );
+ FileRead( TQObject *tqparent=0, const char *name=0 );
virtual ~FileRead();
- enum QuestionField { QF_TEXT, QF_PICTURE, QF_POINTS, QF_TYPE, QF_TIME, QF_TIP, QF_EXPLAIN };
+ enum QuestionField { TQF_TEXT, TQF_PICTURE, TQF_POINTS, TQF_TYPE, TQF_TIME, TQF_TIP, TQF_EXPLAIN };
enum AnswerField { AF_TEXT, AF_VALUE, AF_POINT };
enum ResultField { RS_TEXT, RS_MIN, RS_MAX, RS_PICTURE };
@@ -218,9 +219,9 @@ private:
// Private methods
/** Insert xml format data */
- void insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &tagName, const TQString &data);
+ void insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &tagName, const TQString &data);
/** Insert xml data format */
- void insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &data);
+ void insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &data);
protected:
/** Open keduca file. This function does the actual work and expects a local filename . */
diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp
index b1ec43e2..c7d6e4c9 100644
--- a/keduca/libkeduca/kgallerydialog.cpp
+++ b/keduca/libkeduca/kgallerydialog.cpp
@@ -30,8 +30,8 @@
#include <tqdom.h>
#include <tqfileinfo.h>
-KGalleryDialog::KGalleryDialog(TQWidget *parent, const char *name )
- :KGalleryDialogBase(parent,name)
+KGalleryDialog::KGalleryDialog(TQWidget *tqparent, const char *name )
+ :KGalleryDialogBase(tqparent,name)
{
configRead();
}
diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h
index 41383091..419834d3 100644
--- a/keduca/libkeduca/kgallerydialog.h
+++ b/keduca/libkeduca/kgallerydialog.h
@@ -35,8 +35,9 @@ namespace KIO { class Job; }
class KGalleryDialog : public KGalleryDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- KGalleryDialog(TQWidget *parent=0, const char *name=0);
+ KGalleryDialog(TQWidget *tqparent=0, const char *name=0);
~KGalleryDialog();
/** Open keduca file. This function can open a remote or local url. */
bool openFile( const KURL &url );
diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui
index ccd51e46..3adb85ee 100644
--- a/keduca/libkeduca/kgallerydialogbase.ui
+++ b/keduca/libkeduca/kgallerydialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>KGalleryDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>KGalleryDialogBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -22,49 +22,49 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="text">
<string>Name:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>lineName</cstring>
</property>
</widget>
</vbox>
</widget>
- <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>textLabel2</cstring>
</property>
@@ -72,16 +72,16 @@
<string>Address:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>lineAddress</cstring>
</property>
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>tqlayout12</cstring>
</property>
<vbox>
<property name="name">
@@ -97,18 +97,18 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonAdd</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -136,7 +136,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QSplitter">
+ <widget class="TQSplitter">
<property name="name">
<cstring>_split</cstring>
</property>
@@ -151,7 +151,7 @@
<property name="orientation">
<enum>Horizontal</enum>
</property>
- <widget class="QListView">
+ <widget class="TQListView">
<column>
<property name="text">
<string>Servers</string>
@@ -184,7 +184,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QListView">
+ <widget class="TQListView">
<column>
<property name="text">
<string>Description</string>
@@ -262,19 +262,19 @@
</property>
</widget>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonHelp</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -294,18 +294,18 @@
<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>buttonOpen</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -318,11 +318,11 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -357,14 +357,14 @@
</connection>
<connection>
<sender>listServers</sender>
- <signal>selectionChanged(QListViewItem*)</signal>
+ <signal>selectionChanged(TQListViewItem*)</signal>
<receiver>KGalleryDialogBase</receiver>
- <slot>slotServerSelected(QListViewItem*)</slot>
+ <slot>slotServerSelected(TQListViewItem*)</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>slotButtonAdd()</slot>
- <slot>slotServerSelected(QListViewItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+ <slot>slotServerSelected(TQListViewItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>