summaryrefslogtreecommitdiffstats
path: root/kdm/kfrontend
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
commitcc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch)
tree2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /kdm/kfrontend
parent107dd1f98367d07df7cbe2042786511e44706d3a (diff)
downloadtdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz
tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdm/kfrontend')
-rw-r--r--kdm/kfrontend/kgverify.cpp4
-rw-r--r--kdm/kfrontend/themer/kdmitem.cpp6
-rw-r--r--kdm/kfrontend/themer/kdmitem.h2
-rw-r--r--kdm/kfrontend/themer/kdmlabel.cpp4
-rw-r--r--kdm/kfrontend/themer/kdmpixmap.cpp2
-rw-r--r--kdm/kfrontend/themer/kdmthemer.cpp2
6 files changed, 10 insertions, 10 deletions
diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp
index b80f63279..4748b3f62 100644
--- a/kdm/kfrontend/kgverify.cpp
+++ b/kdm/kfrontend/kgverify.cpp
@@ -952,7 +952,7 @@ KGStdVerify::slotPluginSelected( int id )
return;
if (id != curPlugin) {
plugMenu->setItemChecked( curPlugin, false );
- parent->setUpdatesEnabled( false );
+ parent->tqsetUpdatesEnabled( false );
grid->removeItem( greet->getLayoutItem() );
Debug( "delete %s\n", pName.data() );
delete greet;
@@ -960,7 +960,7 @@ KGStdVerify::slotPluginSelected( int id )
handler->verifyPluginChanged( id );
if (running)
start();
- parent->setUpdatesEnabled( true );
+ parent->tqsetUpdatesEnabled( true );
}
}
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 3d81de58a..2d3f841f4 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -564,7 +564,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
} else { // int value
dType = DTpixel;
TQString sCopy = s;
- if (sCopy.at( 0 ) == '-') {
+ if (sCopy.tqat( 0 ) == '-') {
sCopy.remove( 0, 1 );
dType = DTnpixel;
}
@@ -588,7 +588,7 @@ KdmItem::parseFont( const TQString &s, TQFont &font )
void
KdmItem::parseColor( const TQString &s, TQColor &color )
{
- if (s.at( 0 ) != '#')
+ if (s.tqat( 0 ) != '#')
return;
bool ok;
TQString sCopy = s;
@@ -621,7 +621,7 @@ KdmItem::tqparentWidget() const
if (!this->parent())
return 0;
- if (tqparent()->tqqt_cast("TQWidget"))
+ if (tqparent()->qt_cast("TQWidget"))
return (TQWidget*)parent();
return ((KdmItem*)parent())->tqparentWidget();
}
diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 31d4fcfa2..1c6450b50 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -147,7 +147,7 @@ public:
TQString baseDir() const
{
if (basedir.isEmpty() && parent())
- return static_cast<KdmItem *>( tqparent()->tqqt_cast( "KdmItem" ) )->baseDir();
+ return static_cast<KdmItem *>( tqparent()->qt_cast( "KdmItem" ) )->baseDir();
return basedir;
}
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index 55a993988..b36b7e5ad 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -177,8 +177,8 @@ KdmLabel::drawContents( TQPainter *p, const TQRect &/*r*/ )
TQFont f(l->font);
f.setUnderline(true);
p->setFont ( f );
- p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.at(cAccel)));
- tarea.rLeft() += fm.width(cText.at(cAccel));
+ p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.tqat(cAccel)));
+ tarea.rLeft() += fm.width(cText.tqat(cAccel));
p->setFont( l->font );
p->drawText( tarea, AlignLeft | SingleLine, right);
} else {
diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index 2322312e8..9b90799d5 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -128,7 +128,7 @@ KdmPixmap::fullPath( const TQString &fileName)
return TQString::null;
TQString fullName = fileName;
- if (fullName.at( 0 ) != '/')
+ if (fullName.tqat( 0 ) != '/')
fullName = baseDir() + "/" + fileName;
return fullName;
}
diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp
index f95343787..5ff9b6711 100644
--- a/kdm/kfrontend/themer/kdmthemer.cpp
+++ b/kdm/kfrontend/themer/kdmthemer.cpp
@@ -358,7 +358,7 @@ KdmThemer::slotActivated( const TQString &id )
return;
item->widget()->setFocus();
- TQLineEdit *le = (TQLineEdit*)item->widget()->tqqt_cast("TQLineEdit");
+ TQLineEdit *le = (TQLineEdit*)item->widget()->qt_cast("TQLineEdit");
if (le)
le->selectAll();
}