summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-02 04:18:40 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-02 04:18:40 +0000
commit2a899a60c990d7254f579f463187eb0a55a14a64 (patch)
tree90060d127fdd32e2d2efd4972baf297b0299bea7
parent52fcbf9fceb7b4fc9a5a8a94352e58496591771f (diff)
downloadtdebase-2a899a60c990d7254f579f463187eb0a55a14a64.tar.gz
tdebase-2a899a60c990d7254f579f463187eb0a55a14a64.zip
[CRITICAL] Fix additional rendering issues left over from initial TQt conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1181781 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--drkonqi/backtrace.cpp2
-rw-r--r--kdeprint/kdeprintfax/faxctrl.cpp2
-rw-r--r--klipper/toplevel.cpp6
-rw-r--r--konqueror/konq_actions.cc2
-rw-r--r--konqueror/konq_mainwindow.cc2
-rw-r--r--konqueror/konq_view.cc4
-rw-r--r--konsole/konsole/konsole.cpp2
-rw-r--r--kwin/workspace.cpp2
8 files changed, 11 insertions, 11 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index 8607c5b7..c60d6a41 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -73,7 +73,7 @@ void BackTrace::start()
{
TQObject * o = parent();
- if (o && !o->inherits("TQWidget"))
+ if (o && !o->inherits("QWidget"))
{
o = NULL;
}
diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp
index bbd8fce5..1d1cd1fa 100644
--- a/kdeprint/kdeprintfax/faxctrl.cpp
+++ b/kdeprint/kdeprintfax/faxctrl.cpp
@@ -604,7 +604,7 @@ void FaxCtrl::slotCloseLog()
{
QTextEdit *view = m_logview;
m_logview = 0;
- if (obj && obj->inherits("TQPushButton"))
+ if (obj && obj->inherits("QPushButton"))
delete view->parentWidget();
kdDebug() << "slotClose()" << endl;
}
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index ec8dec11..8b2bcb0e 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -1016,10 +1016,10 @@ bool KlipperWidget::ignoreClipboardChanges() const
TQWidget *focusWidget = qApp->focusWidget();
if ( focusWidget )
{
- if ( focusWidget->inherits( "TQSpinBox" ) ||
+ if ( focusWidget->inherits( "QSpinBox" ) ||
(focusWidget->parentWidget() &&
- focusWidget->inherits("TQLineEdit") &&
- focusWidget->parentWidget()->inherits("TQSpinWidget")) )
+ focusWidget->inherits("QLineEdit") &&
+ focusWidget->parentWidget()->inherits("QSpinWidget")) )
{
return true;
}
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index 7e1069ba..7cb8a614 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@@ -94,7 +94,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
return -1;
// Go menu
- if ( widget->inherits("TQPopupMenu") )
+ if ( widget->inherits("QPopupMenu") )
{
m_goMenu = (TQPopupMenu*)widget;
// Forward signal (to main view)
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 964870ce..ada6c2ef 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1044,7 +1044,7 @@ TQObject *KonqMainWindow::lastFrame( KonqView *view )
TQObject *nextFrame, *viewFrame;
nextFrame = view->frame();
viewFrame = 0;
- while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) {
+ while ( nextFrame != 0 && ! nextFrame->inherits( "QWidgetStack" ) ) {
viewFrame = nextFrame;
nextFrame = nextFrame->parent();
}
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index aa96171f..b27779a4 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -472,7 +472,7 @@ void KonqView::connectPart( )
m_pPart->widget()->installEventFilter( this );
- if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
+ if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") )
{
(static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
}
@@ -1220,7 +1220,7 @@ void KonqView::reparseConfiguration()
bool b = KonqSettings::backRightClick();
if ( m_bBackRightClick != b )
{
- if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
+ if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") )
{
(static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
}
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index e8dacbe5..ecef79d4 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -479,7 +479,7 @@ void Konsole::makeGUI()
// Remove the empty separator Qt inserts if the menu is empty on popup,
// not sure if this will be "fixed" in Qt, for now use this hack (malte)
if(!(isRestored)) {
- if (sender() && sender()->inherits("TQPopupMenu") &&
+ if (sender() && sender()->inherits("QPopupMenu") &&
static_cast<const TQPopupMenu *>(sender())->count() == 1)
const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0);
}
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index fe8ad8fa..2d4eea00 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -1907,7 +1907,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
if ( !w )
return state;
TQWidget* widget = TQWidget::find( w );
- if ( (!widget || widget->inherits("TQToolButton") ) && !findClient( WindowMatchPredicate( w )) )
+ if ( (!widget || widget->inherits("QToolButton") ) && !findClient( WindowMatchPredicate( w )) )
{
int x, y;
Window xw;