diff options
Diffstat (limited to 'twin')
| -rw-r--r-- | twin/README | 6 | ||||
| -rw-r--r-- | twin/client.cpp | 6 | ||||
| -rw-r--r-- | twin/clients/PORTING | 8 | ||||
| -rw-r--r-- | twin/clients/keramik/embedtool.cpp | 4 | ||||
| -rw-r--r-- | twin/clients/plastik/misc.cpp | 4 | ||||
| -rw-r--r-- | twin/clients/plastik/plastikbutton.h | 2 | ||||
| -rw-r--r-- | twin/sm.h | 2 | ||||
| -rw-r--r-- | twin/tools/decobenchmark/preview.h | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/twin/README b/twin/README index 8d61c7163..d2fb31c75 100644 --- a/twin/README +++ b/twin/README @@ -163,16 +163,16 @@ WM_TRANSIENT_FOR property is manually set using the XSetTransientForHint() call (see tdelibs/tdeioslave/http/kcookiejar/kcookiewin.cpp). The arguments to XSetTransientForHint() call are the X display (i.e. qt_xdisplay()), the window id on which the WM_TRANSIENT_FOR property is to be set -(i.e. use QWidget::winId()), and the window id of the mainwindow. +(i.e. use TQWidget::winId()), and the window id of the mainwindow. Simple short HOWTO: To put it simply: Let's say you have a daemon application that has -DCOP call "showDialog( QString text )", and when this is called, it shows +DCOP call "showDialog( TQString text )", and when this is called, it shows a dialog with the given text. This won't work properly with focus stealing prevention. The DCOP call should be changed to -"showDialog( QString text, long id )". The caller should pass something like +"showDialog( TQString text, long id )". The caller should pass something like myMainWindow->winId() as the second argument. In the daemon, before the dialog is shown, a call to XSetTransientHint() should be added: diff --git a/twin/client.cpp b/twin/client.cpp index 8c303ec15..044d89208 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -1260,7 +1260,7 @@ void Client::drawShadow() removeShadow(); - TQMemArray<QRgb> pixelData; + TQMemArray<TQRgb> pixelData; TQPixmap shadowPixmap; TQRect shadow; TQRegion exposedRegion; @@ -1433,7 +1433,7 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w, */ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed) { - QRgb pixel; + TQRgb pixel; double opacity; int red, green, blue, pixelRed, pixelGreen, pixelBlue; int subW, subH, w, x, y, zeroX, zeroY; @@ -1490,7 +1490,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, TQRegion exposed, int thickness, double maxOpacity) { int distance, intersectCount, i, j, x, y; - QRgb pixel; + TQRgb pixel; double decay, factor, opacity; int red, green, blue, pixelRed, pixelGreen, pixelBlue; int lineIntersects, maxIntersects, maxY; diff --git a/twin/clients/PORTING b/twin/clients/PORTING index 0c0c1a6ea..c316bd4a9 100644 --- a/twin/clients/PORTING +++ b/twin/clients/PORTING @@ -13,7 +13,7 @@ Makefile.am: Sources: - There are no twin/something.h includes, and don't use the KWinInternal namespace. - Use QToolTip instead of KWinToolTip. -- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget +- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and TQWidget instead of KWinWidgetButton. - For tooltips, use simply QToolTip::add(). - Change Client* to MyClient* (or whatever is your main client class) in your MyButton. @@ -26,11 +26,11 @@ Sources: - As the first thing in init(), call createMainWidget(); if your client class took some flags such as WResizeNoErase, pass them to this function. - Then, do 'widget()->installEventFilter( this );'. -- Implement MyClient::eventFilter() - as MyClient is now no longer QWidget, you need the event +- Implement MyClient::eventFilter() - as MyClient is now no longer TQWidget, you need the event filter to call all the functions that used to be called directly. Usually, it's something like: ===== -bool MyClient::eventFilter( QObject* o, QEvent* e ) +bool MyClient::eventFilter( TQObject* o, QEvent* e ) { if ( o != widget() ) return false; @@ -67,7 +67,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e ) } ===== - In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention - to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ). + to cases where this won't cause compile error (e.g. in connect() calls, which take TQObject* ). - Also, many calls may need 'widget()->' prepended. - Layout is created in init(), so call createLayout() directly there (if it's implemented). - Remove calls to Client methods (Client::resizeEvent() and so on). diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp index 88cf93838..8d39f9650 100644 --- a/twin/clients/keramik/embedtool.cpp +++ b/twin/clients/keramik/embedtool.cpp @@ -101,7 +101,7 @@ void KeramikEmbedder::embed( const char *name ) codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); - stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t"; + stream << "\tstatic const TQRgb " << codename << "_data[] = {" << endl << "\t\t"; stream.setf( TQTextStream::hex | TQTextStream::right ); stream.fill( '0' ); @@ -147,7 +147,7 @@ void KeramikEmbedder::writeIndex() stream << "\t\tint width;\n"; stream << "\t\tint height;\n"; stream << "\t\tbool alpha;\n"; - stream << "\t\tconst QRgb *data;\n"; + stream << "\t\tconst TQRgb *data;\n"; stream << "\t};\n\n"; uint i = 0; diff --git a/twin/clients/plastik/misc.cpp b/twin/clients/plastik/misc.cpp index 1b259d383..053cf15ea 100644 --- a/twin/clients/plastik/misc.cpp +++ b/twin/clients/plastik/misc.cpp @@ -54,8 +54,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i { // normal button... - QRgb rgb = bgColor.rgb(); - QRgb rgb_b = fgColor.rgb(); + TQRgb rgb = bgColor.rgb(); + TQRgb rgb_b = fgColor.rgb(); int alpha = a; if(alpha>255) alpha = 255; if(alpha<0) alpha = 0; diff --git a/twin/clients/plastik/plastikbutton.h b/twin/clients/plastik/plastikbutton.h index 6da87100f..6deaa56f6 100644 --- a/twin/clients/plastik/plastikbutton.h +++ b/twin/clients/plastik/plastikbutton.h @@ -65,7 +65,7 @@ private: /** * This class creates bitmaps which can be used as icons on buttons. The icons * are "hardcoded". - * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->TQPixmap" solution + * Over the previous "Gimp->xpm->TQImage->recolor->SmoothScale->TQPixmap" solution * it has the important advantage that icons are more scalable and at the same * time sharp and not blurred. */ @@ -59,7 +59,7 @@ enum SMSavePhase }; class SessionSaveDoneHelper - : public QObject + : public TQObject { TQ_OBJECT public: diff --git a/twin/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h index d69a2f57f..38cd08b19 100644 --- a/twin/tools/decobenchmark/preview.h +++ b/twin/tools/decobenchmark/preview.h @@ -30,7 +30,7 @@ class KDecorationPreviewBridge; class KDecorationPreviewOptions; class KDecorationPreview - : public QWidget + : public TQWidget { public: KDecorationPreview( KDecorationPlugins* plugin, TQWidget* parent = NULL, const char* name = NULL ); |