summaryrefslogtreecommitdiffstats
path: root/kicker/applets/swallow/swallow.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 /kicker/applets/swallow/swallow.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 'kicker/applets/swallow/swallow.cpp')
-rw-r--r--kicker/applets/swallow/swallow.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index cdc312bc5..7112c706a 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -76,8 +76,8 @@ SwallowApplet::SwallowApplet( const TQString& configFile,
TQBoxLayout::Direction d = (orientation() == Horizontal) ?
TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom;
- m_tqlayout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable?
- m_tqlayout->setAutoAdd( false );
+ m_layout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable?
+ m_layout->setAutoAdd( false );
// read the config file and start all the configured apps
createApps( readConfig() );
@@ -164,7 +164,7 @@ void SwallowApplet::createApps( SwallowCommandList* list )
kapp->processEvents();
}
- m_tqlayout->activate();
+ m_layout->activate();
}
@@ -189,7 +189,7 @@ void SwallowApplet::embedded( SwallowApp *app )
else
resize( width(), heightForWidth( width() ));
- m_tqlayout->addWidget( app );
+ m_layout->addWidget( app );
app->show();
updateGeometry();
emit updateLayout();
@@ -206,7 +206,7 @@ int SwallowApplet::widthForHeight(int he)
{
kdDebug() << "**** width for h: " << he << endl;
int w = embeddedList->isEmpty() ? 30 : 0;
- tqlayoutApps();
+ layoutApps();
SwallowAppListIterator it( *embeddedList );
while ( it.current() ) {
kdDebug() << "current: " << it.current()->width() << endl;
@@ -222,7 +222,7 @@ int SwallowApplet::widthForHeight(int he)
int SwallowApplet::heightForWidth(int)
{
int h = embeddedList->isEmpty() ? 30 : 0;
- tqlayoutApps();
+ layoutApps();
SwallowAppListIterator it( *embeddedList );
while ( it.current() ) {
h += (it.current())->height();
@@ -233,12 +233,12 @@ int SwallowApplet::heightForWidth(int)
return h;
}
-void SwallowApplet::tqlayoutApps()
+void SwallowApplet::layoutApps()
{
if ( KPanelApplet::orientation() == Horizontal )
- m_tqlayout->setDirection( TQBoxLayout::LeftToRight );
+ m_layout->setDirection( TQBoxLayout::LeftToRight );
else
- m_tqlayout->setDirection( TQBoxLayout::TopToBottom );
+ m_layout->setDirection( TQBoxLayout::TopToBottom );
}
@@ -286,7 +286,7 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
parseCommand(process, swc->cmdline);
// move window out of sight
- // *process << "-tqgeometry";
+ // *process << "-geometry";
// *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
connect(process, TQT_SIGNAL(processExited(KProcess*)),
@@ -320,7 +320,7 @@ void SwallowApp::windowAdded(WId win)
if (winTitle == names[0]) {
kdDebug()<< "embedding window with title: "<<winTitle.latin1() << endl;
- TQRect r = KWin::windowInfo(win).tqgeometry();
+ TQRect r = KWin::windowInfo(win).geometry();
int h = r.height();
if ( h == 0 ) h = 1;
wh_ratio = (float) r.width() / (float) h;