Rename a number of classes to enhance compatibility with KDE4

styles/phase/phasestyle.cpp

@@ -639,7 +639,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
           }
 
           if ((ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) ||
-                           (ceData.widgetObjectTypes.contains("KPopupTitle"))) {
+                           (ceData.widgetObjectTypes.contains("TDEPopupTitle"))) {
               // kicker/kdesktop menu titles
               drawPhaseBevel(painter, x,y,w,h,
                              group, group.background(), depress, !horiz);

tdescreensaver/kdesavers/banner.cpp

@@ -80,7 +80,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	label = new TQLabel( i18n("Family:"), group );
 	gl->addWidget(label, 1, 0);
 
-	KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group );
+	TDEFontCombo* comboFonts = new TDEFontCombo( TQFontDatabase().families(), group );
 	comboFonts->setCurrentFont( fontFamily );
 	gl->addWidget(comboFonts, 1, 1);
 	connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ),