diff options
Diffstat (limited to 'koshell')
-rw-r--r-- | koshell/iconsidepane.cpp | 20 | ||||
-rw-r--r-- | koshell/iconsidepane.h | 10 | ||||
-rw-r--r-- | koshell/koshell_shell.cc | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 7f3371e4..93bbb6c4 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -126,13 +126,13 @@ void EntryItem::paint( TQPainter *p ) TQBrush brush; if ( isCurrent() || isSelected() || mPaintActive ) - brush = box->colorGroup().brush( TQColorGroup::Highlight ); + brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); else - brush = TQBrush(box->colorGroup().highlight().light( 115 )); + brush = TQBrush(box->tqcolorGroup().highlight().light( 115 )); p->fillRect( 1, 0, w - 2, h - 1, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->colorGroup().mid() ); + pen.setColor( box->tqcolorGroup().mid() ); p->setPen( pen ); p->drawPoint( 1, 0 ); @@ -149,9 +149,9 @@ void EntryItem::paint( TQPainter *p ) p->drawPixmap( x, y, mPixmap ); } - TQColor shadowColor = listBox()->colorGroup().background().dark(115); + TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115); if ( isCurrent() || isSelected() ) { - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } if ( !text().isEmpty() && navigator()->showText() ) { @@ -176,13 +176,13 @@ void EntryItem::paint( TQPainter *p ) } if ( isCurrent() || isSelected() || mHasHover ) { - p->setPen( box->colorGroup().highlight().dark(115) ); + p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, text() ); - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } else - p->setPen( box->colorGroup().text() ); + p->setPen( box->tqcolorGroup().text() ); p->drawText( x, y, text() ); } @@ -283,7 +283,7 @@ void Navigator::slotExecuted( TQListBoxItem *item ) executedItem = item; } -TQSize Navigator::sizeHint() const +TQSize Navigator::tqsizeHint() const { return TQSize( mMinWidth, 100 ); } @@ -409,7 +409,7 @@ IconSidePane::IconSidePane(TQWidget *parent, const char *name ) m_buttongroup->setExclusive(true); m_buttongroup->hide(); mWidgetstack = new TQWidgetStack(this); - mWidgetstack->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + mWidgetstack->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // setup the popup menu mShowIcons = KoShellSettings::sidePaneShowIcons(); diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h index 34678919..e0c4f7f0 100644 --- a/koshell/iconsidepane.h +++ b/koshell/iconsidepane.h @@ -26,7 +26,7 @@ #include <klistbox.h> #include <tqbuttongroup.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqvbox.h> #include <tqwidgetstack.h> @@ -100,12 +100,12 @@ class EntryItemToolTip : public TQToolTip if ( !mListBox ) return; TQListBoxItem* item = mListBox->itemAt( p ); if ( !item ) return; - const TQRect itemRect = mListBox->itemRect( item ); - if ( !itemRect.isValid() ) return; + const TQRect tqitemRect = mListBox->tqitemRect( item ); + if ( !tqitemRect.isValid() ) return; const EntryItem *entryItem = static_cast<EntryItem*>( item ); TQString tipStr = entryItem->text(); - tip( itemRect, tipStr ); + tip( tqitemRect, tipStr ); } private: TQListBox* mListBox; @@ -123,7 +123,7 @@ class Navigator : public KListBox int insertItem(const TQString &_text, const TQString &_pix); - TQSize sizeHint() const; + TQSize tqsizeHint() const; IconViewMode viewMode(); bool showText(); bool showIcons(); diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 27bec9d6..9639ae71 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -66,7 +66,7 @@ KoShellWindow::KoShellWindow() // Setup the sidebar m_pSidebar = new IconSidePane( m_pLayout ); - m_pSidebar->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, + m_pSidebar->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); m_pSidebar->setActionCollection( actionCollection() ); m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, TQT_TQOBJECT(this), TQT_SLOT( slotSidebar_Part(int ))); @@ -75,7 +75,7 @@ KoShellWindow::KoShellWindow() // Setup the tabbar m_pFrame = new KTabWidget( m_pLayout ); - m_pFrame->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_pFrame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); m_pFrame->setTabPosition( KTabWidget::Bottom ); @@ -158,7 +158,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) /*if (!KIO::NetAccess::exists(url,true,0) ) { - KMessageBox::error(0L, i18n("The file %1 doesn't exist.").arg(url.url()) ); + KMessageBox::error(0L, i18n("The file %1 doesn't exist.").tqarg(url.url()) ); recentAction()->removeURL(url); //remove the file from the recent-opened-file-list saveRecentFiles(); return false; @@ -175,7 +175,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) KoFilterManager *manager = new KoFilterManager( url.path() ); TQCString mimetype; // an empty mimetype means, that the "nearest" - KoFilter::ConversionStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen + KoFilter::ConversiontqStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen delete manager; if ( status != KoFilter::OK || mimetype.isEmpty() ) { @@ -503,7 +503,7 @@ void KoShellWindow::switchToPage( TQValueList<Page>::Iterator it ) v->setFocus(); partSpecificHelpAction->setEnabled(true); - partSpecificHelpAction->setText(i18n("%1 Handbook").arg((*m_activePage).m_pDoc->instance()->aboutData()->programName())); + partSpecificHelpAction->setText(i18n("%1 Handbook").tqarg((*m_activePage).m_pDoc->instance()->aboutData()->programName())); } void KoShellWindow::slotFileNew() |