diff --git a/ksquirrel/imageedit/sq_bcglabel.cpp b/ksquirrel/imageedit/sq_bcglabel.cpp
index 39c5f62..41395e3 100644
--- a/ksquirrel/imageedit/sq_bcglabel.cpp
+++ b/ksquirrel/imageedit/sq_bcglabel.cpp
@@ -21,7 +21,7 @@ SQ_BCGLabel::SQ_BCGLabel(TQWidget *parent, const char *name, WFlags f) : TQLabel
{
setScaledContents(false);
- tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+ setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
}
SQ_BCGLabel::~SQ_BCGLabel()
diff --git a/ksquirrel/imageedit/sq_converter.cpp b/ksquirrel/imageedit/sq_converter.cpp
index 0f5cd5f..9f22be8 100644
--- a/ksquirrel/imageedit/sq_converter.cpp
+++ b/ksquirrel/imageedit/sq_converter.cpp
@@ -98,7 +98,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri
TQString result, inner, filter = lw->filter;
TQString ext = ff.extension(false);
TQString prefix, suffix, name2 = name;
- TQString spage = TQString::tqfromLatin1("page_%1.").tqarg((TQString::tqfromLatin1("%1").tqarg(page)).rightJustify(3, '0'));
+ TQString spage = TQString::fromLatin1("page_%1.").tqarg((TQString::fromLatin1("%1").tqarg(page)).rightJustify(3, '0'));
if(!putto.isEmpty())
{
@@ -110,7 +110,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri
prefix.truncate(name2.length() - ext.length());
- suffix = (SQ_LibraryHandler::instance()->knownExtension(TQString::tqfromLatin1("*.") + ext))
+ suffix = (SQ_LibraryHandler::instance()->knownExtension(TQString::fromLatin1("*.") + ext))
? TQString(lw->codec->extension(32)) : ext;
if(replace == 0 || replace == 2)
@@ -121,7 +121,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri
if(TQFile::exists(result))
{
- inner = TQString::tqfromLatin1("1.");
+ inner = TQString::fromLatin1("1.");
result = (!paged) ? (prefix + inner + suffix) : (prefix + spage + inner + suffix);
}
}
diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/ksquirrel/imageedit/sq_imagebcg.ui
index cad344f..4b8951d 100644
--- a/ksquirrel/imageedit/sq_imagebcg.ui
+++ b/ksquirrel/imageedit/sq_imagebcg.ui
@@ -491,7 +491,7 @@
Expanding
-
+
1
16
@@ -508,7 +508,7 @@
Expanding
-
+
1
16
@@ -535,7 +535,7 @@
MinimumExpanding
-
+
16
16
@@ -560,7 +560,7 @@
Expanding
-
+
249
21
@@ -615,7 +615,7 @@
MinimumExpanding
-
+
16
20
@@ -640,7 +640,7 @@
Expanding
-
+
1
16
@@ -665,7 +665,7 @@
Expanding
-
+
1
16
@@ -684,7 +684,7 @@
0
-
+
160
160
@@ -709,7 +709,7 @@
Expanding
-
+
1
16
@@ -728,7 +728,7 @@
0
-
+
160
160
diff --git a/ksquirrel/imageedit/sq_imageconvert.ui b/ksquirrel/imageedit/sq_imageconvert.ui
index 649680f..65af5d4 100644
--- a/ksquirrel/imageedit/sq_imageconvert.ui
+++ b/ksquirrel/imageedit/sq_imageconvert.ui
@@ -40,7 +40,7 @@
Expanding
-
+
237
20
@@ -149,7 +149,7 @@
Expanding
-
+
26
155
diff --git a/ksquirrel/imageedit/sq_imageeditoptions.ui b/ksquirrel/imageedit/sq_imageeditoptions.ui
index cb5549f..6992481 100644
--- a/ksquirrel/imageedit/sq_imageeditoptions.ui
+++ b/ksquirrel/imageedit/sq_imageeditoptions.ui
@@ -111,7 +111,7 @@
Expanding
-
+
16
16
@@ -147,7 +147,7 @@
Expanding
-
+
260
16
diff --git a/ksquirrel/imageedit/sq_imagefilter.ui b/ksquirrel/imageedit/sq_imagefilter.ui
index 79ec3e4..ccfaa93 100644
--- a/ksquirrel/imageedit/sq_imagefilter.ui
+++ b/ksquirrel/imageedit/sq_imagefilter.ui
@@ -82,7 +82,7 @@
Expanding
-
+
16
40
@@ -120,7 +120,7 @@
Expanding
-
+
16
20
@@ -166,7 +166,7 @@
Expanding
-
+
16
45
@@ -221,7 +221,7 @@
Expanding
-
+
11
26
@@ -251,7 +251,7 @@
Expanding
-
+
16
30
@@ -289,7 +289,7 @@
Expanding
-
+
16
30
@@ -352,7 +352,7 @@
Expanding
-
+
11
14
@@ -390,7 +390,7 @@
Expanding
-
+
16
10
@@ -452,7 +452,7 @@
Expanding
-
+
10
11
@@ -514,7 +514,7 @@
Expanding
-
+
16
25
@@ -552,7 +552,7 @@
Expanding
-
+
11
14
@@ -694,7 +694,7 @@
Expanding
-
+
16
35
@@ -740,7 +740,7 @@
Expanding
-
+
21
10
@@ -786,7 +786,7 @@
Expanding
-
+
16
10
@@ -832,7 +832,7 @@
Expanding
-
+
20
60
@@ -870,7 +870,7 @@
Expanding
-
+
16
35
@@ -943,7 +943,7 @@
Expanding
-
+
11
41
@@ -973,7 +973,7 @@
Expanding
-
+
16
25
@@ -1011,7 +1011,7 @@
Expanding
-
+
16
75
@@ -1066,7 +1066,7 @@
Expanding
-
+
11
113
@@ -1104,7 +1104,7 @@
Expanding
-
+
16
71
@@ -1124,7 +1124,7 @@
Expanding
-
+
16
16
@@ -1149,7 +1149,7 @@
Expanding
-
+
285
16
@@ -1316,7 +1316,7 @@
0
-
+
140
0
@@ -1333,7 +1333,7 @@
Expanding
-
+
16
16
@@ -1360,7 +1360,7 @@
0
-
+
160
160
@@ -1385,7 +1385,7 @@
Expanding
-
+
1
16
@@ -1402,7 +1402,7 @@
Expanding
-
+
1
16
@@ -1421,7 +1421,7 @@
0
-
+
160
160
@@ -1438,7 +1438,7 @@
Expanding
-
+
1
16
diff --git a/ksquirrel/imageedit/sq_writeoption.ui b/ksquirrel/imageedit/sq_writeoption.ui
index cba0f45..634ca0c 100644
--- a/ksquirrel/imageedit/sq_writeoption.ui
+++ b/ksquirrel/imageedit/sq_writeoption.ui
@@ -20,7 +20,7 @@
0
-
+
250
0
@@ -75,7 +75,7 @@
Expanding
-
+
16
10
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/ksquirrel/ksquirrel-libs-configurator/klc.cpp
index 4a90161..808ee9e 100644
--- a/ksquirrel/ksquirrel-libs-configurator/klc.cpp
+++ b/ksquirrel/ksquirrel-libs-configurator/klc.cpp
@@ -74,7 +74,7 @@ KLC::KLC( TQWidget* parent, const char* name, WFlags fl )
KLCLayout->addWidget( listEnabled, 1, 0 );
languageChange();
- resize( TQSize(586, 425).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(586, 425).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui b/ksquirrel/ksquirrel-libs-configurator/klc.ui
index 91a0dc0..7759eb6 100644
--- a/ksquirrel/ksquirrel-libs-configurator/klc.ui
+++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui
@@ -37,7 +37,7 @@
Expanding
-
+
371
26
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h
index 68df556..d5961ee 100644
--- a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h
+++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h
@@ -99,7 +99,7 @@ void KLC::slotNewItems(const KFileItemList &list)
{
KFileItemListIterator it(list);
KFileItem *fi;
- TQString soname = TQString::tqfromLatin1(".so.%1").tqarg(SQ_KL_VER);
+ TQString soname = TQString::fromLatin1(".so.%1").tqarg(SQ_KL_VER);
while((fi = it.current()))
{
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index f7a1818..9a1c187 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -514,7 +514,7 @@ void KSquirrel::createWidgets(int createFirst)
m_urlbox = kconf->readBoolEntry("has_url", false);
// main TQVBox
- mainPage = new TQVBox(this, TQString::tqfromLatin1("SQ_BROWSER_VBOX"));
+ mainPage = new TQVBox(this, TQString::fromLatin1("SQ_BROWSER_VBOX"));
mainPage->resize(size());
SQ_SplashScreen::advance();
@@ -526,8 +526,8 @@ void KSquirrel::createWidgets(int createFirst)
tools = new KToolBar(mainPage);
// location toolbar
- pTLocation = new KToolBar(mainPage, TQString::tqfromLatin1("Location toolbar"));
- pTLocation->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+ pTLocation = new KToolBar(mainPage, TQString::fromLatin1("Location toolbar"));
+ pTLocation->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
// main splitter
mainView = new TQSplitter(Qt::Horizontal, mainPage); Q_ASSERT(mainView);
@@ -628,7 +628,7 @@ void KSquirrel::createWidgets(int createFirst)
void KSquirrel::createStatusBar(KStatusBar *bar)
{
sbar = bar;
- sbar->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ sbar->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
sbar->setSizeGripEnabled(true);
sbar->show();
@@ -642,9 +642,9 @@ void KSquirrel::createStatusBar(KStatusBar *bar)
fileIcon->setScaledContents(false);
// name of current file
- fileName = new KSqueezedTextLabel(TQString::tqfromLatin1("----"), vb, "fileName");
+ fileName = new KSqueezedTextLabel(TQString::fromLatin1("----"), vb, "fileName");
fileName->setTextFormat(TQt::RichText);
- fileName->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs);
+ fileName->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs);
diskSpace = new TQLabel(TQString(), sbar, "diskSpace");
@@ -823,7 +823,7 @@ void KSquirrel::createActions()
pASelectGroup = new KAction(i18n("Select group"), "viewmag+", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group");
pADeselectGroup = new KAction(i18n("Deselect group"), "viewmag-", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group");
- const TQString thumbs_size__ = TQString::tqfromLatin1("thumbs_size__");
+ const TQString thumbs_size__ = TQString::fromLatin1("thumbs_size__");
pAThumb1->setExclusiveGroup(thumbs_size__);
pAThumb2->setExclusiveGroup(thumbs_size__);
pAThumb3->setExclusiveGroup(thumbs_size__);
@@ -849,7 +849,7 @@ void KSquirrel::createActions()
pAThumbs->setDelayed(false);
- TQString raise_some_widget_from_stack = TQString::tqfromLatin1("raise_some_widget_from_stack");
+ TQString raise_some_widget_from_stack = TQString::fromLatin1("raise_some_widget_from_stack");
pARaiseListView->setExclusiveGroup(raise_some_widget_from_stack);
pARaiseIconView->setExclusiveGroup(raise_some_widget_from_stack);
pARaiseDetailView->setExclusiveGroup(raise_some_widget_from_stack);
@@ -1142,7 +1142,7 @@ void KSquirrel::createPostSplash()
TQLabel *pp = new TQLabel(hbox);
pp->setPalette(TQPalette(cc, cc));
- pp->tqsetAlignment(TQt::AlignCenter);
+ pp->setAlignment(TQt::AlignCenter);
TQPixmap todo = TQPixmap::fromMimeSource(locate("data", "images/tray.png"));
@@ -1154,7 +1154,7 @@ void KSquirrel::createPostSplash()
TQLabel *l = new TQLabel(i18n(" writing settings and thumbnails... "), hbox);
l->setPalette(TQPalette(cc, cc));
- l->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+ l->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
hbox->setStretchFactor(pp, 0);
hbox->setStretchFactor(l, 1);
@@ -1494,7 +1494,7 @@ void KSquirrel::slotOpenFileAndSet()
void KSquirrel::slotAnimatedClicked()
{
// invoke default browser
- kapp->invokeBrowser(TQString::tqfromLatin1("http://ksquirrel.sourceforge.net/"));
+ kapp->invokeBrowser(TQString::fromLatin1("http://ksquirrel.sourceforge.net/"));
}
// Create SQ_ThumbnailCacheMaster, which can do something with thumbnails
@@ -1748,7 +1748,7 @@ void KSquirrel::control(const TQString &command)
{
int id = it.data();
- KAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::tqfromLatin1("action_%1").tqarg(id));
+ KAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::fromLatin1("action_%1").tqarg(id));
if(a) a->activate();
}
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index f22b923..7f8250f 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -48,7 +48,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
ext = new KSquirrelPartBrowserExtension(this);
- KGlobal::dirs()->addResourceType("data", KStandardDirs::kde_default("data") + TQString::tqfromLatin1("ksquirrel"));
+ KGlobal::dirs()->addResourceType("data", KStandardDirs::kde_default("data") + TQString::fromLatin1("ksquirrel"));
KGlobal::locale()->setActiveCatalogue(KSquirrelFactory::instance()->instanceName());
if(!SQ_ErrorString::instance())
diff --git a/ksquirrel/ksquirrelpart/sq_bcglabel.cpp b/ksquirrel/ksquirrelpart/sq_bcglabel.cpp
index 39c5f62..41395e3 100644
--- a/ksquirrel/ksquirrelpart/sq_bcglabel.cpp
+++ b/ksquirrel/ksquirrelpart/sq_bcglabel.cpp
@@ -21,7 +21,7 @@ SQ_BCGLabel::SQ_BCGLabel(TQWidget *parent, const char *name, WFlags f) : TQLabel
{
setScaledContents(false);
- tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+ setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
}
SQ_BCGLabel::~SQ_BCGLabel()
diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui
index 7f282ab..bd5339c 100644
--- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui
+++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui
@@ -34,7 +34,7 @@
0
-
+
16
16
@@ -117,7 +117,7 @@
Expanding
-
+
16
16
diff --git a/ksquirrel/ksquirrelpart/sq_errorstring.cpp b/ksquirrel/ksquirrelpart/sq_errorstring.cpp
index cd5a047..f762ee3 100644
--- a/ksquirrel/ksquirrelpart/sq_errorstring.cpp
+++ b/ksquirrel/ksquirrelpart/sq_errorstring.cpp
@@ -30,7 +30,7 @@ SQ_ErrorString::SQ_ErrorString(TQObject *parent) : TQObject(parent)
m_instance = this;
// fill map with translated messages
- messages.insert(SQE_OK, TQString::tqfromLatin1("OK"));
+ messages.insert(SQE_OK, TQString::fromLatin1("OK"));
messages.insert(SQE_R_NOFILE, i18n("cannot open file for reading"));
messages.insert(SQE_R_BADFILE, i18n("file corrupted"));
messages.insert(SQE_R_NOMEMORY, i18n("no memory"));
diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.cpp b/ksquirrel/ksquirrelpart/sq_externaltool.cpp
index cd5a5f7..1bc2886 100644
--- a/ksquirrel/ksquirrelpart/sq_externaltool.cpp
+++ b/ksquirrel/ksquirrelpart/sq_externaltool.cpp
@@ -171,7 +171,7 @@ void SQ_ExternalTool::slotAboutToShowMenu()
TQString file = KStringHandler::rsqueeze(item->name(), 30);
// finally, change title
- TQString final = (items.count() == 1 || items.count() == 0) ? file : (file + TQString::tqfromLatin1(" (+%1)").tqarg(items.count()-1));
+ TQString final = (items.count() == 1 || items.count() == 0) ? file : (file + TQString::fromLatin1(" (+%1)").tqarg(items.count()-1));
menu->changeTitle(final);
}
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index bda1f57..74494e0 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -491,7 +491,7 @@ void SQ_GLWidget::matrixChanged()
float z = (m < 1.0) ? 1.0/m : m;
// construct zoom
- str = TQString::tqfromLatin1("%1% [%2:%3]")
+ str = TQString::fromLatin1("%1% [%2:%3]")
.tqarg(fzoom, 0, 'f', 1)
.tqarg((m < 1.0)?1.0:z, 0, 'f', 1)
.tqarg((m > 1.0)?1.0:z, 0, 'f', 1);
@@ -503,7 +503,7 @@ void SQ_GLWidget::matrixChanged()
#endif
// construct rotation angle
- str = TQString::tqfromLatin1("%1%2 %3 deg")
+ str = TQString::fromLatin1("%1%2 %3 deg")
.tqarg((tab->isflippedV)?"V":"")
.tqarg((tab->isflippedH)?"H":"")
.tqarg(tab->curangle, 0, 'f', 1);
@@ -1598,7 +1598,7 @@ void SQ_GLWidget::decode()
}
}
- id = images->insertItem(TQString::tqfromLatin1("#%1 [%2x%3@%4]").tqarg(tab->current+1).tqarg(im->w).tqarg(im->h).tqarg(im->bpp));
+ id = images->insertItem(TQString::fromLatin1("#%1 [%2x%3@%4]").tqarg(tab->current+1).tqarg(im->w).tqarg(im->h).tqarg(im->bpp));
images->setItemParameter(id, tab->current);
@@ -1655,7 +1655,7 @@ void SQ_GLWidget::paletteChange(const TQPalette &oldPalette)
if(SQ_Config::instance()->readNumEntry("GL view background type", 1) == 0)
{
- TQColor color = tqcolorGroup().color(TQColorGroup::Base);
+ TQColor color = colorGroup().color(TQColorGroup::Base);
qglClearColor(color);
updateGL();
}
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 3a212cb..f6157f7 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -91,14 +91,14 @@ void SQ_GLWidget::createActions()
pAFull = new KToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full");
- TQString squirrel_zoom_actions = TQString::tqfromLatin1("squirrel_zoom_actions");
+ TQString squirrel_zoom_actions = TQString::fromLatin1("squirrel_zoom_actions");
pAZoomW->setExclusiveGroup(squirrel_zoom_actions);
pAZoomH->setExclusiveGroup(squirrel_zoom_actions);
pAZoomWH->setExclusiveGroup(squirrel_zoom_actions);
pAZoom100->setExclusiveGroup(squirrel_zoom_actions);
pAZoomLast->setExclusiveGroup(squirrel_zoom_actions);
- TQString squirrel_selection_type = TQString::tqfromLatin1("squirrel_selection_type");
+ TQString squirrel_selection_type = TQString::fromLatin1("squirrel_selection_type");
pASelectionEllipse->setExclusiveGroup(squirrel_selection_type);
pASelectionRect->setExclusiveGroup(squirrel_selection_type);
@@ -236,17 +236,17 @@ void SQ_GLWidget::slotProperties()
// save tab->current image parameters and some additioanl information
// in list
list << tab->quickImageInfo
- << TQString::tqfromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h)
- << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp)
+ << TQString::fromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h)
+ << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp)
<< tab->finfo.image[tab->current].colorspace
<< tab->finfo.image[tab->current].compression
<< sz
- << TQString::tqfromLatin1("%1").tqarg((double)real_size / tab->fmt_size, 0, 'f', 2)
+ << TQString::fromLatin1("%1").tqarg((double)real_size / tab->fmt_size, 0, 'f', 2)
<< ((tab->finfo.image[tab->current].interlaced) ? i18n("yes") : i18n("no"))
- << TQString::tqfromLatin1("%1").tqarg(errors)
- << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image.size())
- << TQString::tqfromLatin1("#%1").tqarg(tab->current+1)
- << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay);
+ << TQString::fromLatin1("%1").tqarg(errors)
+ << TQString::fromLatin1("%1").tqarg(tab->finfo.image.size())
+ << TQString::fromLatin1("#%1").tqarg(tab->current+1)
+ << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay);
// create dialog and setup it
SQ_ImageProperties prop(this);
@@ -867,7 +867,7 @@ void SQ_GLWidget::initAccelsAndMenu()
menu->insertItem(i18n("Image"), menuImage);
#define SQ_ADD_KACTION(b) \
- (new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::tqfromLatin1("action_%1").tqarg(b)))
+ (new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").tqarg(b)))
id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", KIcon::Desktop, KIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
@@ -900,13 +900,13 @@ void SQ_GLWidget::initAccelsAndMenu()
menuZoom->insertItem(i18n("Zoom 2x") + "\tCtrl++", SQ_ADD_KACTION(TQt::Key_Plus+CTRL), TQT_SLOT(activate()));
menuZoom->insertItem(i18n("Zoom 1/2x") + "\tCtrl+-", SQ_ADD_KACTION(TQt::Key_Minus+CTRL), TQT_SLOT(activate()));
menuZoom->insertSeparator();
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::tqfromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::tqfromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::tqfromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::tqfromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::tqfromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::tqfromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::tqfromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::fromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::fromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::fromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::fromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::fromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::fromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::fromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate()));
menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveLeft16.png")), i18n("Move left") + "\tRight", SQ_ADD_KACTION(TQt::Key_Right), TQT_SLOT(activate()));
menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveRight16.png")), i18n("Move right") + "\tLeft", SQ_ADD_KACTION(TQt::Key_Left), TQT_SLOT(activate()));
@@ -1312,7 +1312,7 @@ void SQ_GLWidget::slotChangeTab(int id)
for(;it != itEnd;++it, ++i)
{
- mid = images->insertItem(TQString::tqfromLatin1("#%1 [%2x%3@%4]").tqarg(i+1).tqarg((*it).w).tqarg((*it).h).tqarg((*it).bpp));
+ mid = images->insertItem(TQString::fromLatin1("#%1 [%2x%3@%4]").tqarg(i+1).tqarg((*it).w).tqarg((*it).h).tqarg((*it).bpp));
images->setItemParameter(mid, i);
if(i == tab->current)
@@ -1493,7 +1493,7 @@ void SQ_GLWidget::setClearColor()
{
// system color
case 0:
- color = tqcolorGroup().color(TQColorGroup::Base);
+ color = colorGroup().color(TQColorGroup::Base);
break;
// custom color
@@ -1623,7 +1623,7 @@ void SQ_GLWidget::createMarks()
*/
void SQ_GLWidget::updateCurrentFileInfo()
{
- TQString status = TQString::tqfromLatin1("%1x%2@%3")
+ TQString status = TQString::fromLatin1("%1x%2@%3")
.tqarg(tab->finfo.image[tab->current].w)
.tqarg(tab->finfo.image[tab->current].h)
.tqarg(tab->finfo.image[tab->current].bpp);
@@ -1667,7 +1667,7 @@ void SQ_GLWidget::calcFrameLabelWidth()
#ifndef KSQUIRREL_PART
SQ_GLView::window()->sbarWidget("SBFrame")->setFixedWidth(
SQ_GLView::window()->sbarWidget("SBFrame")->fontMetrics()
- .boundingRect(TQString::tqfromLatin1("0%1/0%2").tqarg(tab->total).tqarg(tab->total)).width());
+ .boundingRect(TQString::fromLatin1("0%1/0%2").tqarg(tab->total).tqarg(tab->total)).width());
#endif
}
@@ -1680,9 +1680,9 @@ void SQ_GLWidget::calcFrameLabelWidth()
void SQ_GLWidget::frameChanged()
{
#ifndef KSQUIRREL_PART
- SQ_GLView::window()->sbarWidget("SBFrame")->setText(TQString::tqfromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total));
+ SQ_GLView::window()->sbarWidget("SBFrame")->setText(TQString::fromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total));
#else
- t_glv.sbarWidget("SBFrame")->setText(TQString::tqfromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total));
+ t_glv.sbarWidget("SBFrame")->setText(TQString::fromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total));
#endif
}
diff --git a/ksquirrel/ksquirrelpart/sq_helpwidget.ui b/ksquirrel/ksquirrelpart/sq_helpwidget.ui
index 02fb30d..d0500af 100644
--- a/ksquirrel/ksquirrelpart/sq_helpwidget.ui
+++ b/ksquirrel/ksquirrelpart/sq_helpwidget.ui
@@ -296,7 +296,7 @@
Expanding
-
+
16
16
diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui
index cad344f..4b8951d 100644
--- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui
+++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui
@@ -491,7 +491,7 @@
Expanding
-
+
1
16
@@ -508,7 +508,7 @@
Expanding
-
+
1
16
@@ -535,7 +535,7 @@
MinimumExpanding
-
+
16
16
@@ -560,7 +560,7 @@
Expanding
-
+
249
21
@@ -615,7 +615,7 @@
MinimumExpanding
-
+
16
20
@@ -640,7 +640,7 @@
Expanding
-
+
1
16
@@ -665,7 +665,7 @@
Expanding
-
+
1
16
@@ -684,7 +684,7 @@
0
-
+
160
160
@@ -709,7 +709,7 @@
Expanding
-
+
1
16
@@ -728,7 +728,7 @@
0
-
+
160
160
diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui b/ksquirrel/ksquirrelpart/sq_imagefilter.ui
index 79ec3e4..ccfaa93 100644
--- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui
+++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui
@@ -82,7 +82,7 @@
Expanding
-
+
16
40
@@ -120,7 +120,7 @@
Expanding
-
+
16
20
@@ -166,7 +166,7 @@
Expanding
-
+
16
45
@@ -221,7 +221,7 @@
Expanding
-
+
11
26
@@ -251,7 +251,7 @@
Expanding
-
+
16
30
@@ -289,7 +289,7 @@
Expanding
-
+
16
30
@@ -352,7 +352,7 @@
Expanding
-
+
11
14
@@ -390,7 +390,7 @@
Expanding
-
+
16
10
@@ -452,7 +452,7 @@
Expanding
-
+
10
11
@@ -514,7 +514,7 @@
Expanding
-
+
16
25
@@ -552,7 +552,7 @@
Expanding
-
+
11
14
@@ -694,7 +694,7 @@
Expanding
-
+
16
35
@@ -740,7 +740,7 @@
Expanding
-
+
21
10
@@ -786,7 +786,7 @@
Expanding
-
+
16
10
@@ -832,7 +832,7 @@
Expanding
-
+
20
60
@@ -870,7 +870,7 @@
Expanding
-
+
16
35
@@ -943,7 +943,7 @@
Expanding
-
+
11
41
@@ -973,7 +973,7 @@
Expanding
-
+
16
25
@@ -1011,7 +1011,7 @@
Expanding
-
+
16
75
@@ -1066,7 +1066,7 @@
Expanding
-
+
11
113
@@ -1104,7 +1104,7 @@
Expanding
-
+
16
71
@@ -1124,7 +1124,7 @@
Expanding
-
+
16
16
@@ -1149,7 +1149,7 @@
Expanding
-
+
285
16
@@ -1316,7 +1316,7 @@
0
-
+
140
0
@@ -1333,7 +1333,7 @@
Expanding
-
+
16
16
@@ -1360,7 +1360,7 @@
0
-
+
160
160
@@ -1385,7 +1385,7 @@
Expanding
-
+
1
16
@@ -1402,7 +1402,7 @@
Expanding
-
+
1
16
@@ -1421,7 +1421,7 @@
0
-
+
160
160
@@ -1438,7 +1438,7 @@
Expanding
-
+
1
16
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
index 345fa76..940df9f 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
@@ -49,7 +49,7 @@
Expanding
-
+
470
20
@@ -81,7 +81,7 @@
Expanding
-
+
20
10
@@ -602,7 +602,7 @@
- tqStatus:
+ Status:
AlignTop|AlignRight
@@ -618,7 +618,7 @@
Expanding
-
+