summaryrefslogtreecommitdiffstats
path: root/kicker/kicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker')
-rw-r--r--kicker/kicker/core/container_applet.cpp2
-rw-r--r--kicker/kicker/core/container_applet.h2
-rw-r--r--kicker/kicker/core/container_base.cpp2
-rw-r--r--kicker/kicker/core/container_base.h2
-rw-r--r--kicker/kicker/core/container_extension.cpp10
-rw-r--r--kicker/kicker/core/container_extension.h2
-rw-r--r--kicker/kicker/ui/itemview.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp8
-rw-r--r--kicker/kicker/ui/kickoff_bar.cpp2
9 files changed, 16 insertions, 16 deletions
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index ad17182b0..a6cfc11ab 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -354,7 +354,7 @@ void AppletContainer::slotDelayedDestruct()
delete this;
}
-void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a)
+void AppletContainer::alignmentChange(KPanelExtension::Alignment a)
{
if (!_applet)
{
diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h
index fea4d92a1..019e52c96 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -84,7 +84,7 @@ public slots:
protected:
virtual void doLoadConfiguration( KConfigGroup& );
virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
- virtual void tqalignmentChange(KPanelExtension::Alignment a);
+ virtual void alignmentChange(KPanelExtension::Alignment a);
virtual TQPopupMenu* createOpMenu();
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index 2747905cd..2607e3608 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -118,7 +118,7 @@ void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a)
}
_tqalignment = a;
- tqalignmentChange(a);
+ alignmentChange(a);
}
TQPopupMenu* BaseContainer::opMenu()
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index 078926a07..f9c449b1f 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -111,7 +111,7 @@ protected:
virtual void doLoadConfiguration( KConfigGroup& ) {}
virtual void doSaveConfiguration( KConfigGroup&,
bool /* layoutOnly */ ) const {}
- virtual void tqalignmentChange(KPanelExtension::Alignment) {}
+ virtual void alignmentChange(KPanelExtension::Alignment) {}
virtual TQPopupMenu* createOpMenu() = 0;
TQPopupMenu *appletOpMenu() const { return _appletOpMnu; }
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 0c22245bc..c659c1002 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -293,7 +293,7 @@ void ExtensionContainer::readConfig()
}
positionChange(position());
- tqalignmentChange(tqalignment());
+ alignmentChange(tqalignment());
setSize(static_cast<KPanelExtension::Size>(m_settings.size()),
m_settings.customSize());
@@ -471,7 +471,7 @@ void ExtensionContainer::moveMe()
KPanelExtension::Right,
KPanelExtension::Top,
KPanelExtension::Bottom };
- KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop,
+ KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop,
KPanelExtension::Center,
KPanelExtension::RightBottom };
@@ -494,8 +494,8 @@ void ExtensionContainer::moveMe()
// they don't get their "you're changing position" signals through
// heightForWidth/widthForHeight
rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i],
- tqalignments[j], s),
- s, positions[i], tqalignments[j]));
+ alignments[j], s),
+ s, positions[i], alignments[j]));
}
}
}
@@ -1368,7 +1368,7 @@ void ExtensionContainer::leaveEvent(TQEvent*)
maybeStartAutoHideTimer();
}
-void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a)
+void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a)
{
if (!m_extension)
{
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index fdb3be989..735aa2c85 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -159,7 +159,7 @@ private:
int XineramaScreen, const TQSize &s, TQRect workArea,
bool autohidden = false, UserHidden userHidden = Unhidden) const;
void positionChange(KPanelExtension::Position p);
- void tqalignmentChange(KPanelExtension::Alignment a);
+ void alignmentChange(KPanelExtension::Alignment a);
void xineramaScreenChange(int /*XineramaScreen*/) {}
int arrangeHideButtons();
int setupBorderSpace();
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index d7df05170..f86ae537a 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -762,7 +762,7 @@ void ItemView::slotMoveContent()
TQListViewItemIterator it( this );
while ( it.current() ) {
if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) {
- it.current()->tqinvalidateHeight();
+ it.current()->invalidateHeight();
item_height += it.current()->totalHeight();
}
++it;
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 931419585..542e08be9 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -495,7 +495,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
if(raiseWidget)
break;
if(receiver->isWidgetType())
- receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->tqparentWidget(true));
+ receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));
else
break;
}
@@ -1556,7 +1556,7 @@ bool KMenu::runCommand()
case KURIFilterData::HELP:
{
// No need for kfmclient, KRun does it all (David)
- (void) new KRun( m_filterData->uri(), tqparentWidget());
+ (void) new KRun( m_filterData->uri(), parentWidget());
return false;
}
case KURIFilterData::EXECUTABLE:
@@ -2715,7 +2715,7 @@ void KMenu::slotStartURL(const TQString& u)
}
kapp->propagateSessionManager();
- (void) new KRun( u, tqparentWidget());
+ (void) new KRun( u, parentWidget());
}
}
@@ -3280,7 +3280,7 @@ void KMenu::searchActionClicked(TQListViewItem* item)
data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText()));
}
- (void) new KRun( data.uri(), tqparentWidget());
+ (void) new KRun( data.uri(), parentWidget());
}
}
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index 6fe731933..6be19459c 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -130,7 +130,7 @@ TQSize KickoffTabBar::tqsizeHint() const
void KickoffTabBar::layoutTabs()
{
- TQTabBar::tqlayoutTabs();
+ TQTabBar::layoutTabs();
TQFontMetrics fm = fontMetrics();
int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 06:40:24 +0000