TDE
/
kima
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kima
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename obsolete tq methods to standard names

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 5599badf00
commit aab6b7485c
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
src/flowlayout.cpp
Unescape View File

@ -156,7 +156,7 @@ bool FlowLayout::moveItem(const TQLayoutItem* which, const TQLayoutItem* relate,
newPos += direction;
// actually reinsert the item
mLayoutItems.insert(newPos, which);
activate(); // retqlayout
activate(); // relayout
// kdDebug() << "oldPos: " << oldPos << ", newPos: " << newPos << endl;
return true;
}
@ -271,7 +271,7 @@ int FlowLayout::doLayoutHorizontal( const TQRect& rect, bool testOnly ){
for(TQLayoutItem* item = column.first(); item; item = column.next()){
rWidth = TQMAX( rWidth, item->widget()->sizeHint().width() );
}
// retqlayout the items of the former column
// relayout the items of the former column
int space = (rect.height() - height) / (column.count() + 1);
int i = 0; // counts the items of this column
for(TQLayoutItem* item = column.first(); item; item = column.next()){

4
src/flowlayout.h
Unescape View File

@ -49,7 +49,7 @@ public:
void addSource(Source* src);
void remove(TQWidget* widget);
/**
* Returns the number of items in the tqlayout
* Returns the number of items in the layout
*/
uint count();
/**
@ -84,7 +84,7 @@ private:
int doLayoutVertical( const TQRect&, bool testOnly );
Qt::Orientation mOrientation;
TQPtrList<TQLayoutItem> mLayoutItems;
// this is the connection between a tqlayout item and its source.
// this is the connection between a layout item and its source.
TQMap<TQLayoutItem*, Source*> mSources;
TQLayoutItem* mLastItem; // the item that was last added
};

4
src/kima.cpp
Unescape View File

@ -99,7 +99,7 @@ Kima::Kima(const TQString& inConfigFile, Type inType, int inActions, TQWidget* i
// automatically delete pointers
mSources.setAutoDelete(TRUE);
// create tqlayout
// create layout
mLayout = new FlowLayout(this, orientation() );
mLayout->setSpacing(8);
@ -406,7 +406,7 @@ void Kima::registerSource(Source* source) {
// this call also emits enabledChanged
source->loadPrefs(mKConfig);
// add the source to the tqlayout if necessary
// add the source to the layout if necessary
displaySource(source->isEnabled() && source->showOnApplet(), source);
// connection to add and remove sources from mLayout

2
src/kima.h
Unescape View File

@ -155,7 +155,7 @@ public slots:
void raiseSourcePrefsWidget(TQListViewItem* inListViewItem);
/**
* adds or removes the given source from the display (tqlayout) of the kicker applet
* adds or removes the given source from the display (layout) of the kicker applet
*/
void displaySource(bool inDisplay, Source* inSource);

28
src/sources/labelsourcePrefs.cpp
Unescape View File

@ -44,36 +44,36 @@ LabelSourcePrefs::LabelSourcePrefs( TQWidget* parent, const char* name, WFlags f
taskbartitleLabel->setFont( taskbartitleLabel_font );
defaultSourcePrefsFrameLayout->addWidget( taskbartitleLabel );
tqlayout13 = new TQHBoxLayout( 0, 0, 6, "tqlayout13");
layout13 = new TQHBoxLayout( 0, 0, 6, "layout13");
colorLabel = new TQLabel( defaultSourcePrefsFrame, "colorLabel" );
tqlayout13->addWidget( colorLabel );
layout13->addWidget( colorLabel );
colorButton = new KColorButton( defaultSourcePrefsFrame, "colorButton" );
tqlayout13->addWidget( colorButton );
layout13->addWidget( colorButton );
spacer1 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
tqlayout13->addItem( spacer1 );
defaultSourcePrefsFrameLayout->addLayout( tqlayout13 );
layout13->addItem( spacer1 );
defaultSourcePrefsFrameLayout->addLayout( layout13 );
tqlayout17 = new TQHBoxLayout( 0, 0, 6, "tqlayout17");
layout17 = new TQHBoxLayout( 0, 0, 6, "layout17");
fontLabel = new TQLabel( defaultSourcePrefsFrame, "fontLabel" );
tqlayout17->addWidget( fontLabel );
layout17->addWidget( fontLabel );
fontRequester = new KFontRequester( defaultSourcePrefsFrame, "fontRequester" );
tqlayout17->addWidget( fontRequester );
defaultSourcePrefsFrameLayout->addLayout( tqlayout17 );
layout17->addWidget( fontRequester );
defaultSourcePrefsFrameLayout->addLayout( layout17 );
tqlayout18 = new TQHBoxLayout( 0, 0, 6, "tqlayout18");
layout18 = new TQHBoxLayout( 0, 0, 6, "layout18");
alignmentLabel = new TQLabel( defaultSourcePrefsFrame, "alignmentLabel" );
tqlayout18->addWidget( alignmentLabel );
layout18->addWidget( alignmentLabel );
alignmentComboBox = new TQComboBox( FALSE, defaultSourcePrefsFrame, "alignmentComboBox" );
tqlayout18->addWidget( alignmentComboBox );
layout18->addWidget( alignmentComboBox );
spacer2 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
tqlayout18->addItem( spacer2 );
defaultSourcePrefsFrameLayout->addLayout( tqlayout18 );
layout18->addItem( spacer2 );
defaultSourcePrefsFrameLayout->addLayout( layout18 );
LabelSourcePrefsLayout->addWidget( defaultSourcePrefsFrame );
languageChange();
resize( TQSize(299, 135).expandedTo(minimumSizeHint()) );

6
src/sources/labelsourcePrefs.ui
Unescape View File

@ -55,7 +55,7 @@ Taskbar visual settings</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@ -98,7 +98,7 @@ Taskbar visual settings</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@ -121,7 +121,7 @@ Taskbar visual settings</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout18</cstring>
<cstring>layout18</cstring>
</property>
<hbox>
<property name="name">

4
src/sources/source.cpp
Unescape View File

@ -107,7 +107,7 @@ TQWidget* Source::createPrefs(TQWidget* inParent){
createSubPrefs(mSourcePrefs);
// add bottom vspacer
mSourcePrefs->tqlayout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
mSourcePrefs->layout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
updatePrefsGUI(); // fill the prefs gui
}
@ -140,7 +140,7 @@ void Source::setPrefsWidgetsEnabled(bool isEnabled, bool isShownOnApplet){
void Source::addPrefs(TQWidget* inParent){
if(inParent != NULL)
mSourcePrefs->tqlayout()->add(inParent);
mSourcePrefs->layout()->add(inParent);
}
void Source::applyPrefs(){

8
src/sources/source.h
Unescape View File

@ -48,12 +48,12 @@ public:
const TQString& getID() const;
/**
* Returns the position of this source in the tqlayout
* Returns the position of this source in the layout
*/
int getPosition() const;
/**
* Sets the position of this source in the tqlayout
* Sets the position of this source in the layout
*/
void setPosition(int inPosition, KConfig* inKConfig);
@ -147,7 +147,7 @@ signals:
*/
void enabledChanged(bool inEnabled, Source* inSource); // needed by kima.cpp to add sources to its tqlayout
/**
* This signal is emitted whenever this Source should be added or removed from the display (tqlayout) of the kicker applet
* This signal is emitted whenever this Source should be added or removed from the display (layout) of the kicker applet
*/
void displaySource(bool inDisplay, Source* inSource);
@ -179,7 +179,7 @@ protected:
*/
TQString mID;
/**
* The Position of the source in the tqlayout
* The Position of the source in the layout
*/
int mPosition;
/**

Write Preview
Loading…
Cancel
Save