summaryrefslogtreecommitdiffstats
path: root/tdecore/tdeapplication.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-07-12 11:09:49 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-07-13 10:04:24 +0900
commit707310036113d2d0ae9da1cc7f85d0e642bf9686 (patch)
treeafa9b616af366f63e0418df74b2287299d8572a3 /tdecore/tdeapplication.cpp
parent08eacf589a6ee0358c49f177fca34a29e0515164 (diff)
downloadtdelibs-707310036113d2d0ae9da1cc7f85d0e642bf9686.tar.gz
tdelibs-707310036113d2d0ae9da1cc7f85d0e642bf9686.zip
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 36c049e135b0cec7cf97b41888860186813df5f0)
Diffstat (limited to 'tdecore/tdeapplication.cpp')
-rw-r--r--tdecore/tdeapplication.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 6dcafa2d5..ec05a6cd2 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -2540,8 +2540,8 @@ void TDEApplication::tdedisplaySetPalette()
void TDEApplication::tdedisplaySetFont()
{
TQApplication::setFont(TDEGlobalSettings::generalFont(), true);
- TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
- TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
+ TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQMenuBar");
+ TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQPopupMenu");
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle");
// "patch" standard TQStyleSheet to follow our fonts
@@ -2644,8 +2644,8 @@ void TDEApplication::installKDEPropertyMap()
kdeMap->insert( "KIntSpinBox", "value" );
kdeMap->insert( "KDoubleNumInput", "value" );
// Temp til fixed in QT then enable ifdef with the correct version num
- kdeMap->insert( TQGROUPBOX_OBJECT_NAME_STRING, "checked" );
- kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" );
+ kdeMap->insert( "TQGroupBox", "checked" );
+ kdeMap->insert( "TQTabWidget", "currentPage" );
TQSqlPropertyMap::installDefaultMap( kdeMap );
#endif
}