Rename the string kde toolbar widget

src/gui/application/RosegardenGUIApp.cpp

@@ -1280,7 +1280,7 @@ void RosegardenGUIApp::initZoomToolbar()
         return ;
     }
 
-    new TQLabel(i18n("  Zoom:  "), zoomToolbar, "kde toolbar widget");
+    new TQLabel(i18n("  Zoom:  "), zoomToolbar, "tde toolbar widget");
 
     std::vector<double> zoomSizes; // in units-per-pixel
     double defaultBarWidth44 = 100.0;
@@ -1297,10 +1297,10 @@ void RosegardenGUIApp::initZoomToolbar()
     TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
-                   (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "kde toolbar widget");
+                   (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "tde toolbar widget");
     m_zoomSlider->setTracking(true);
     m_zoomSlider->setFocusPolicy(TQ_NoFocus);
-    m_zoomLabel = new TQLabel(minZoom, zoomToolbar, "kde toolbar widget");
+    m_zoomLabel = new TQLabel(minZoom, zoomToolbar, "tde toolbar widget");
     m_zoomLabel->setIndent(10);
 
     connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)),

src/gui/application/RosegardenGUIApp.cpp.orig

@@ -1280,7 +1280,7 @@ void RosegardenGUIApp::initZoomToolbar()
         return ;
     }
 
-    new TQLabel(i18n("  Zoom:  "), zoomToolbar, "kde toolbar widget");
+    new TQLabel(i18n("  Zoom:  "), zoomToolbar, "tde toolbar widget");
 
     std::vector<double> zoomSizes; // in units-per-pixel
     double defaultBarWidth44 = 100.0;
@@ -1297,10 +1297,10 @@ void RosegardenGUIApp::initZoomToolbar()
     TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
-                   (zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "kde toolbar widget");
+                   (zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "tde toolbar widget");
     m_zoomSlider->setTracking(true);
     m_zoomSlider->setFocusPolicy(TQWidget::NoFocus);
-    m_zoomLabel = new TQLabel(minZoom, zoomToolbar, "kde toolbar widget");
+    m_zoomLabel = new TQLabel(minZoom, zoomToolbar, "tde toolbar widget");
     m_zoomLabel->setIndent(10);
 
     connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)),

src/gui/editors/matrix/MatrixView.cpp

@@ -2117,7 +2117,7 @@ MatrixView::initActionsToolbar()
 
     // The SnapGrid combo and Snap To... menu items
     //
-    TQLabel *sLabel = new TQLabel(i18n(" Grid: "), actionsToolbar, "kde toolbar widget");
+    TQLabel *sLabel = new TQLabel(i18n(" Grid: "), actionsToolbar, "tde toolbar widget");
     sLabel->setIndent(10);
 
     TQPixmap noMap = NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("menu-no-note"));
@@ -2156,7 +2156,7 @@ MatrixView::initActionsToolbar()
     // slow to use unless we make it typeable into, and then it takes
     // focus away from our more important widgets
 
-    TQLabel *vlabel = new TQLabel(i18n(" Velocity: "), actionsToolbar, "kde toolbar widget");
+    TQLabel *vlabel = new TQLabel(i18n(" Velocity: "), actionsToolbar, "tde toolbar widget");
     vlabel->setIndent(10);
     
     m_velocityCombo = new KComboBox(actionsToolbar);
@@ -2167,7 +2167,7 @@ MatrixView::initActionsToolbar()
 
     // Quantize combo
     //
-    TQLabel *qLabel = new TQLabel(i18n(" Quantize: "), actionsToolbar, "kde toolbar widget");
+    TQLabel *qLabel = new TQLabel(i18n(" Quantize: "), actionsToolbar, "tde toolbar widget");
     qLabel->setIndent(10);
 
     m_quantizeCombo = new KComboBox(actionsToolbar);
@@ -2217,11 +2217,11 @@ MatrixView::initZoomToolbar()
     }
 
     m_hZoomSlider = new ZoomSlider<double>
-                    (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "kde toolbar widget");
+                    (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "tde toolbar widget");
     m_hZoomSlider->setTracking(true);
     m_hZoomSlider->setFocusPolicy(TQ_NoFocus);
 
-    m_zoomLabel = new TQLabel(zoomToolbar, "kde toolbar widget");
+    m_zoomLabel = new TQLabel(zoomToolbar, "tde toolbar widget");
     m_zoomLabel->setIndent(10);
     m_zoomLabel->setFixedWidth(80);
 

src/gui/kdeext/klearlook.cpp

@@ -586,7 +586,7 @@ void KlearlookStyle::polish( TQPalette &pal ) {
     pal.setInactive( newInact );
 }
 
-static const char * kdeToolbarWidget = "kde toolbar widget";
+static const char * kdeToolbarWidget = "tde toolbar widget";
 
 void KlearlookStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) {
 	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
@@ -680,7 +680,7 @@ bool KlearlookStyle::objectEventHandler( const TQStyleControlElementData &ceData
 		TQObject* object = reinterpret_cast<TQObject*>(source);
 
 		if ( object->parent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) {
-			// Draw background for custom widgets in the toolbar that have specified a "kde toolbar widget" name.
+			// Draw background for custom widgets in the toolbar that have specified a "tde toolbar widget" name.
 			if ( TQEvent::Paint == event->type() ) {
 			TQWidget * widget = TQT_TQWIDGET( object ),
 				*parent = TQT_TQWIDGET( object->parent() );