summaryrefslogtreecommitdiffstats
path: root/konsole/konsole/main.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /konsole/konsole/main.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konsole/konsole/main.cpp')
-rw-r--r--konsole/konsole/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index a14372ce2..7be5e5146 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -324,7 +324,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
TQString term = "";
if(args->isSet("tn")) {
- term=TQString::tqfromLatin1(args->getOption("tn"));
+ term=TQString::fromLatin1(args->getOption("tn"));
}
login_shell = args->isSet("ls");
@@ -644,13 +644,13 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
//// Temporary code, waiting for Qt to do this properly
// Delete all toplevel widgets that have WDestructiveClose
- TQWidgetList *list = TQApplication::tqtopLevelWidgets();
+ TQWidgetList *list = TQApplication::topLevelWidgets();
// remove all toplevel widgets that have a parent (i.e. they
// got WTopLevel explicitly), they'll be deleted by the parent
list->first();
while( list->current())
{
- if( list->current()->tqparentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) )
+ if( list->current()->parentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) )
{
list->remove();
continue;