diff options
Diffstat (limited to 'kicker/menuext')
| -rw-r--r-- | kicker/menuext/konsole/konsole_mnu.cpp | 2 | ||||
| -rw-r--r-- | kicker/menuext/konsole/konsolebookmarkhandler.cpp | 2 | ||||
| -rw-r--r-- | kicker/menuext/konsole/konsolebookmarkmenu.cpp | 2 | ||||
| -rw-r--r-- | kicker/menuext/prefmenu/prefmenu.cpp | 4 | ||||
| -rw-r--r-- | kicker/menuext/tom/tom.cc | 12 |
5 files changed, 11 insertions, 11 deletions
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index e9f1cede1..7eab40c34 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -185,7 +185,7 @@ void KonsoleMenu::initialize() screenList.append(TQFile::decodeName(entry->d_name)); insertItem(SmallIconSet("konsole"), i18n("Screen is a program controlling screens!", - "Screen at %1").tqarg(entry->d_name), id); + "Screen at %1").arg(entry->d_name), id); id++; } } diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index e515e41f5..63292a472 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kbookmarkimporter.h> #include <kmimetype.h> diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 1643195e8..c2335702e 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kbookmarkimporter.h> #include <kmimetype.h> diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 3f50e5275..93a948dee 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -113,7 +113,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, } // ignore dotfiles. - if ((serviceName.tqat(0) == '.')) + if ((serviceName.at(0) == '.')) { return; } @@ -290,7 +290,7 @@ void PrefMenu::initialize() } // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) { continue; } diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index f2689bc1f..6b30f0ef6 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -26,7 +26,7 @@ using namespace std; #include <tqdir.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqregexp.h> #include <tqsettings.h> @@ -109,7 +109,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); - m_runEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); runLayout->addWidget(m_runEdit, 10); runLayout->addSpacing(KDialog::spacingHint()); @@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().tqdrawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -736,13 +736,13 @@ void TOM::setMaximumSize(int w, int h) TQRect TOM::sideImageRect() { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), height() - 2*frameWidth() ), this ); } void TOM::resizeEvent(TQResizeEvent * e) { - setFrameRect( TQStyle::tqvisualRect( TQRect( m_sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0, width() - m_sidePixmap.width(), height() ), this ) ); } @@ -757,7 +757,7 @@ void TOM::paintEvent(TQPaintEvent * e) tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); |