diff options
Diffstat (limited to 'keduca')
34 files changed, 93 insertions, 93 deletions
diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am index efc38114..f7a44483 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_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../libkeduca/libkeduca.la +keduca_LDADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../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) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) +libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) libkeducapart_la_LIBADD = ../libkeduca/libkeduca.la $(LIB_TDEPARTS) libkeducapart_la_SOURCES = keduca_part.cpp tderadioeduca.cpp kquestion.cpp \ kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \ diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index 051a8c3e..6274de73 100644 --- a/keduca/keduca/kcheckeduca.cpp +++ b/keduca/keduca/kcheckeduca.cpp @@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keduca/kcheckeduca.h b/keduca/keduca/kcheckeduca.h index 7766113e..88f3a3ca 100644 --- a/keduca/keduca/kcheckeduca.h +++ b/keduca/keduca/kcheckeduca.h @@ -27,7 +27,7 @@ */ class KCheckEduca : public TQCheckBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index ed021225..d410abd9 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kdebug.h> @@ -36,7 +36,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f ) setXMLFile( "keducaui.rc" ); _part = KParts::ComponentFactory::createPartInstanceFromLibrary< KParts::ReadOnlyPart > - ( "libkeducapart", this, name, TQT_TQOBJECT(this), "KEducaPart" ); + ( "libkeducapart", this, name, this, "KEducaPart" ); if ( _part ) { @@ -63,12 +63,12 @@ Keduca::~Keduca() void Keduca::setupActions() { - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); - (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); + (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, this, TQ_SLOT( slotGallery() ), actionCollection(), "open_gallery" ); - _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ), + _recentFiles = KStdAction::openRecent(this, TQ_SLOT ( slotFileOpenURL(const KURL &) ), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT( quit() ), actionCollection()); } void Keduca::slotFileOpen() @@ -92,7 +92,7 @@ void Keduca::slotFileOpenURL( const KURL &url ) bool Keduca::queryClose() { configWrite(); - return( TRUE ); + return( true ); } void Keduca::configRead() diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h index 6687db4d..e296c201 100644 --- a/keduca/keduca/keduca.h +++ b/keduca/keduca/keduca.h @@ -33,7 +33,7 @@ This will execute the Test/Examen as defined by the KEduca Document. */ class Keduca : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 21bb99fb..333c02d5 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -71,7 +71,7 @@ bool KEducaPart::openFile() void KEducaPart::setupActions() { - KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection(), "configure" ); + KStdAction::preferences( this, TQ_SLOT( slotConfigure() ), actionCollection(), "configure" ); } void KEducaPart::slotConfigure() @@ -83,7 +83,7 @@ void KEducaPart::slotConfigure() ConfigDialogBase *confDlg = new ConfigDialogBase( 0, "ConfigDialogBase" ); dialog->addPage( confDlg, i18n("General"), "keduca" ); - connect( dialog, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( updateConfiguration() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( updateConfiguration() ) ); dialog->show(); } diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index e165f52e..549bb870 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -35,7 +35,7 @@ class TDEAboutData; */ class KEducaPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: /* diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index c8f3ce0d..425ccf80 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -44,7 +44,7 @@ void KEducaPrefs::setPageGeneral() TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" ); buttonGroup1->setTitle( i18n( "General" ) ); - buttonGroup1->setColumnLayout(0, Qt::Vertical ); + buttonGroup1->setColumnLayout(0, TQt::Vertical ); buttonGroup1->layout()->setSpacing( 0 ); buttonGroup1->layout()->setMargin( 0 ); TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); @@ -62,7 +62,7 @@ void KEducaPrefs::setPageGeneral() TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" ); GroupBox1->setTitle( i18n( "Order" ) ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); + GroupBox1->setColumnLayout(0, TQt::Vertical ); GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); diff --git a/keduca/keduca/keducaprefs.h b/keduca/keduca/keducaprefs.h index 5f545994..94feebff 100644 --- a/keduca/keduca/keducaprefs.h +++ b/keduca/keduca/keducaprefs.h @@ -28,7 +28,7 @@ */ class KEducaPrefs : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index a5e5c22b..3a3657c6 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -25,7 +25,7 @@ #include <stdlib.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdefiledialog.h> #include <kpushbutton.h> @@ -69,17 +69,17 @@ void KEducaView::init() _viewInfo = new TQTextEdit( _infoWidget ); _viewInfo->setReadOnly( true ); _buttonStartTest = new KPushButton( i18n( "&Start Test" ), _infoWidget ); - connect( _buttonStartTest, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonStartTest, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); addWidget( _infoWidget, 1 ); // Question Widget _questionWidget = new TQVBox( this, "questionWidget" ); - _split = new TQSplitter( Qt::Vertical, _questionWidget ); + _split = new TQSplitter( TQt::Vertical, _questionWidget ); _questionText = new KQuestion( _split, "kquestion" ); _buttonGroup = new KGroupEduca( _split, "ButtonGroup" ); _buttonGroup->setRadioButtonExclusive( true ); _buttonNext = new KPushButton( i18n( "&Next >>" ), _questionWidget, "ButtonNext" ); - connect( _buttonNext, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonNext, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); addWidget( _questionWidget, 2 ); // Results Widget @@ -87,14 +87,14 @@ void KEducaView::init() _viewResults = new TQTextEdit( _resultsWidget ); _viewResults->setReadOnly( true ); _buttonSave = new KPushButton( i18n( "&Save Results..." ), _resultsWidget ); - connect( _buttonSave, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonSave() ) ); + connect( _buttonSave, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonSave() ) ); /* FIXME: This is a hack * The results widget can be shown only in the end of the test (when you should be shown the * option to save the results) or at the middle of the test, after each question (when there should * be a "Next" button). */ _buttonResultsNext = new KPushButton( i18n( "&Next >>" ), _resultsWidget ); - connect( _buttonResultsNext, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonResultsNext, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); _buttonResultsNext->hide(); addWidget( _resultsWidget, 3 ); @@ -275,8 +275,8 @@ void KEducaView::showRecord() if (!_timeoutTimer) { _timeoutTimer = new TQTimer(this); - connect(_timeoutTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(questionTimedOut())); + connect(_timeoutTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(questionTimedOut())); } _timeoutTimer->start(1000*timeout); _questionText->countdown(timeout); diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h index fec720cd..9e31ff70 100644 --- a/keduca/keduca/keducaview.h +++ b/keduca/keduca/keducaview.h @@ -42,7 +42,7 @@ class KGroupEduca; class KEducaView : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/kgroupeduca.h b/keduca/keduca/kgroupeduca.h index 05ff761b..c90830ec 100644 --- a/keduca/keduca/kgroupeduca.h +++ b/keduca/keduca/kgroupeduca.h @@ -26,7 +26,7 @@ *@author Javier Campos Morales */ class KGroupEduca : public TQVButtonGroup { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index 46a8322f..aa5ff7f4 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -47,7 +47,7 @@ void KQuestion::initGUI() TQVBox *picBox = new TQVBox( this ); _picture = new TQLabel( picBox, "PixmapLabel1" ); - _picture->setScaledContents( FALSE ); + _picture->setScaledContents( false ); _picture->setPalette( TQPalette( TQt::white ) ); _countdownWidget = new KProgress( picBox ); @@ -84,8 +84,8 @@ void KQuestion::countdown(int starttime) if (!_countdownTimer) { _countdownTimer = new TQTimer(this); - connect(_countdownTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(countDownOne())); + connect(_countdownTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(countDownOne())); } _countdownTimer->start(1000); // make one step less than time passes by in seconds diff --git a/keduca/keduca/kquestion.h b/keduca/keduca/kquestion.h index 01ecfce7..d7f9e8bb 100644 --- a/keduca/keduca/kquestion.h +++ b/keduca/keduca/kquestion.h @@ -32,7 +32,7 @@ class KProgress; */ class KQuestion : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/tderadioeduca.cpp b/keduca/keduca/tderadioeduca.cpp index 4dde0d17..080b46d0 100644 --- a/keduca/keduca/tderadioeduca.cpp +++ b/keduca/keduca/tderadioeduca.cpp @@ -78,6 +78,6 @@ void TDERadioEduca::drawButtonLabel( TQPainter *p) br.setTop( br.top()-2 ); br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keduca/tderadioeduca.h b/keduca/keduca/tderadioeduca.h index 27af9c13..73049b36 100644 --- a/keduca/keduca/tderadioeduca.h +++ b/keduca/keduca/tderadioeduca.h @@ -26,7 +26,7 @@ *@author Javier Campos Morales */ class TDERadioEduca : public TQRadioButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am index b3978ca9..60002c00 100644 --- a/keduca/keducabuilder/Makefile.am +++ b/keduca/keducabuilder/Makefile.am @@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes) METASOURCES = AUTO # the library search path. -keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE´s XML GUI builing diff --git a/keduca/keducabuilder/kcontroladdedit.h b/keduca/keducabuilder/kcontroladdedit.h index 21e1fc94..acf5c884 100644 --- a/keduca/keducabuilder/kcontroladdedit.h +++ b/keduca/keducabuilder/kcontroladdedit.h @@ -34,7 +34,7 @@ class TQListViewItem; */ class KControlAddEdit : public KControlAddEditBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index 18c65770..33778d22 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -850,7 +850,7 @@ <tabstop>_questionTip</tabstop> <tabstop>_questionExplain</tabstop> </tabstops> -<Q_SLOTS> +<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> @@ -859,7 +859,7 @@ <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(TQListViewItem *)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <forwards> <forward>class TQListViewItem;</forward> diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 197a552f..5d74b399 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -19,8 +19,8 @@ #include "kcontrolheader.moc" #include <tdelocale.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <klineedit.h> #include <kcombobox.h> @@ -81,7 +81,7 @@ void KControlHeader::init() TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" ); GroupBox7->setTitle( i18n( "Description" ) ); - GroupBox7->setColumnLayout(0, Qt::Vertical ); + GroupBox7->setColumnLayout(0, TQt::Vertical ); GroupBox7->layout()->setSpacing( 0 ); GroupBox7->layout()->setMargin( 0 ); TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() ); @@ -103,7 +103,7 @@ void KControlHeader::init() Layout12->setSpacing( 6 ); Layout12->setMargin( 0 ); - _headerType = new KComboBox( FALSE, GroupBox7, "_headerType" ); + _headerType = new KComboBox( false, GroupBox7, "_headerType" ); Layout12->addWidget( _headerType ); TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" ); @@ -111,7 +111,7 @@ void KControlHeader::init() TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout12->addWidget( TextLabel11 ); - _headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" ); + _headerLevel = new KComboBox( false, GroupBox7, "_headerLevel" ); Layout12->addWidget( _headerLevel ); Layout13->addLayout( Layout12, 2, 1 ); @@ -146,7 +146,7 @@ void KControlHeader::init() TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" ); GroupBox8->setTitle( i18n( "Picture" ) ); - GroupBox8->setColumnLayout(0, Qt::Vertical ); + GroupBox8->setColumnLayout(0, TQt::Vertical ); GroupBox8->layout()->setSpacing( 0 ); GroupBox8->layout()->setMargin( 0 ); TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() ); @@ -164,7 +164,7 @@ void KControlHeader::init() TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" ); GroupBox6->setTitle( i18n( "Author" ) ); - GroupBox6->setColumnLayout(0, Qt::Vertical ); + GroupBox6->setColumnLayout(0, TQt::Vertical ); GroupBox6->layout()->setSpacing( 0 ); GroupBox6->layout()->setMargin( 0 ); TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() ); @@ -267,7 +267,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) index = tag.findRev('.'); if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name")); @@ -281,7 +281,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name")); TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region")); diff --git a/keduca/keducabuilder/kcontrolheader.h b/keduca/keducabuilder/kcontrolheader.h index b4bf1489..2e060bcc 100644 --- a/keduca/keducabuilder/kcontrolheader.h +++ b/keduca/keducabuilder/kcontrolheader.h @@ -32,7 +32,7 @@ */ class KControlHeader : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index cfccc923..d7d1edf4 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -88,12 +88,12 @@ void KEducaBuilder::init() form2Layout->setMargin( 0 ); _split = new TQSplitter( mainView ); - _split->setOrientation( Qt::Vertical ); + _split->setOrientation( TQt::Vertical ); _listAnswer = new TDEListBox( _split, "_listAnswer" ); _listAnswer->setSizePolicy( 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 *) ) ); + connect( _listAnswer, TQ_SIGNAL( highlighted(TQListBoxItem *) ), this, TQ_SLOT( slotPreview(TQListBoxItem *) ) ); + connect( _listAnswer, TQ_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQ_SLOT( slotEditbyList(TQListBoxItem *) ) ); _preview = new TQTextView( _split, "_preview" ); _preview->setFrameShape( TQTextView::NoFrame ); @@ -111,21 +111,21 @@ void KEducaBuilder::init() /** Init menu bar settings */ void KEducaBuilder::initMenuBar() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection()); - KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection()); - (void)new TDEAction(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 TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); - - (void)new TDEAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); - (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); - (void)new TDEAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); - (void)new TDEAction(i18n("&Up"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up"); - (void)new TDEAction(i18n("&Down"), "go-down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down"); + KStdAction::openNew(this, TQ_SLOT( slotFileOpenNew() ), actionCollection()); + KStdAction::open (this, TQ_SLOT( slotFileOpen() ), actionCollection()); + (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, this, TQ_SLOT( slotGallery() ), actionCollection(), "open_gallery"); + _recentFiles = KStdAction::openRecent(this, TQ_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); + KStdAction::save (this, TQ_SLOT( slotFileSave() ), actionCollection()); + KStdAction::saveAs (this, TQ_SLOT( slotFileSaveAs() ), actionCollection()); + KStdAction::print (this, TQ_SLOT( slotFilePrint() ), actionCollection()); + (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, this, TQ_SLOT( slotHeader() ), actionCollection(), "info_doc"); + KStdAction::quit(this, TQ_SLOT( close() ), actionCollection()); + + (void)new TDEAction(i18n("&Add..."), "addquestion", 0, this, TQ_SLOT( slotAdd() ), actionCollection(), "question_add"); + (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, this, TQ_SLOT( slotEdit() ), actionCollection(), "question_edit"); + (void)new TDEAction(i18n("&Remove"), "delquestion", 0, this, TQ_SLOT( slotRemove() ), actionCollection(), "question_remove"); + (void)new TDEAction(i18n("&Up"), "go-up", 0, this, TQ_SLOT( slotUp() ), actionCollection(), "question_up"); + (void)new TDEAction(i18n("&Down"), "go-down", 0, this, TQ_SLOT( slotDown() ), actionCollection(), "question_down"); } /** Delete current document and start new */ @@ -312,7 +312,7 @@ bool KEducaBuilder::queryClose () return false; } configWrite(); - return( TRUE ); + return( true ); } /** Add question */ diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h index 11841ab8..3957ff4c 100644 --- a/keduca/keducabuilder/keducabuilder.h +++ b/keduca/keducabuilder/keducabuilder.h @@ -35,7 +35,7 @@ */ class KEducaBuilder : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index b75d4f40..a9fc0b2a 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -42,8 +42,8 @@ KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const c // setup connections urlRequester->setFilter( "application/x-edu"); - connect( startChoiceBtnGrp, TQT_SIGNAL( clicked(int) ), - this, TQT_SLOT( slotChoiceChanged(int) ) ); + connect( startChoiceBtnGrp, TQ_SIGNAL( clicked(int) ), + this, TQ_SLOT( slotChoiceChanged(int) ) ); } /** based on code in tdeaction.cpp diff --git a/keduca/keducabuilder/keducaeditorstartdialog.h b/keduca/keducabuilder/keducaeditorstartdialog.h index e655d8b2..cce39e44 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.h +++ b/keduca/keducabuilder/keducaeditorstartdialog.h @@ -30,13 +30,13 @@ 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 * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /** Destructor. */ virtual ~KEducaEditorStartDialog(); diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp index 05a36669..3626a3cc 100644 --- a/keduca/keducabuilder/klangcombo.cpp +++ b/keduca/keducabuilder/klangcombo.cpp @@ -22,7 +22,7 @@ */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "klangcombo.h" #include "klangcombo.moc" diff --git a/keduca/keducabuilder/klangcombo.h b/keduca/keducabuilder/klangcombo.h index fdb10006..49d98bce 100644 --- a/keduca/keducabuilder/klangcombo.h +++ b/keduca/keducabuilder/klangcombo.h @@ -34,7 +34,7 @@ */ class KLanguageCombo : public KTagComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp index 081d4254..905c7698 100644 --- a/keduca/keducabuilder/ktagcombobox.cpp +++ b/keduca/keducabuilder/ktagcombobox.cpp @@ -41,10 +41,10 @@ KTagComboBox::KTagComboBox (TQWidget * parent, const char *name) { _popup = new TQPopupMenu(this); _tags = new TQStringList; - connect( _popup, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( _popup, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( _popup, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( _popup, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::popupMenu() @@ -148,10 +148,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons TQPopupMenu *p = new TQPopupMenu(pi); pi->insertItem(text, p, count(), index); _tags->append(tag); - connect( p, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( p, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::changeItem( const TQString &text, int index ) diff --git a/keduca/keducabuilder/ktagcombobox.h b/keduca/keducabuilder/ktagcombobox.h index 7ef0045e..923cd659 100644 --- a/keduca/keducabuilder/ktagcombobox.h +++ b/keduca/keducabuilder/ktagcombobox.h @@ -38,7 +38,7 @@ class TQStringList; */ class KTagComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am index 1e1cf9c6..b7eeb7eb 100644 --- a/keduca/libkeduca/Makefile.am +++ b/keduca/libkeduca/Makefile.am @@ -2,7 +2,7 @@ INCLUDES=$(all_includes) noinst_LTLIBRARIES = libkeduca.la libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp -libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkeduca_la_LIBADD = -ltdeprint noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 8ba07b50..0a174790 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -20,7 +20,7 @@ #include <assert.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmimetype.h> #include <kdebug.h> #include <tdetempfile.h> @@ -670,7 +670,7 @@ bool FileRead::saveFile( const KURL &url, bool copyimages, bool saveCompressed ) if( saveFile(_tmpfile->name(), copyimages, saveCompressed) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -689,7 +689,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom TQFile file(filename); TQStringList copyJOB; - stream.setDevice(TQT_TQIODEVICE(&buffer)); + stream.setDevice(&buffer); if ( (!file.open(IO_WriteOnly)) || (!buffer.open(IO_WriteOnly)) ) { @@ -847,7 +847,7 @@ bool FileRead::saveResults( const KURL &url, const TQString &results ) if( saveResults(_tmpfile->name(), results) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -862,7 +862,7 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results ) TQFile file(filename); TQStringList copyJOB; - stream.setDevice(TQT_TQIODEVICE(&file)); + stream.setDevice(&file); if(!file.open(IO_WriteOnly)) { diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index 9a34c1a8..ed9d54a2 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -33,7 +33,7 @@ class TQFile; */ class FileRead : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h index 9be42034..1712a61c 100644 --- a/keduca/libkeduca/kgallerydialog.h +++ b/keduca/libkeduca/kgallerydialog.h @@ -34,7 +34,7 @@ class KTempFile; namespace TDEIO { class Job; } class KGalleryDialog : public KGalleryDialogBase { - Q_OBJECT + TQ_OBJECT public: KGalleryDialog(TQWidget *parent=0, const char *name=0); diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index 5150ee42..f530fd86 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -362,9 +362,9 @@ <slot>slotServerSelected(TQListViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotButtonAdd()</slot> <slot>slotServerSelected(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> |