Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 18 insertions, 18 deletions

diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index f55f6469b..4eaabd612 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -171,13 +171,13 @@ PluginFactory::~PluginFactory()
    s_instance = 0;
 }
 
-KParts::Part * PluginFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
                                          TQObject *parent, const char *name,
                                          const char *classname, const TQStringList &args)
 {
     Q_UNUSED(classname)
     kdDebug(1432) << "PluginFactory::create" << endl;
-    KParts::Part *obj = new PluginPart(tqparentWidget, widgetName, parent, name, args);
+    KParts::Part *obj = new PluginPart(parentWidget, widgetName, parent, name, args);
     return obj;
 }
 
@@ -201,7 +201,7 @@ KAboutData *PluginFactory::aboutData()
 /**************************************************************************/
 
 
-PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent,
+PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
                        const char *name, const TQStringList &args)
     : KParts::ReadOnlyPart(parent, name), _widget(0), _args(args),
       _destructed(0L)
@@ -226,7 +226,7 @@ PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObjec
     _callback = new NSPluginCallback(this);
 
     // create a canvas to insert our widget
-    _canvas = new PluginCanvasWidget( tqparentWidget, widgetName );
+    _canvas = new PluginCanvasWidget( parentWidget, widgetName );
     //_canvas->setFocusPolicy( TQWidget::ClickFocus );
     _canvas->setFocusPolicy( TQ_WheelFocus );
     _canvas->setBackgroundMode( TQWidget::NoBackground );
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index 6173eeed8..3e54af412 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -67,7 +67,7 @@ public:
   PluginFactory();
   virtual ~PluginFactory();
 
-  virtual KParts::Part * createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+  virtual KParts::Part * createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0,
   		            	    TQObject *parent = 0, const char *name = 0,
   			            const char *classname = "KParts::Part",
    			            const TQStringList &args = TQStringList());
@@ -102,7 +102,7 @@ class PluginPart: public KParts::ReadOnlyPart
 {
   Q_OBJECT
 public:
-  PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent,
+  PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
              const char *name, const TQStringList &args = TQStringList());
   virtual ~PluginPart();
 
diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h
index 4ba50e5ae..dff545d9f 100644
--- a/nsplugins/sdk/npupp.h
+++ b/nsplugins/sdk/npupp.h
@@ -1690,8 +1690,8 @@ typedef struct _NPNetscapeFuncs {
     NPN_PostURLNotifyUPP posturlnotify;
     NPN_GetValueUPP getvalue;
     NPN_SetValueUPP setvalue;
-    NPN_InvalidateRectUPP tqinvalidaterect;
-    NPN_InvalidateRegionUPP tqinvalidateregion;
+    NPN_InvalidateRectUPP invalidaterect;
+    NPN_InvalidateRegionUPP invalidateregion;
     NPN_ForceRedrawUPP forceredraw;
     NPN_GetStringIdentifierUPP getstringidentifier;
     NPN_GetStringIdentifiersUPP getstringidentifiers;
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index a349468da..ee3ca2d88 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1454,8 +1454,8 @@ int NSPluginClass::initialize()
    _nsFuncs.posturlnotify = g_NPN_PostURLNotify;
    _nsFuncs.getvalue = g_NPN_GetValue;
    _nsFuncs.setvalue = g_NPN_SetValue;
-   _nsFuncs.tqinvalidaterect = g_NPN_InvalidateRect;
-   _nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion;
+   _nsFuncs.invalidaterect = g_NPN_InvalidateRect;
+   _nsFuncs.invalidateregion = g_NPN_InvalidateRegion;
    _nsFuncs.forceredraw = g_NPN_ForceRedraw;
 
    // initialize plugin
diff --git a/nsplugins/wrapper/wrapper.c b/nsplugins/wrapper/wrapper.c
index acd07ea91..965868426 100644
--- a/nsplugins/wrapper/wrapper.c
+++ b/nsplugins/wrapper/wrapper.c
@@ -544,7 +544,7 @@ static
 void MyNPN_InvalidateRect(NPP instance, NPRect *invalidRect)
 {
 	DEB(ef, "-> NPN_InvalidateRect( %x, 0x%x )\n", instance, invalidRect);	
-	gNetscapeFuncs.tqinvalidaterect( instance, invalidRect );		
+	gNetscapeFuncs.invalidaterect( instance, invalidRect );		
 	DEB(ef, "<- NPN_InvalidateRect\n");	
 }
 
@@ -552,7 +552,7 @@ static
 void MyNPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
 {
 	DEB(ef, "-> NPN_InvalidateRegion( %x, 0x%x )\n", instance, invalidRegion);	
-	gNetscapeFuncs.tqinvalidateregion( instance, invalidRegion );		
+	gNetscapeFuncs.invalidateregion( instance, invalidRegion );		
 	DEB(ef, "<- NPN_InvalidateRegion\n");	
 }
 
@@ -605,8 +605,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 	DEB(ef, "nsTable->posturlnotify = 0x%x\n", nsTable->posturlnotify);
 	DEB(ef, "nsTable->getvalue = 0x%x\n", nsTable->getvalue);
 	DEB(ef, "nsTable->setvalue = 0x%x\n", nsTable->setvalue);
-	DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", nsTable->tqinvalidaterect);
-	DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", nsTable->tqinvalidateregion);
+	DEB(ef, "nsTable->invalidaterect = 0x%x\n", nsTable->invalidaterect);
+	DEB(ef, "nsTable->invalidateregion = 0x%x\n", nsTable->invalidateregion);
 	DEB(ef, "nsTable->forceredraw = 0x%x\n", nsTable->forceredraw);
 
 	DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);
@@ -659,8 +659,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 	gExtNetscapeFuncs.posturlnotify = MyNPN_PostURLNotify;
 	gExtNetscapeFuncs.getvalue = MyNPN_GetValue;
 	gExtNetscapeFuncs.setvalue = MyNPN_SetValue;
-	gExtNetscapeFuncs.tqinvalidaterect = MyNPN_InvalidateRect;
-	gExtNetscapeFuncs.tqinvalidateregion = MyNPN_InvalidateRegion;
+	gExtNetscapeFuncs.invalidaterect = MyNPN_InvalidateRect;
+	gExtNetscapeFuncs.invalidateregion = MyNPN_InvalidateRegion;
 	gExtNetscapeFuncs.forceredraw = MyNPN_ForceRedraw;	
 	
 	gPluginFuncs.size = sizeof( gPluginFuncs );
@@ -709,8 +709,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 		DEB(ef, "nsTable->posturlnotify = 0x%x\n", gExtNetscapeFuncs.posturlnotify);
 		DEB(ef, "nsTable->getvalue = 0x%x\n", gExtNetscapeFuncs.getvalue);
 		DEB(ef, "nsTable->setvalue = 0x%x\n", gExtNetscapeFuncs.setvalue);
-		DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", gExtNetscapeFuncs.tqinvalidaterect);
-		DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", gExtNetscapeFuncs.tqinvalidateregion);
+		DEB(ef, "nsTable->invalidaterect = 0x%x\n", gExtNetscapeFuncs.invalidaterect);
+		DEB(ef, "nsTable->invalidateregion = 0x%x\n", gExtNetscapeFuncs.invalidateregion);
 		DEB(ef, "nsTable->forceredraw = 0x%x\n", gExtNetscapeFuncs.forceredraw);
 
 		DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);