summaryrefslogtreecommitdiffstats
path: root/kanagram/src
diff options
context:
space:
mode:
Diffstat (limited to 'kanagram/src')
-rw-r--r--kanagram/src/Makefile.am2
-rw-r--r--kanagram/src/kanagram.cpp26
-rw-r--r--kanagram/src/kanagram.h2
-rw-r--r--kanagram/src/kanagramgame.h4
-rw-r--r--kanagram/src/keduvocdocument.cpp22
-rw-r--r--kanagram/src/keduvocdocument.h2
-rw-r--r--kanagram/src/keduvockvtmlreader.cpp4
-rw-r--r--kanagram/src/leitnersystemview.h2
-rw-r--r--kanagram/src/main.cpp6
-rw-r--r--kanagram/src/mainsettings.cpp8
-rw-r--r--kanagram/src/mainsettings.h2
-rw-r--r--kanagram/src/mainsettingswidget.ui3
-rw-r--r--kanagram/src/newstuff.cpp2
-rw-r--r--kanagram/src/newstuff.h2
-rw-r--r--kanagram/src/newstuffdialog.cpp2
-rw-r--r--kanagram/src/vocabedit.cpp34
-rw-r--r--kanagram/src/vocabedit.h2
-rw-r--r--kanagram/src/vocabsettings.cpp12
-rw-r--r--kanagram/src/vocabsettings.h2
-rw-r--r--kanagram/src/vocabsettingswidget.ui4
20 files changed, 70 insertions, 73 deletions
diff --git a/kanagram/src/Makefile.am b/kanagram/src/Makefile.am
index 76bd52cd..d41eb7a4 100644
--- a/kanagram/src/Makefile.am
+++ b/kanagram/src/Makefile.am
@@ -28,7 +28,7 @@ bin_PROGRAMS = kanagram
# the application source, library search path, and link libraries
kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp
-kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kanagram_LDADD = $(LIB_TDEUI) $(LIB_TDENEWSTUFF) $(LIB_TDEIO) $(artslib)
kde_kcfg_DATA=kanagram.kcfg
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 9b826f43..38cf5cca 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -40,7 +40,7 @@ using namespace std;
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfigdialog.h>
#include <tdeconfigskeleton.h>
#include <krandomsequence.h>
@@ -113,15 +113,15 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex
m_hintTimer = new TQTimer(this);
- m_helpMenu = new KHelpMenu(this, kapp->aboutData());
+ m_helpMenu = new KHelpMenu(this, tdeApp->aboutData());
m_inputBox = new TQLineEdit(this);
m_inputBox->setGeometry(TQRect(52, 427, 273, 29));
m_inputBox->setFrame(false);
- connect(m_inputBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkWord()));
- connect(m_hintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideHint()));
- connect(m_inputBox, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(update()));
+ connect(m_inputBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkWord()));
+ connect(m_hintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideHint()));
+ connect(m_inputBox, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(update()));
TQFont f = TQFont();
f.setPointSize(17);
@@ -393,7 +393,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
if(m_quitRect.contains(e->pos()))
{
- kapp->quit();
+ tdeApp->quit();
}
if(m_revealRect.contains(e->pos()))
@@ -432,7 +432,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
if(m_switcherRect.contains(e->pos()) || m_arrowRect.contains(e->pos()))
{
- if(!(e->button() == Qt::RightButton))
+ if(!(e->button() == TQt::RightButton))
m_game->nextVocab();
else
m_game->previousVocab();
@@ -451,7 +451,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
{
if(m_hintHideTime)
{
- m_hintTimer->start(m_hintHideTime * 1000, TRUE);
+ m_hintTimer->start(m_hintHideTime * 1000, true);
}
m_showHint = true;
randomHintImage();
@@ -465,7 +465,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
{
if(m_useSounds) play("right.ogg");
m_inputBox->setPaletteBackgroundColor(TQColor(0, 255, 0));
- TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox()));
m_inputBox->clear();
hideHint();
m_game->nextAnagram();
@@ -475,7 +475,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
{
if(m_useSounds) play("wrong.ogg");
m_inputBox->setPaletteBackgroundColor(TQColor(255, 0, 0));
- TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox()));
m_inputBox->clear();
update();
}
@@ -723,7 +723,7 @@ void Kanagram::drawTextNew(TQPainter &p, const TQString &text, int textAlign, in
void Kanagram::checkWord()
{
TQPoint p = m_upRect.topLeft() + TQPoint( 1, 1 );
- TQMouseEvent *e = new TQMouseEvent( TQEvent::MouseButtonPress, p, Qt::LeftButton, Qt::NoButton );
+ TQMouseEvent *e = new TQMouseEvent( TQEvent::MouseButtonPress, p, TQt::LeftButton, TQt::NoButton );
mousePressEvent(e);
}
@@ -744,8 +744,8 @@ void Kanagram::showSettings()
m_vocabSettings = new VocabSettings( configDialog );
configDialog->addPage( m_vocabSettings, i18n("Vocabularies"), "edit" );
configDialog->addPage( new NewStuff( configDialog ), i18n("New Stuff"), "knewstuff" );
- connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings()));
- connect(configDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(refreshVocabularies()));
+ connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings()));
+ connect(configDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(refreshVocabularies()));
configDialog->exec();
delete configDialog;
}
diff --git a/kanagram/src/kanagram.h b/kanagram/src/kanagram.h
index 2587e62f..7eb732b8 100644
--- a/kanagram/src/kanagram.h
+++ b/kanagram/src/kanagram.h
@@ -56,7 +56,7 @@ class VocabSettings;
class Kanagram : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
Kanagram();
diff --git a/kanagram/src/kanagramgame.h b/kanagram/src/kanagramgame.h
index ffaa95da..d85aecf4 100644
--- a/kanagram/src/kanagramgame.h
+++ b/kanagram/src/kanagramgame.h
@@ -23,14 +23,14 @@
#include <tqobject.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <krandomsequence.h>
class TQWidget;
class KanagramGame : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
KanagramGame(TQWidget *parent);
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 046ad56e..7f8c04c0 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
if (!url.isEmpty())
doc_url = url;
- // TODO EPT connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+ // TODO EPT connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) );
TQString tmpfile;
if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
@@ -165,7 +165,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
TQString msg = format.arg(url.path());
int result = KMessageBox::warningContinueCancel(0, msg,
- kapp->makeStdCaption(i18n("I/O Failure")),
+ tdeApp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
if ( result == KMessageBox::Cancel ) {
Init();
@@ -182,7 +182,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator)
{
-// connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+// connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) );
KURL tmp (url);
@@ -255,7 +255,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
TQString msg = format.arg(tmp.path());
int result = KMessageBox::warningContinueCancel(0, msg,
- kapp->makeStdCaption(i18n("I/O Failure")),
+ tdeApp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
if ( result == KMessageBox::Cancel ) return false;
}
@@ -463,7 +463,7 @@ void KEduVocDocument::setSizeHint (int idx, const int width)
}
-class eraseTrans : public unary_function<KEduVocExpression, void>
+class eraseTrans : public function<void(KEduVocExpression)>
{
public:
@@ -507,7 +507,7 @@ void KEduVocDocument::setOriginalIdent (const TQString &id)
}
-class sortByOrg : public binary_function<KEduVocExpression, KEduVocExpression, bool>
+class sortByOrg : public function<bool(KEduVocExpression, KEduVocExpression)>
{
public:
@@ -531,7 +531,7 @@ public:
class sortByLessonAndOrg_alpha
- : public binary_function<KEduVocExpression, KEduVocExpression, bool>
+ : public function<bool(KEduVocExpression, KEduVocExpression)>
{
public:
@@ -564,7 +564,7 @@ public:
class sortByLessonAndOrg_index
- : public binary_function<KEduVocExpression, KEduVocExpression, bool>
+ : public function<bool(KEduVocExpression, KEduVocExpression)>
{
public:
@@ -594,7 +594,7 @@ public:
};
-class sortByTrans : public binary_function<KEduVocExpression, KEduVocExpression, bool>
+class sortByTrans : public function<bool(KEduVocExpression, KEduVocExpression)>
{
public:
@@ -727,7 +727,7 @@ LeitnerSystem* KEduVocDocument::getLeitnerSystem()
}
-class resetAll : public unary_function<KEduVocExpression, void>
+class resetAll : public function<void(KEduVocExpression)>
{
public:
@@ -755,7 +755,7 @@ public:
};
-class resetOne : public unary_function<KEduVocExpression, void>
+class resetOne : public function<void(KEduVocExpression)>
{
public:
diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h
index b5ef5fff..ff43a816 100644
--- a/kanagram/src/keduvocdocument.h
+++ b/kanagram/src/keduvocdocument.h
@@ -251,7 +251,7 @@ class LeitnerSystem;
class KEduVocDocument : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class KEduVocKvtmlWriter;
friend class KEduVocKvtmlReader;
diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index 34c31ca7..ed0939bf 100644
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@@ -1678,7 +1678,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
);
TQString msg = format.arg(elem);
TQApplication::setOverrideCursor( arrowCursor, true );
- TQString s = kapp->makeStdCaption(i18n("Unknown Element"));
+ TQString s = tdeApp->makeStdCaption(i18n("Unknown Element"));
KMessageBox::sorry(0, ln+msg, s);
TQApplication::restoreOverrideCursor();
}
@@ -1686,7 +1686,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
void KEduVocKvtmlReader::domError(const TQString &text )
{
TQApplication::setOverrideCursor( arrowCursor, true );
- TQString s = kapp->makeStdCaption(i18n("Error"));
+ TQString s = tdeApp->makeStdCaption(i18n("Error"));
TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
TQString msg = text;
KMessageBox::error(0, ln+msg, s);
diff --git a/kanagram/src/leitnersystemview.h b/kanagram/src/leitnersystemview.h
index 32dcab00..88cca85e 100644
--- a/kanagram/src/leitnersystemview.h
+++ b/kanagram/src/leitnersystemview.h
@@ -24,7 +24,7 @@ class LeitnerSystem;
class LeitnerSystemView : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp
index 75481435..416ff515 100644
--- a/kanagram/src/main.cpp
+++ b/kanagram/src/main.cpp
@@ -21,8 +21,8 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
#include "kanagram.h"
#include "kanagramsettings.h"
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication app;
- app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
+ app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
KanagramSettings::setJustGotFont(false);
TQFont f("squeaky chalk sound");
diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp
index 8307bb1d..a712cd35 100644
--- a/kanagram/src/mainsettings.cpp
+++ b/kanagram/src/mainsettings.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfigdialog.h>
#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
@@ -39,8 +39,8 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
{
m_parent = (TDEConfigDialog*)parent;
- connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
- connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent()));
+ connect(parent, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotChangeTranslation()));
+ connect(cboxTranslation, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdateParent()));
setupTranslations();
@@ -73,7 +73,7 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
if (!TQFontInfo(f).exactMatch())
{
kcfg_useStandardFonts->setEnabled(false);
- connect(getFontsButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(getAndInstallFont()));
+ connect(getFontsButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(getAndInstallFont()));
}
else
{
diff --git a/kanagram/src/mainsettings.h b/kanagram/src/mainsettings.h
index 2ee07649..db077726 100644
--- a/kanagram/src/mainsettings.h
+++ b/kanagram/src/mainsettings.h
@@ -29,7 +29,7 @@ class TDEConfigDialog;
class MainSettings : public MainSettingsWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
MainSettings(TQWidget *parent);
diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui
index 285d6d64..121548cb 100644
--- a/kanagram/src/mainsettingswidget.ui
+++ b/kanagram/src/mainsettingswidget.ui
@@ -127,9 +127,6 @@
<property name="text">
<string>Use standard fonts</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="whatsThis" stdset="0">
<string>Uses a standard font for the chalkboard/interface.</string>
</property>
diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp
index 7293775d..c17cbea2 100644
--- a/kanagram/src/newstuff.cpp
+++ b/kanagram/src/newstuff.cpp
@@ -13,7 +13,7 @@
NewStuff::NewStuff(TQWidget *parent) : NewStuffWidget(parent)
{
- connect(btnGetNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewVocabs()));
+ connect(btnGetNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewVocabs()));
}
NewStuff::~NewStuff()
diff --git a/kanagram/src/newstuff.h b/kanagram/src/newstuff.h
index cf58730d..ac880af3 100644
--- a/kanagram/src/newstuff.h
+++ b/kanagram/src/newstuff.h
@@ -5,7 +5,7 @@
class NewStuff : public NewStuffWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
NewStuff(TQWidget *parent);
diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp
index ac8d1d70..6c516c2e 100644
--- a/kanagram/src/newstuffdialog.cpp
+++ b/kanagram/src/newstuffdialog.cpp
@@ -5,7 +5,7 @@
#include <tdelocale.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kanagramsettings.h"
diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp
index b36a3454..4aaf42f7 100644
--- a/kanagram/src/vocabedit.cpp
+++ b/kanagram/src/vocabedit.cpp
@@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqvaluevector.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <kurl.h>
#include <kdebug.h>
@@ -46,7 +46,7 @@ VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(pare
if(fileName != "")
{
m_fileName = fileName;
- KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this));
+ KEduVocDocument *doc = new KEduVocDocument(this);
doc->open(KURL(m_fileName), false);
for(int i = 0; i < doc->numEntries(); i++)
{
@@ -58,20 +58,20 @@ VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(pare
txtDescription->setText(doc->getDocRemark());
}
- connect(btnSave, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()));
- connect(btnNewWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewWord()));
- connect(btnRemoveWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveWord()));
- connect(btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+ connect(btnSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()));
+ connect(btnNewWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewWord()));
+ connect(btnRemoveWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveWord()));
+ connect(btnClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
- connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &)));
- connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &)));
+ connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &)));
+ connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &)));
//Connect the name and description boxes to a general textChanged slot, so that we can keep track of
//whether they've been changed or not
- connect(txtVocabName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &)));
- connect(txtDescription, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &)));
+ connect(txtVocabName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &)));
+ connect(txtDescription, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &)));
- connect(lboxWords, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(lboxWords, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
//Has anything in the dialog changed?
m_textChanged = false;
@@ -83,7 +83,7 @@ VocabEdit::~VocabEdit()
void VocabEdit::slotSave()
{
- KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this));
+ KEduVocDocument *doc = new KEduVocDocument(this);
doc->setTitle(txtVocabName->text());
doc->setDocRemark(txtDescription->text());
for(uint i = 0; i < m_vocabList.size(); i++)
@@ -100,7 +100,7 @@ void VocabEdit::slotSave()
{
fileName = m_fileName;
}
- doc->saveAs(TQT_TQOBJECT(this), KURL(fileName), KEduVocDocument::automatic, "kanagram");
+ doc->saveAs(this, KURL(fileName), KEduVocDocument::automatic, "kanagram");
VocabSettings *settings = (VocabSettings*)this->parentWidget();
settings->refreshView();
@@ -140,15 +140,15 @@ void VocabEdit::slotNewWord()
void VocabEdit::slotSelectionChanged()
{
//A little hack to make things work right
- disconnect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &)));
- disconnect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &)));
+ disconnect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &)));
+ disconnect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &)));
if(lboxWords->currentItem() >= 0)
{
txtWord->setText(m_vocabList[lboxWords->currentItem()].getOriginal());
txtHint->setText(m_vocabList[lboxWords->currentItem()].getRemark(0));
}
- connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &)));
- connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &)));
+ connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &)));
+ connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &)));
}
void VocabEdit::slotWordTextChanged(const TQString &changes)
diff --git a/kanagram/src/vocabedit.h b/kanagram/src/vocabedit.h
index 99935801..4b82bda4 100644
--- a/kanagram/src/vocabedit.h
+++ b/kanagram/src/vocabedit.h
@@ -31,7 +31,7 @@ class KEduVocExpression;
class VocabEdit : public VocabEditWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
VocabEdit(TQWidget *parent);
diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp
index 77b21966..9834847c 100644
--- a/kanagram/src/vocabsettings.cpp
+++ b/kanagram/src/vocabsettings.cpp
@@ -4,7 +4,7 @@
#include <tqpushbutton.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqstringlist.h>
#include <tqlistview.h>
#include <tqvaluevector.h>
@@ -18,10 +18,10 @@
VocabSettings::VocabSettings(TQWidget *parent) : VocabSettingsWidget(parent)
{
- connect(btnCreateNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNew()));
- connect(btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()));
- connect(btnDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete()));
- connect(lviewVocab, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem *)));
+ connect(btnCreateNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreateNew()));
+ connect(btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()));
+ connect(btnDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete()));
+ connect(lviewVocab, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem *)));
refreshView();
}
@@ -37,7 +37,7 @@ void VocabSettings::refreshView()
m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml");
for(uint i = 0; i < m_fileList.size(); i++)
{
- KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this));
+ KEduVocDocument *doc = new KEduVocDocument(this);
doc->open(KURL(m_fileList[i]), false);
TQListViewItem *item = new TQListViewItem(lviewVocab, 0);
item->setText( 0, doc->getTitle() );
diff --git a/kanagram/src/vocabsettings.h b/kanagram/src/vocabsettings.h
index 1ea1529c..cf101831 100644
--- a/kanagram/src/vocabsettings.h
+++ b/kanagram/src/vocabsettings.h
@@ -5,7 +5,7 @@
class VocabSettings : public VocabSettingsWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
VocabSettings(TQWidget *parent);
diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui
index 6ef70fd1..7e28a1cd 100644
--- a/kanagram/src/vocabsettingswidget.ui
+++ b/kanagram/src/vocabsettingswidget.ui
@@ -110,8 +110,8 @@
</widget>
</grid>
</widget>
-<Q_SLOTS>
+<slots>
<slot>createNew()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 16:07:35 +0000