From 32f50cd6f959faf422b389d2d0b52e0930a78c09 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Aug 2014 17:24:38 -0500 Subject: [PATCH] Rename the string kde toolbar widget --- kate/plugins/isearch/ISearchPlugin.cpp | 2 +- tdestyles/highcolor/highcolor.cpp | 4 ++-- tdestyles/keramik/keramik.cpp | 6 +++--- tdestyles/kthemestyle/kthemestyle.cpp | 6 +++--- tdestyles/plastik/plastik.cpp | 6 +++--- tdeui/tdelistviewsearchline.cpp | 2 +- tdeui/tdetoolbarlabelaction.cpp | 6 +++--- tdeui/tdetoolbarlabelaction.h | 2 +- tdeui/tests/tdetoolbarlabelactiontest.cpp | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 7cb01ccc9..4ee93cb87 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -73,7 +73,7 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) this, TQT_SLOT(slotSearchBackwardAction()), actionCollection(), "edit_isearch_reverse" ); - m_label = new TQLabel( i18n("I-Search:"), 0L, "kde toolbar widget" ); + m_label = new TQLabel( i18n("I-Search:"), 0L, "tde toolbar widget" ); KWidgetAction* labelAction = new KWidgetAction( m_label, i18n("I-Search:"), 0, 0, 0, diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp index 353fee30d..2017c400c 100644 --- a/tdestyles/highcolor/highcolor.cpp +++ b/tdestyles/highcolor/highcolor.cpp @@ -96,7 +96,7 @@ static const int itemHMargin = 3; static const int itemVMargin = 0; static const int arrowHMargin = 6; static const int rightBorder = 12; -static const char* kdeToolbarWidget = "kde toolbar widget"; +static const char* kdeToolbarWidget = "tde toolbar widget"; // --------------------------------------------------------------------------- @@ -2023,7 +2023,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData if ( object->parent() && !qstrcmp( object->name(), kdeToolbarWidget ) ) { // Draw a gradient background for custom widgets in the toolbar - // that have specified a "kde toolbar widget" name. + // that have specified a "tde toolbar widget" name. // FIXME // This currently requires direct widget access // Is there any way to do this without it? diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index 759f3d7da..f3a5ee033 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -113,7 +113,7 @@ namespace const int itemVMargin = 0; const int arrowHMargin = 6; const int rightBorder = 12; - const char* kdeToolbarWidget = "kde toolbar widget"; + const char* kdeToolbarWidget = "tde toolbar widget"; const int smallButMaxW = 27; const int smallButMaxH = 20; @@ -482,7 +482,7 @@ static void renderToolbarEntryBackground(TQPainter* paint, static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleControlElementData &ceData, const TQStyle::ControlElementFlags elementFlags, const TQWidget* widget) { // Draw a gradient background for custom widgets in the toolbar - // that have specified a "kde toolbar widget" name, or + // that have specified a "tde toolbar widget" name, or // are caught as toolbar widgets otherwise // Find the top-level toolbar of this widget, since it may be nested in other @@ -2917,7 +2917,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, object->parent() && !qstrcmp(object->name(), kdeToolbarWidget) ) { // Draw a gradient background for custom widgets in the toolbar - // that have specified a "kde toolbar widget" name. + // that have specified a "tde toolbar widget" name. renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object)); return false; // Now draw the contents diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp index f09482ccc..5ddbb3899 100644 --- a/tdestyles/kthemestyle/kthemestyle.cpp +++ b/tdestyles/kthemestyle/kthemestyle.cpp @@ -506,7 +506,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C w->setPalette(pal); } } - if (!qstrcmp(object->name(), "kde toolbar widget") && object->inherits(TQLABEL_OBJECT_NAME_STRING)) + if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits(TQLABEL_OBJECT_NAME_STRING)) { TQWidget* lb = TQT_TQWIDGET(object); if (lb->backgroundMode() == TQt::PaletteButton) @@ -526,7 +526,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen if (::tqqt_cast(w)) w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background)); - if (::tqqt_cast(w) && !qstrcmp(w->name(), "kde toolbar widget")) + if (::tqqt_cast(w) && !qstrcmp(w->name(), "tde toolbar widget")) installObjectEventHandler(ceData, elementFlags, ptr, this); if (w->backgroundPixmap() && !w->isTopLevel() && @@ -644,7 +644,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem } //Toolbar labels should nornally be PaletteButton - if ( ::tqqt_cast(w) && !qstrcmp(w->name(), "kde toolbar widget")) + if ( ::tqqt_cast(w) && !qstrcmp(w->name(), "tde toolbar widget")) w->setBackgroundMode( TQWidget::PaletteButton ); //The same for menu bars, popup menus diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 7abba20a4..b2801efc8 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -261,7 +261,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen installObjectEventHandler(ceData, elementFlags, ptr, this); } else if (::tqqt_cast(widget)) { widget->setBackgroundMode( NoBackground ); - } else if ( !qstrcmp(widget->name(), "kde toolbar widget") ) { + } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { installObjectEventHandler(ceData, elementFlags, ptr, this); } @@ -301,7 +301,7 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem removeObjectEventHandler(ceData, elementFlags, ptr, this); } else if (::tqqt_cast(widget)) { widget->setBackgroundMode( PaletteBackground ); - } else if ( !qstrcmp(widget->name(), "kde toolbar widget") ) { + } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } @@ -3510,7 +3510,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, animationTimer->start( 50, false ); } } - if ( !qstrcmp(obj->name(), "kde toolbar widget") ) + if ( !qstrcmp(obj->name(), "tde toolbar widget") ) { TQWidget* lb = TQT_TQWIDGET(obj); if (lb->backgroundMode() == TQt::PaletteButton) diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp index b74b4d1c1..50ad3d276 100644 --- a/tdeui/tdelistviewsearchline.cpp +++ b/tdeui/tdelistviewsearchline.cpp @@ -452,7 +452,7 @@ void TDEListViewSearchLineWidget::createWidgets() d->clearButton->show(); - TQLabel *label = new TQLabel(i18n("S&earch:"), this, "kde toolbar widget"); + TQLabel *label = new TQLabel(i18n("S&earch:"), this, "tde toolbar widget"); d->searchLine = createSearchLine(d->listView); d->searchLine->show(); diff --git a/tdeui/tdetoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp index dcac8fc8b..c88f68434 100644 --- a/tdeui/tdetoolbarlabelaction.cpp +++ b/tdeui/tdetoolbarlabelaction.cpp @@ -38,7 +38,7 @@ TDEToolBarLabelAction::TDEToolBarLabelAction(const TQString &text, const char *slot, TDEActionCollection *parent, const char *name) - : KWidgetAction(new TQLabel(text, 0, "kde toolbar widget"), text, cut, + : KWidgetAction(new TQLabel(text, 0, "tde toolbar widget"), text, cut, receiver, slot, parent, name), d(new TDEToolBarLabelActionPrivate) { @@ -52,7 +52,7 @@ TDEToolBarLabelAction::TDEToolBarLabelAction(TQWidget* buddy, const char *slot, TDEActionCollection *parent, const char *name) - : KWidgetAction(new TQLabel(buddy, text, 0, "kde toolbar widget"), text, + : KWidgetAction(new TQLabel(buddy, text, 0, "tde toolbar widget"), text, cut, receiver, slot, parent, name), d(new TDEToolBarLabelActionPrivate) { @@ -68,7 +68,7 @@ TDEToolBarLabelAction::TDEToolBarLabelAction(TQLabel* label, : KWidgetAction(label, label->text(), cut, receiver, slot, parent, name), d(new TDEToolBarLabelActionPrivate) { - Q_ASSERT(TQString::fromLatin1("kde toolbar widget") == label->name()); + Q_ASSERT(TQString::fromLatin1("tde toolbar widget") == label->name()); init(); } diff --git a/tdeui/tdetoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h index 3fef73937..c330c9254 100644 --- a/tdeui/tdetoolbarlabelaction.h +++ b/tdeui/tdetoolbarlabelaction.h @@ -87,7 +87,7 @@ public: * transferred to the action and the label is deleted when the action is * deleted. So you shouldn't hold any pointers to the label. * - * It's important that the label's name is set to "kde toolbar widget" in + * It's important that the label's name is set to "tde toolbar widget" in * its constructor, otherwise it is not correctly rendered in some kde * styles. * diff --git a/tdeui/tests/tdetoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp index b919c2725..7c6222a11 100644 --- a/tdeui/tests/tdetoolbarlabelactiontest.cpp +++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp @@ -40,10 +40,10 @@ public: KSqueezedTextLabel* accel = new KSqueezedTextLabel ("&Really long, long, long and boring text goes here", main, - "kde toolbar widget"); + "tde toolbar widget"); new KSqueezedTextLabel ("Really long, long, long and boring text goes here", main, - "kde toolbar widget"); + "tde toolbar widget"); // first constructor @@ -67,7 +67,7 @@ public: // third constructor TQLabel* customLabel = new KSqueezedTextLabel ("&Really long, long, long and boring text goes here", this, - "kde toolbar widget"); + "tde toolbar widget"); TDEToolBarLabelAction* label3 = new TDEToolBarLabelAction(customLabel, 0, 0, 0, actionCollection(),