summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 10:55:37 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-25 01:08:40 +0900
commit79ebc59cc17d520d3233ff88f815e0244e8ed5b0 (patch)
treecfe5066a2ef7155535286a89b35f54c643c06cab
parentb2b98c0bf3af9d6250fee31ab6de989c075473b0 (diff)
downloadtdeedu-79ebc59cc17d520d3233ff88f815e0244e8ed5b0.tar.gz
tdeedu-79ebc59cc17d520d3233ff88f815e0244e8ed5b0.zip
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit c5bd1f2f9a482db33b1a2e51ccec1533d1300a7d)
-rw-r--r--blinken/src/highscoredialog.cpp4
-rw-r--r--keduca/keduca/kcheckeduca.cpp2
-rw-r--r--keduca/keduca/tderadioeduca.cpp2
-rw-r--r--kiten/main.cpp2
-rw-r--r--klatin/klatin/klatinvocab.cpp4
-rw-r--r--libtdeedu/extdate/extdatepicker.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 8e994f0d..8996a3de 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -136,7 +136,7 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
cfg -> setGroup(TQString("Level%1").arg(i));
for (int j = 1; j <= 5; j++)
{
- m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
+ m_scores[i-1].append(qMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
}
}
@@ -166,7 +166,7 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
if (it != itEnd)
{
- m_scores[level].insert(it, tqMakePair(score, name));
+ m_scores[level].insert(it, qMakePair(score, name));
m_scores[level].remove(--m_scores[level].end());
TDEConfig *cfg = kapp -> config();
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/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/kiten/main.cpp b/kiten/main.cpp
index 621fdf03..0fc18b5f 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -39,7 +39,7 @@ static TDECmdLineOptions options[] =
int main(int argc, char *argv[])
{
- tqInstallMsgHandler(noMessageOutput);
+ qInstallMsgHandler(noMessageOutput);
TDEAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
"1.2", I18N_NOOP("Japanese Reference Tool"), TDEAboutData::License_GPL,
"(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten");
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index b30600eb..6d04bcef 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -123,9 +123,9 @@ void KLatinVocab::parseVocab(TQString customFile)
// Start parsing file and allocating words to the TQValueList<TQStringPair>
for(KEduVocDataItemList::Iterator dataIt = vocabulary.begin(); dataIt != vocabulary.end(); ++dataIt) {
if (Settings::langToLatin()) {
- m_texts.append(tqMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText()));
+ m_texts.append(qMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText()));
} else {
- m_texts.append(tqMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText()));
+ m_texts.append(qMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText()));
}
it++;
}
diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index ad347c31..48eeeae6 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -490,7 +490,7 @@ ExtDatePicker::setFontSize(int s)
maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height()));
}
- TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton,
+ TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton,
selectMonth,
maxMonthRect);
selectMonth->setMinimumSize(metricBound);