summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 10:54:58 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-25 01:06:54 +0900
commit94639370f5903b7fcb122e90f561d2df6e3b8c75 (patch)
tree1a8e089b68dfc049c031bf80967744bf1a9dd90c
parent9e23a785039c8b2686207a1ecd4c0b718a4d6ef9 (diff)
downloadtdeaddons-94639370f5903b7fcb122e90f561d2df6e3b8c75.tar.gz
tdeaddons-94639370f5903b7fcb122e90f561d2df6e3b8c75.zip
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 681b905a28a095d19cb2f8e50236d5e8d3ce716f)
-rw-r--r--kicker-applets/kolourpicker/simplebutton.cpp2
-rw-r--r--kicker-applets/mediacontrol/simplebutton.cpp2
-rw-r--r--konq-plugins/crashes/crashesplugin.cpp4
-rw-r--r--konq-plugins/fsview/treemap.cpp2
-rw-r--r--konq-plugins/microformat/konqmficon.cpp4
-rw-r--r--konq-plugins/minitools/minitoolsplugin.cpp4
-rw-r--r--konq-plugins/searchbar/searchbar.cpp2
7 files changed, 10 insertions, 10 deletions
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index f95fbe8..ef09f71 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+ style().drawPrimitive(pe, p, r, colorGroup(), flags);
}
void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index f95fbe8..ef09f71 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+ style().drawPrimitive(pe, p, r, colorGroup(), flags);
}
void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index 1150d31..8314e95 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -139,12 +139,12 @@ void CrashesPlugin::slotAboutToShow()
void CrashesPlugin::newBookmarkCallback( const TQString & text, const TQCString & url,
const TQString & )
{
- m_crashesList.prepend(tqMakePair(text,url));
+ m_crashesList.prepend(qMakePair(text,url));
}
void CrashesPlugin::endFolderCallback( )
{
- m_crashesList.prepend(tqMakePair(TQString("-"),TQCString("-")));
+ m_crashesList.prepend(qMakePair(TQString("-"),TQCString("-")));
}
void CrashesPlugin::slotClearCrashes() {
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index ef41fb1..71c8eeb 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -2152,7 +2152,7 @@ void TreeMapWidget::drawTreeMap()
if (hasFocus()) {
TQPainter p(this);
- style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+ style().drawPrimitive( TQStyle::PE_FocusRect, &p,
TQRect(0, 0, TQWidget::width(), TQWidget::height()),
colorGroup() );
}
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index ae0e500..b0ce649 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -157,7 +157,7 @@ void KonqMFIcon::extractCard(DOM::Node node) {
if (!name.isEmpty()) {
value += "END:VCARD\n";
- _cards.append(tqMakePair(name, value));
+ _cards.append(qMakePair(name, value));
}
}
@@ -202,7 +202,7 @@ void KonqMFIcon::extractEvent(DOM::Node node) {
if (!name.isEmpty()) {
value += "END:VEVENT\nEND:VCALENDAR\n";
- _events.append(tqMakePair(name, value));
+ _events.append(qMakePair(name, value));
}
}
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index c1c7eb6..9b5610f 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -124,12 +124,12 @@ void MinitoolsPlugin::newBookmarkCallback(
const TQString & text, const TQCString & url, const TQString &
) {
kdDebug(90150) << "MinitoolsPlugin::newBookmarkCallback" << text << url << endl;
- m_minitoolsList.prepend(tqMakePair(text,url));
+ m_minitoolsList.prepend(qMakePair(text,url));
}
void MinitoolsPlugin::endFolderCallback() {
kdDebug(90150) << "MinitoolsPlugin::endFolderCallback" << endl;
- m_minitoolsList.prepend(tqMakePair(TQString("-"),TQCString("-")));
+ m_minitoolsList.prepend(qMakePair(TQString("-"),TQCString("-")));
}
TQString MinitoolsPlugin::minitoolsFilename(bool local) {
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 524e95d..cc52144 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -363,7 +363,7 @@ void SearchBarPlugin::setIcon()
TQPainter p( &arrowmap );
p.drawPixmap(0, 2, m_searchIcon);
TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
- m_searchCombo->style().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6,
+ m_searchCombo->style().drawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6,
arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() );
p.end();
m_searchIcon = arrowmap;