1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
commit 28d9c77436d5cb4c91db8f137f8fe45d4d835527
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1324316391 -0600
Remove additional unneeded tq method conversions
diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
index ce85788..dc43578 100644
--- a/kuickshow/src/aboutwidget.cpp
+++ b/kuickshow/src/aboutwidget.cpp
@@ -84,7 +84,7 @@ bool AboutWidget::eventFilter( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress ) {
TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
- if ( !m_homepage->tqgeometry().contains( ev->pos() ) ) {
+ if ( !m_homepage->geometry().contains( ev->pos() ) ) {
deleteLater();
return true;
}
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 8b195a7..12aa911 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -310,8 +310,8 @@ void ImageWindow::updateGeometry( int imWidth, int imHeight )
TQString caption = i18n( "Filename (Imagewidth x Imageheight)",
"%3 (%1 x %2)" );
- caption = caption.tqarg( m_kuim->originalWidth() ).
- tqarg( m_kuim->originalHeight() ).tqarg( m_kuim->url().prettyURL() );
+ caption = caption.arg( m_kuim->originalWidth() ).
+ arg( m_kuim->originalHeight() ).arg( m_kuim->url().prettyURL() );
setCaption( kapp->makeStdCaption( caption ) );
}
@@ -403,7 +403,7 @@ void ImageWindow::scrollImage( int x, int y, bool restrict )
// XUnmapWindow();
// XSetWindowBackgroundPixmap()
// resize window to fit image size, center image
-// XClearWindow(); // tqrepaint
+// XClearWindow(); // repaint
// XMapWindow(), XSync();
//
bool ImageWindow::showNextImage( const KURL& url )
@@ -412,7 +412,7 @@ bool ImageWindow::showNextImage( const KURL& url )
switch ( file->waitForDownload( this ) ) {
case KuickFile::ERROR:
{
- TQString tmp = i18n("Unable to download the image from %1.").tqarg(url.prettyURL());
+ TQString tmp = i18n("Unable to download the image from %1.").arg(url.prettyURL());
emit sigImageError( file, tmp );
return false;
}
@@ -430,7 +430,7 @@ bool ImageWindow::showNextImage( KuickFile *file )
if ( !loadImage( file ) ) {
TQString tmp = i18n("Unable to load the image %1.\n"
"Perhaps the file format is unsupported or "
- "your Imlib is not installed properly.").tqarg(file->url().prettyURL());
+ "your Imlib is not installed properly.").arg(file->url().prettyURL());
emit sigImageError( file, tmp );
return false;
}
@@ -1203,7 +1203,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
return KMessageBox::warningContinueCancel(
this,
i18n("You are about to view a very large image (%1 x %2 pixels), which can be very resource-consuming and even make your computer hang.\nDo you want to continue?")
- .tqarg( newWidth ).tqarg( newHeight ),
+ .arg( newWidth ).arg( newHeight ),
TQString(),
KStdGuiItem::cont(),
"ImageWindow_confirm_very_large_window"
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index f42e6c1..0bca327 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -475,7 +475,7 @@ void ImlibWidget::setBackgroundColor( const TQColor& color )
{
myBackgroundColor = color;
setPalette( TQPalette( myBackgroundColor ));
- tqrepaint( false); // FIXME - false? necessary at all?
+ repaint( false); // FIXME - false? necessary at all?
}
const TQColor& ImlibWidget::backgroundColor() const
@@ -515,7 +515,7 @@ void ImlibWidget::setBusyCursor()
void ImlibWidget::restoreCursor()
{
- if ( cursor().shape() == KCursor::waitCursor().tqshape() ) // only if nobody changed the cursor in the meantime!
+ if ( cursor().shape() == KCursor::waitCursor().shape() ) // only if nobody changed the cursor in the meantime!
setCursor( m_oldCursor );
}
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index b20606a..247e56a 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -106,8 +106,8 @@ KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
KProgressDialog *dialog = new KProgressDialog( parent );
dialog->setModal( true );
- dialog->setCaption( i18n("Downloading %1...").tqarg( m_url.fileName() ) );
- dialog->setLabel( i18n("Please wait while downloading\n%1").tqarg( m_url.prettyURL() ));
+ dialog->setCaption( i18n("Downloading %1...").arg( m_url.fileName() ) );
+ dialog->setLabel( i18n("Please wait while downloading\n%1").arg( m_url.prettyURL() ));
dialog->setAllowCancel( true );
dialog->setAutoClose( true );
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 0392c85..b0879c0 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -133,7 +133,7 @@ KuickShow::KuickShow( const char *name )
if ( KMessageBox::warningYesNo(
this,
i18n("Do you really want to display this 1 image at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.",
- "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).tqarg(KStdGuiItem::no().plainText()),
+ "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).arg(KStdGuiItem::no().plainText()),
i18n("Display Multiple Images?"))
!= KMessageBox::Yes )
{
@@ -253,7 +253,7 @@ void KuickShow::initGUI( const KURL& startDir )
coll, "kuick_print" );
print->setText( i18n("Print Image...") );
- KAction *configure = new KAction( i18n("Configure %1...").tqarg( KGlobal::instance()->aboutData()->programName() ), "configure",
+ KAction *configure = new KAction( i18n("Configure %1...").arg( KGlobal::instance()->aboutData()->programName() ), "configure",
KShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( configuration() ),
coll, "kuick_configure" );
@@ -552,7 +552,7 @@ bool KuickShow::showImage( const KFileItem *fi,
TQT_TQOBJECT(this), TQT_SLOT (slotTrashCurrentImage (ImageWindow *)));
if ( s_viewers.count() == 1 && moveToTopLeft ) {
// we have to move to 0x0 before showing _and_
- // after showing, otherwise we get some bogus tqgeometry()
+ // after showing, otherwise we get some bogus geometry()
m_viewer->move( Kuick::workArea().topLeft() );
}
@@ -641,7 +641,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *parent)
if (KMessageBox::warningContinueCancel(
parent,
- i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
+ i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
i18n("Delete File"),
KStdGuiItem::del(),
"Kuick_delete_current_image")
@@ -666,7 +666,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *parent)
if (KMessageBox::warningContinueCancel(
parent,
- i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
+ i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
i18n("Trash File"),
KGuiItem(i18n("to trash", "&Trash"),"edittrash"),
"Kuick_trash_current_image")
diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
index 2c78a92..7005bbe 100644
--- a/kuickshow/src/printing.cpp
+++ b/kuickshow/src/printing.cpp
@@ -52,7 +52,7 @@ bool Printing::printImage( ImageWindow& imageWin, TQWidget *parent )
KPrinter::addDialogPage( new KuickPrintDialogPage( parent, "kuick page"));
- if ( printer.setup( parent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) )
+ if ( printer.setup( parent, i18n("Print %1").arg(printer.docName().section('/', -1)) ) )
{
KTempFile tmpFile( TQString(), ".png" );
if ( tmpFile.status() == 0 )
@@ -109,7 +109,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
bool shrinkToFit = (printer.option( "app-kuickshow-shrinkToFit" ) != f);
TQSize imagesize = image.size();
if ( shrinkToFit && (image.width() > w || image.height() > h) ) {
- imagesize.tqscale( w, h, TQSize::ScaleMin );
+ imagesize.scale( w, h, TQSize::ScaleMin );
}
@@ -117,28 +117,28 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
// align image
//
bool ok = false;
- int tqalignment = printer.option("app-kuickshow-tqalignment").toInt( &ok );
+ int alignment = printer.option("app-kuickshow-alignment").toInt( &ok );
if ( !ok )
- tqalignment = TQt::AlignCenter; // default
+ alignment = TQt::AlignCenter; // default
int x = 0;
int y = 0;
// ### need a GUI for this in KuickPrintDialogPage!
- // x - tqalignment
- if ( tqalignment & TQt::AlignHCenter )
+ // x - alignment
+ if ( alignment & TQt::AlignHCenter )
x = (w - imagesize.width())/2;
- else if ( tqalignment & TQt::AlignLeft )
+ else if ( alignment & TQt::AlignLeft )
x = 0;
- else if ( tqalignment & TQt::AlignRight )
+ else if ( alignment & TQt::AlignRight )
x = w - imagesize.width();
- // y - tqalignment
- if ( tqalignment & TQt::AlignVCenter )
+ // y - alignment
+ if ( alignment & TQt::AlignVCenter )
y = (h - imagesize.height())/2;
- else if ( tqalignment & TQt::AlignTop )
+ else if ( alignment & TQt::AlignTop )
y = 0;
- else if ( tqalignment & TQt::AlignBottom )
+ else if ( alignment & TQt::AlignBottom )
y = h - imagesize.height();
//
@@ -258,7 +258,7 @@ void KuickPrintDialogPage::getOptions( TQMap<TQString,TQString>& opts,
TQString t = "true";
TQString f = "false";
-// ### opts["app-kuickshow-tqalignment"] = ;
+// ### opts["app-kuickshow-alignment"] = ;
opts["app-kuickshow-printFilename"] = m_addFileName->isChecked() ? t : f;
opts["app-kuickshow-blackwhite"] = m_blackwhite->isChecked() ? t : f;
opts["app-kuickshow-shrinkToFit"] = m_shrinkToFit->isChecked() ? t : f;
|
