diff options
Diffstat (limited to 'kiconedit')
-rw-r--r-- | kiconedit/kcolorgrid.cpp | 2 | ||||
-rw-r--r-- | kiconedit/kcolorgrid.h | 2 | ||||
-rw-r--r-- | kiconedit/kiconcolors.cpp | 2 | ||||
-rw-r--r-- | kiconedit/kiconconfig.cpp | 6 | ||||
-rw-r--r-- | kiconedit/kiconedit.cpp | 4 | ||||
-rw-r--r-- | kiconedit/kiconedit.h | 2 | ||||
-rw-r--r-- | kiconedit/kicongrid.cpp | 2 | ||||
-rw-r--r-- | kiconedit/knew.cpp | 2 | ||||
-rw-r--r-- | kiconedit/palettetoolbar.cpp | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp index 35fd9f3e..7d1baae6 100644 --- a/kiconedit/kcolorgrid.cpp +++ b/kiconedit/kcolorgrid.cpp @@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *) } */ -TQSize KColorGrid::tqsizeHint() const +TQSize KColorGrid::sizeHint() const { return TQSize(totalwidth, totalheight); } diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h index a5e21fc7..5e466348 100644 --- a/kiconedit/kcolorgrid.h +++ b/kiconedit/kcolorgrid.h @@ -65,7 +65,7 @@ public: virtual void setCellSize( int s ); virtual int cellSize() { return cellsize; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); } diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp index 4393379b..8e5daf84 100644 --- a/kiconedit/kiconcolors.cpp +++ b/kiconedit/kiconcolors.cpp @@ -43,7 +43,7 @@ void KDrawColors::paintCell( TQPainter *painter, int row, int col ) int d = spacing(); qDrawShadePanel( painter, d, d, cellSize()-d, cellSize()-d, - tqcolorGroup(), true, 1, &brush); + colorGroup(), true, 1, &brush); if ( row * numCols() + col == selected) painter->drawWinFocusRect( d+1, d+1, cellSize()-(2*d)+1, cellSize()-(2*d)+1 ); } diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp index d5db3bde..d6144823 100644 --- a/kiconedit/kiconconfig.cpp +++ b/kiconedit/kiconconfig.cpp @@ -49,7 +49,7 @@ static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) @@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent) TQSize min(300, 400); - if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); } - if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); } + if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); } + if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); } resize(min); } diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp index 8a4a6af1..bf731571 100644 --- a/kiconedit/kiconedit.cpp +++ b/kiconedit/kiconedit.cpp @@ -222,10 +222,10 @@ void KIconEdit::writeConfig() saveMainWindowSettings( config, "MainWindowSettings" ); } -TQSize KIconEdit::tqsizeHint() const +TQSize KIconEdit::sizeHint() const { if(gridview) - return gridview->tqsizeHint(); + return gridview->sizeHint(); else return TQSize(-1, -1); } diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h index e912e0f7..7af10e74 100644 --- a/kiconedit/kiconedit.h +++ b/kiconedit/kiconedit.h @@ -65,7 +65,7 @@ public: KIconEdit( const TQImage image, const char *name = "kiconedit"); ~KIconEdit(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; static WindowList windowList; signals: diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp index b24db091..3389446d 100644 --- a/kiconedit/kicongrid.cpp +++ b/kiconedit/kicongrid.cpp @@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image) setColor((y*numCols())+x, *l, false); } //kdDebug(4640) << "Row: " << y << endl; - kapp->tqprocessEvents(200); + kapp->processEvents(200); } updateColors(); diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp index e38d58bb..4f4bdb89 100644 --- a/kiconedit/knew.cpp +++ b/kiconedit/knew.cpp @@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent ) l->addWidget( rbtempl, 1 ); //l->addWidget(rbtempl, 5, AlignLeft); - //grp->setMinimumSize(grp->tqchildrenRect().size()); + //grp->setMinimumSize(grp->childrenRect().size()); grp->setButton( 0 ); } diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp index 225e2439..969facac 100644 --- a/kiconedit/palettetoolbar.cpp +++ b/kiconedit/palettetoolbar.cpp @@ -42,7 +42,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) m_lblPreview = new TQLabel( base ); m_lblPreview->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); m_lblPreview->setFixedHeight( 64 ); - m_lblPreview->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); + m_lblPreview->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); TQWhatsThis::add(m_lblPreview, i18n( "Preview\n\nThis is a 1:1 preview" " of the current icon" ) ); m_layout->addWidget( m_lblPreview ); @@ -50,7 +50,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) m_currentColorView = new TQLabel( base ); m_currentColorView->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); m_currentColorView->setFixedHeight( 24 ); - m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); + m_currentColorView->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) ); m_layout->addWidget( m_currentColorView ); |