summaryrefslogtreecommitdiffstats
path: root/kiconedit
diff options
context:
space:
mode:
Diffstat (limited to 'kiconedit')
-rw-r--r--kiconedit/kcolorgrid.cpp8
-rw-r--r--kiconedit/kcolorgrid.h2
-rw-r--r--kiconedit/kicon.cpp10
-rw-r--r--kiconedit/kiconcolors.cpp2
-rw-r--r--kiconedit/kiconconfig.cpp24
-rw-r--r--kiconedit/kiconedit.cpp6
-rw-r--r--kiconedit/kiconedit.h2
-rw-r--r--kiconedit/kiconeditslots.cpp10
-rw-r--r--kiconedit/kicongrid.cpp10
-rw-r--r--kiconedit/knew.cpp4
-rw-r--r--kiconedit/kresize.cpp10
-rw-r--r--kiconedit/palettetoolbar.cpp18
12 files changed, 53 insertions, 53 deletions
diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp
index 65d766c9..35fd9f3e 100644
--- a/kiconedit/kcolorgrid.cpp
+++ b/kiconedit/kcolorgrid.cpp
@@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *)
}
*/
-TQSize KColorGrid::sizeHint() const
+TQSize KColorGrid::tqsizeHint() const
{
return TQSize(totalwidth, totalheight);
}
@@ -293,14 +293,14 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
}
//kdDebug(4640) << "KColorGrid::setColor - before updateCell" << endl;
- repaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize);
+ tqrepaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize);
//updateCell( colNum/numCols(), colNum%numCols(), false );
//kdDebug(4640) << "KColorGrid::setColor - after updateCell" << endl;
}
void KColorGrid::updateCell( int row, int col, bool )
{
- //kdDebug(4640) << "updateCell - before repaint" << endl;
+ //kdDebug(4640) << "updateCell - before tqrepaint" << endl;
TQWMatrix matrix;
TQPainter p;
p.begin( this );
@@ -330,6 +330,6 @@ void KColorGrid::setCellSize( int s )
totalheight = (numRows() * s) + 1;
resize(totalwidth, totalheight);
if ( isVisible() )
- repaint(viewRect(), false);
+ tqrepaint(viewRect(), false);
}
#include "kcolorgrid.moc"
diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h
index 5e466348..a5e21fc7 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 sizeHint() const;
+ virtual TQSize tqsizeHint() const;
void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); }
diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index 9a4da93c..f36fde00 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -70,7 +70,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
if(!url.isValid()) // Giving up
{
- TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").arg(url.url());
+ TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url());
KMessageBox::sorry((TQWidget*)parent(), msg);
return false;
}
@@ -86,7 +86,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
{
if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
{
- TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
+ TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
KMessageBox::error((TQWidget*)parent(), msg);
return false;
}
@@ -101,7 +101,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
if(!loadedOk)
{
- TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
+ TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
KMessageBox::error((TQWidget*)parent(), msg);
}
else
@@ -208,7 +208,7 @@ bool KIconEditIcon::saveAs(const TQImage *image)
{
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
- "Overwrite it?" ).arg(file),
+ "Overwrite it?" ).tqarg(file),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
@@ -265,7 +265,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename)
}
else
{
- TQString msg = i18n("There was an error saving:\n%1\n").arg(str);
+ TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str);
KMessageBox::error((TQWidget*)parent(), msg);
kdDebug(4640) << "KIconEditIcon::save - " << msg << endl;
}
diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp
index 8e5daf84..4393379b 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,
- colorGroup(), true, 1, &brush);
+ tqcolorGroup(), 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 91ad06c3..d5db3bde 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqvbox.h>
#include <tqbuttongroup.h>
@@ -49,7 +49,7 @@
static inline TQPixmap loadIcon( const char * name )
{
return KGlobal::instance()->iconLoader()
- ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
+ ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
}
KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
@@ -60,9 +60,9 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
TQVBoxLayout *ml = new TQVBoxLayout(frame);
TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame);
grp->setColumnLayout(0, Qt::Vertical);
- grp->layout()->setSpacing(spacingHint());
- grp->layout()->setMargin(marginHint());
- TQGridLayout *l = new TQGridLayout(grp->layout());
+ grp->tqlayout()->setSpacing(spacingHint());
+ grp->tqlayout()->setMargin(marginHint());
+ TQGridLayout *l = new TQGridLayout(grp->tqlayout());
ln_name = new TQLineEdit( grp );
connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ),
@@ -130,7 +130,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
TQVBoxLayout* ml = new TQVBoxLayout( this );
ml->addWidget( grp );
- TQVBoxLayout* l = new TQVBoxLayout( grp->layout(), KDialog::spacingHint() );
+ TQVBoxLayout* l = new TQVBoxLayout( grp->tqlayout(), KDialog::spacingHint() );
l->addWidget( templates );
for( unsigned int i = 0; i < KIconTemplateContainer::self()->count(); i++ )
@@ -151,7 +151,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
bbox->addStretch( 1 );
- bbox->layout();
+ bbox->tqlayout();
l->addWidget( bbox );
}
@@ -246,11 +246,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this );
grp1->setColumnLayout(0, Qt::Vertical );
- grp1->layout()->setSpacing( KDialog::spacingHint() );
- grp1->layout()->setMargin( KDialog::marginHint() );
+ grp1->tqlayout()->setSpacing( KDialog::spacingHint() );
+ grp1->tqlayout()->setMargin( KDialog::marginHint() );
mainLayout->addWidget( grp1 );
- TQGridLayout *grp1Layout = new TQGridLayout( grp1->layout(), 3, 2 );
+ TQGridLayout *grp1Layout = new TQGridLayout( grp1->tqlayout(), 3, 2 );
TQButtonGroup* btngrp = new TQButtonGroup( grp1 );
btngrp->setExclusive( true );
@@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent)
TQSize min(300, 400);
- if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); }
- if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); }
+ if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); }
+ if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); }
resize(min);
}
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index 38461262..8a4a6af1 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -222,10 +222,10 @@ void KIconEdit::writeConfig()
saveMainWindowSettings( config, "MainWindowSettings" );
}
-TQSize KIconEdit::sizeHint() const
+TQSize KIconEdit::tqsizeHint() const
{
if(gridview)
- return gridview->sizeHint();
+ return gridview->tqsizeHint();
else
return TQSize(-1, -1);
}
@@ -477,7 +477,7 @@ bool KIconEdit::setupStatusBar()
statusbar->insertFixedItem("99999,99999", 0, true);
statusbar->insertFixedItem("99999 x 99999", 1, true);
statusbar->insertFixedItem(" 1:999", 2, true);
- str = i18n("Colors: %1").arg(9999999);
+ str = i18n("Colors: %1").tqarg(9999999);
statusbar->insertFixedItem(str, 3, true);
statusbar->insertItem("", 4);
diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h
index 7af10e74..e912e0f7 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 sizeHint() const;
+ virtual TQSize tqsizeHint() const;
static WindowList windowList;
signals:
diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp
index 7d8fffd7..f229b325 100644
--- a/kiconedit/kiconeditslots.cpp
+++ b/kiconedit/kiconeditslots.cpp
@@ -195,7 +195,7 @@ void KIconEdit::slotPrint()
{
KPrinter printer;
- if ( printer.setup(this, i18n("Print %1").arg(icon->url().section('/', -1))) )
+ if ( printer.setup(this, i18n("Print %1").tqarg(icon->url().section('/', -1))) )
{
int margin = 10, yPos = 0;
printer.setCreator("KDE Icon Editor");
@@ -422,13 +422,13 @@ void KIconEdit::slotUpdateZoom( int s )
void KIconEdit::slotUpdateStatusPos(int x, int y)
{
- TQString str = i18n("Status Position", "%1, %2").arg(x).arg(y);
+ TQString str = i18n("Status Position", "%1, %2").tqarg(x).tqarg(y);
statusbar->changeItem( str, 0);
}
void KIconEdit::slotUpdateStatusSize(int x, int y)
{
- TQString str = i18n("Status Size", "%1 x %2").arg(x).arg(y);
+ TQString str = i18n("Status Size", "%1 x %2").tqarg(x).tqarg(y);
statusbar->changeItem( str, 1);
}
@@ -443,13 +443,13 @@ void KIconEdit::slotUpdateStatusScaling(int s)
void KIconEdit::slotUpdateStatusColors(uint)
{
- TQString str = i18n("Colors: %1").arg(grid->numColors());
+ TQString str = i18n("Colors: %1").tqarg(grid->numColors());
statusbar->changeItem( str, 3);
}
void KIconEdit::slotUpdateStatusColors(uint n, uint *)
{
- TQString str = i18n("Colors: %1").arg(n);
+ TQString str = i18n("Colors: %1").tqarg(n);
statusbar->changeItem( str, 3);
}
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index 672dbdac..b24db091 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -27,7 +27,7 @@
#include <tqwhatsthis.h>
#include <tqscrollview.h>
#include <tqbitmap.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqdatetime.h>
#include <kiconloader.h>
@@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image)
setColor((y*numCols())+x, *l, false);
}
//kdDebug(4640) << "Row: " << y << endl;
- kapp->processEvents(200);
+ kapp->tqprocessEvents(200);
}
updateColors();
@@ -1044,7 +1044,7 @@ void KIconEditGrid::load( TQImage *image)
emit changed(pixmap());
setUpdatesEnabled(true);
emit needPainting();
- //repaint(viewRect(), false);
+ //tqrepaint(viewRect(), false);
history->clear();
}
@@ -1118,7 +1118,7 @@ TQImage KIconEditGrid::clipboardImage(bool &ok)
{
TQCString format = fileFormats.current();
TQCString type = "image/" + format.lower();
- if (kapp->clipboard()->data()->provides(type ) )
+ if (kapp->tqclipboard()->data()->provides(type ) )
{
oneIsSupported = true;
}
@@ -1379,7 +1379,7 @@ void KIconEditGrid::editPasteAsNew()
*img = tmp;
load(img);
setModified(true);
- //repaint(viewRect(), false);
+ //tqrepaint(viewRect(), false);
p = *img;
emit changed(TQPixmap(p));
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index 4a29fe05..e38d58bb 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
@@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent )
l->addWidget( rbtempl, 1 );
//l->addWidget(rbtempl, 5, AlignLeft);
- //grp->setMinimumSize(grp->childrenRect().size());
+ //grp->setMinimumSize(grp->tqchildrenRect().size());
grp->setButton( 0 );
}
diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp
index 4e73dad9..ac98e214 100644
--- a/kiconedit/kresize.cpp
+++ b/kiconedit/kresize.cpp
@@ -20,7 +20,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <klocale.h>
@@ -37,18 +37,18 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
group->setColumnLayout( 0, Qt::Horizontal );
genLayout->addWidget( group );
- TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( group->tqlayout(), 6 );
m_width = new KIntSpinBox( 1, 200, 1, 1, 10, group );
m_width->setValue( size.width() );
- layout->addWidget( m_width, 1 );
+ tqlayout->addWidget( m_width, 1 );
TQLabel* label = new TQLabel( "X", group );
- layout->addWidget( label );
+ tqlayout->addWidget( label );
m_height = new KIntSpinBox( 1, 200, 1, 1, 10, group);
m_height->setValue( size.height() );
- layout->addWidget( m_height, 1 );
+ tqlayout->addWidget( m_height, 1 );
setMinimumSize( 200, 100 );
}
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index 907b447a..225e2439 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -20,7 +20,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <tqpainter.h>
@@ -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->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
+ m_lblPreview->tqsetAlignment( 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,31 +50,31 @@ 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->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
+ m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) );
m_layout->addWidget( m_currentColorView );
- TQVBoxLayout *vlayout = new TQVBoxLayout( m_layout, 0 );
+ TQVBoxLayout *vtqlayout = new TQVBoxLayout( m_layout, 0 );
TQLabel *l = new TQLabel( i18n( "System colors:" ), base );
- vlayout->addWidget( l );
+ vtqlayout->addWidget( l );
m_sysColors = new KSysColors( base );
TQWhatsThis::add(m_sysColors, i18n( "System colors\n\nHere you can select"
" colors from the KDE icon palette" ) );
- vlayout->addWidget( m_sysColors );
+ vtqlayout->addWidget( m_sysColors );
connect( m_sysColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );
- vlayout = new TQVBoxLayout( m_layout, 0 );
+ vtqlayout = new TQVBoxLayout( m_layout, 0 );
l = new TQLabel( i18n( "Custom colors:" ), base );
- vlayout->addWidget( l );
+ vtqlayout->addWidget( l );
m_customColors = new KCustomColors( base );
TQWhatsThis::add(m_customColors, i18n( "Custom colors\n\nHere you can"
" build a palette of custom colors.\nDouble-click on a box to edit"
" the color" ) );
- vlayout->addWidget( m_customColors );
+ vtqlayout->addWidget( m_customColors );
connect( m_customColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );