summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-03 23:02:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-03 23:02:47 -0600
commita50010465ab0fa1ded54efb4f41d342d9d49971e (patch)
treed51d7c5a15ae67997a195b9731841e8b22f0e1b1
parent52265b4dd69b6540ffd5f522bf3a90e9c4284917 (diff)
downloadtdesdk-a50010465ab0fa1ded54efb4f41d342d9d49971e.tar.gz
tdesdk-a50010465ab0fa1ded54efb4f41d342d9d49971e.zip
Rename KStyle to TDEStyle to avoid conflicts with KDE4
-rw-r--r--kuiviewer/kuiviewer_part.cpp2
-rw-r--r--scheck/scheck.cpp32
-rw-r--r--scheck/scheck.h4
3 files changed, 19 insertions, 19 deletions
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index 7a33904c..03d272bb 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -79,7 +79,7 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName,
m_style->setEditable(false);
kapp->config()->setGroup("General");
- const TQString currentStyle = kapp->config()->readEntry("currentWidgetStyle", KStyle::defaultStyle());
+ const TQString currentStyle = kapp->config()->readEntry("currentWidgetStyle", TDEStyle::defaultStyle());
const TQStringList styles = TQStyleFactory::keys();
m_style->setItems(styles);
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index 742a674a..a861cb70 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -876,7 +876,7 @@ void StyleCheckTitleWatcher::slotCheck()
StyleCheckStyle::StyleCheckStyle( )
- : KStyle( 0 , ThreeButtonScrollBar )
+ : TDEStyle( 0 , ThreeButtonScrollBar )
{
hoverWidget = 0L;
topLevelAccelManageTimer = new TQTimer(this);
@@ -968,7 +968,7 @@ void StyleCheckStyle::polish(TQStyleControlElementData ceData, ControlElementFla
}
}
- KStyle::polish( ceData, elementFlags, ptr );
+ TDEStyle::polish( ceData, elementFlags, ptr );
}
@@ -992,7 +992,7 @@ void StyleCheckStyle::unPolish(TQStyleControlElementData ceData, ControlElementF
}
}
- KStyle::unPolish( ceData, elementFlags, ptr );
+ TDEStyle::unPolish( ceData, elementFlags, ptr );
}
@@ -1423,7 +1423,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
p->drawLine(x+1, y+1, x+1, y2-1);
p->setPen(oldPen);
} else
- KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+ TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
break;
}
@@ -1528,13 +1528,13 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
p->restore();
} else
- KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
+ TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
}
}
}
-void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void StyleCheckStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
TQPainter* p,
TQStyleControlElementData ceData,
ControlElementFlags elementFlags,
@@ -1710,7 +1710,7 @@ void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe,
}
default:
- KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+ TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
}
}
@@ -2176,7 +2176,7 @@ void StyleCheckStyle::drawControl( ControlElement element,
}
default:
- KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+ TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
}
}
@@ -2204,7 +2204,7 @@ void StyleCheckStyle::drawControlMask( ControlElement element,
}
default:
- KStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget);
+ TDEStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget);
}
}
@@ -2393,7 +2393,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control,
default:
- KStyle::drawComplexControl(control, p, ceData, elementFlags,
+ TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
r, cg, flags, controls, active, opt, widget);
break;
}
@@ -2424,7 +2424,7 @@ void StyleCheckStyle::drawComplexControlMask( ComplexControl control,
}
default:
- KStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget);
+ TDEStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget);
}
}
@@ -2452,7 +2452,7 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQStyleControlElementData ceDat
wrect.width() - dfw2 - dbw2 - 1,
wrect.height() - dfw2 - dbw2 - 1);
} else
- return KStyle::subRect(r, ceData, elementFlags, widget);
+ return TDEStyle::subRect(r, ceData, elementFlags, widget);
}
@@ -2483,7 +2483,7 @@ int StyleCheckStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData
}
default:
- return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+ return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
}
}
@@ -2586,7 +2586,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
default:
- return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+ return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
}
}
@@ -2607,13 +2607,13 @@ TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap,
break;
}
- return KStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
+ return TDEStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
}
bool StyleCheckStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
{
- if (KStyle::objectEventHandler( ceData, elementFlags, source, event ))
+ if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
return true;
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
diff --git a/scheck/scheck.h b/scheck/scheck.h
index ca3e4a76..880913b6 100644
--- a/scheck/scheck.h
+++ b/scheck/scheck.h
@@ -67,7 +67,7 @@ class StyleCheckTitleWatcher: public TQObject
TQValueVector<TQString> watchedTitles;
};
-class StyleCheckStyle : public KStyle
+class StyleCheckStyle : public TDEStyle
{
Q_OBJECT
@@ -80,7 +80,7 @@ class StyleCheckStyle : public KStyle
void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
- void drawKStylePrimitive( KStylePrimitive kpe,
+ void drawTDEStylePrimitive( TDEStylePrimitive kpe,
TQPainter* p,
TQStyleControlElementData ceData,
ControlElementFlags elementFlags,