summaryrefslogtreecommitdiffstats
path: root/keduca/keducabuilder
diff options
context:
space:
mode:
Diffstat (limited to 'keduca/keducabuilder')
-rw-r--r--keduca/keducabuilder/Makefile.am2
-rw-r--r--keduca/keducabuilder/kcontroladdedit.h2
-rw-r--r--keduca/keducabuilder/kcontroladdeditbase.ui4
-rw-r--r--keduca/keducabuilder/kcontrolheader.cpp18
-rw-r--r--keduca/keducabuilder/kcontrolheader.h2
-rw-r--r--keduca/keducabuilder/keducabuilder.cpp38
-rw-r--r--keduca/keducabuilder/keducabuilder.h2
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialog.cpp4
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialog.h4
-rw-r--r--keduca/keducabuilder/klangcombo.cpp2
-rw-r--r--keduca/keducabuilder/klangcombo.h2
-rw-r--r--keduca/keducabuilder/ktagcombobox.cpp16
-rw-r--r--keduca/keducabuilder/ktagcombobox.h2
13 files changed, 49 insertions, 49 deletions
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: