summaryrefslogtreecommitdiffstats
path: root/kcontrol/componentchooser
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 /kcontrol/componentchooser
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 'kcontrol/componentchooser')
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index abe1e5c74..403219de8 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -417,7 +417,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
TQWidget *newConfigWidget = 0;
if (cfgType.isEmpty() || (cfgType=="component"))
{
- if (!(configWidget && configWidget->tqqt_cast("CfgComponent")))
+ if (!(configWidget && configWidget->qt_cast("CfgComponent")))
{
CfgComponent* cfgcomp = new CfgComponent(configContainer);
cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text()));
@@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_email")
{
- if (!(configWidget && configWidget->tqqt_cast("CfgEmailClient")))
+ if (!(configWidget && configWidget->qt_cast("CfgEmailClient")))
{
newConfigWidget = new CfgEmailClient(configContainer);
}
@@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_terminal")
{
- if (!(configWidget && configWidget->tqqt_cast("CfgTerminalEmulator")))
+ if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator")))
{
newConfigWidget = new CfgTerminalEmulator(configContainer);
}
@@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_browser")
{
- if (!(configWidget && configWidget->tqqt_cast("CfgBrowser")))
+ if (!(configWidget && configWidget->qt_cast("CfgBrowser")))
{
newConfigWidget = new CfgBrowser(configContainer);
}
@@ -465,7 +465,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
if (configWidget)
- static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg);
+ static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->load(&cfg);
emitChanged(false);
latestEditedService=static_cast<MyListBoxItem*>(it)->File;
@@ -487,7 +487,7 @@ void ComponentChooser::load() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
- configWidget->tqqt_cast( "CfgPlugin" ) );
+ configWidget->qt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@@ -500,7 +500,7 @@ void ComponentChooser::save() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
- configWidget->tqqt_cast( "CfgPlugin" ) );
+ configWidget->qt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@@ -512,7 +512,7 @@ void ComponentChooser::save() {
void ComponentChooser::restoreDefault() {
if (configWidget)
{
- static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->defaults();
+ static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->defaults();
emitChanged(true);
}