summaryrefslogtreecommitdiffstats
path: root/tdeui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 15:08:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 15:08:51 -0600
commitfb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0 (patch)
treea01fcd88aa65a77c2b2e12ba1a55851ddfe5afcc /tdeui
parent3fbca5d9a4bd057ed5f9df138333e6c16dbdcc62 (diff)
downloadtdelibs-fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0.tar.gz
tdelibs-fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0.zip
Fix kdelibs FTBFS on native TQt3
Diffstat (limited to 'tdeui')
-rw-r--r--tdeui/kcolordialog.cpp2
-rw-r--r--tdeui/kmainwindow.cpp4
-rw-r--r--tdeui/kmenubar.cpp4
-rw-r--r--tdeui/kseparator.cpp4
-rw-r--r--tdeui/qxembed.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index a9b1c36ac..cb5b9906a 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -1221,7 +1221,7 @@ KColorDialog::setDefaultColor( const TQColor& col )
d->l_right->addWidget( d->cbDefaultColor );
- mainWidget()->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); // cancel setFixedSize()
+ mainWidget()->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); // cancel setFixedSize()
d->tl_layout->activate();
mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() );
disableResize();
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index 90d572bda..ffd16d0ef 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -90,7 +90,7 @@ public:
~KMWSessionManaged()
{
}
- bool saveState( QSessionManager& )
+ bool saveState( TQSessionManager& )
{
KConfig* config = KApplication::kApplication()->sessionConfig();
if ( KMainWindow::memberList->first() ){
@@ -110,7 +110,7 @@ public:
return true;
}
- bool commitData( QSessionManager& sm )
+ bool commitData( TQSessionManager& sm )
{
// not really a fast method but the only compatible one
if ( sm.allowsInteraction() ) {
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index 7febea06f..f5d464216 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -215,7 +215,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
setLineWidth( d->lineWidth );
setMargin( d->margin );
setMinimumSize( 0, 0 );
- setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+ setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
updateMenuBarSize();
if ( parentWidget() )
reparent( parentWidget(), TQPoint(0,0), !isHidden());
@@ -314,7 +314,7 @@ void KMenuBar::updateFallbackSize()
d->fallback_mode = false;
KWin::setStrut( winId(), 0, 0, 0, 0 );
setMinimumSize( 0, 0 );
- setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+ setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
updateMenuBarSize();
}
return;
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 1c1f43e96..29ca5e83a 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -81,8 +81,8 @@ int KSeparator::orientation() const
void KSeparator::drawFrame(TQPainter *p)
{
- QPoint p1, p2;
- QRect r = frameRect();
+ TQPoint p1, p2;
+ TQRect r = frameRect();
const TQColorGroup & g = tqcolorGroup();
if ( frameStyle() & HLine ) {
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index 03d9ca1d2..e81e58b3c 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -176,7 +176,7 @@ static XKeyEvent last_key_event;
class QPublicWidget : public TQWidget
{
public:
- QTLWExtra* topData() { return TQWidget::topData(); }
+ TQTLWExtra* topData() { return TQWidget::topData(); }
TQFocusData *focusData(){ return TQWidget::focusData(); }
bool focusNextPrev(bool b) { return focusNextPrevChild(b); }
};
@@ -443,7 +443,7 @@ static int qxembed_x11_event_filter( XEvent* e)
switch ( message) {
case XEMBED_EMBEDDED_NOTIFY: {
// L0675: We just have been embedded into a XEMBED aware widget.
- QTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData();
+ TQTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData();
extra->embedded = 1;
#ifdef USE_QT4
// [FIXME]