summaryrefslogtreecommitdiffstats
path: root/kmag
diff options
context:
space:
mode:
Diffstat (limited to 'kmag')
-rw-r--r--kmag/kmag.cpp18
-rw-r--r--kmag/kmag.h2
-rw-r--r--kmag/kmagselrect.cpp16
-rw-r--r--kmag/kmagzoomview.cpp50
-rw-r--r--kmag/kmagzoomview.h2
5 files changed, 44 insertions, 44 deletions
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 5827468..41807f1 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -21,8 +21,8 @@
#include <tqdir.h>
#include <tqprinter.h>
#include <tqpainter.h>
-#include <tqlayout.h>
-#include <tqclipboard.h>
+#include <layout.h>
+#include <clipboard.h>
#include <tqdragobject.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
@@ -247,7 +247,7 @@ void KmagApp::initActions()
void KmagApp::initView()
{
m_zoomView = new KMagZoomView( this, "ZoomView" );
- m_zoomView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) );
+ m_zoomView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) );
m_zoomView->setFrameShape( TQFrame::StyledPanel );
m_zoomView->setFrameShadow( TQFrame::Raised );
@@ -550,7 +550,7 @@ void KmagApp::saveZoomPixmap()
bool toggled(false);
// stop refresh temporarily
- if (m_zoomView->getRefreshtqStatus()) {
+ if (m_zoomView->getRefreshStatus()) {
slotToggleRefresh();
toggled = true;
}
@@ -571,7 +571,7 @@ void KmagApp::saveZoomPixmap()
KMessageBox::error(0, i18n("Unable to upload file over the network."),
i18n("Error Writing File"));
} else {
- KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()),
+ KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()),
i18n("Information"), "save_confirm");
}
}
@@ -583,7 +583,7 @@ void KmagApp::saveZoomPixmap()
KMessageBox::error(0, i18n("Unable to save file. Please check if you have permission to write to the directory."),
i18n("Error Writing File"));
} else {
- KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()),
+ KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()),
i18n("Information"), "save_confirm");
}
}
@@ -597,7 +597,7 @@ void KmagApp::saveZoomPixmap()
void KmagApp::slotToggleRefresh()
{
m_zoomView->toggleRefresh();
- if(m_zoomView->getRefreshtqStatus()) {
+ if(m_zoomView->getRefreshStatus()) {
refreshSwitch->setIcon("stop.png");
refreshSwitch->setText(i18n("Stop"));
refreshSwitch->setToolTip(i18n("Click to stop window update"));
@@ -810,7 +810,7 @@ void KmagApp::slotFilePrint()
#endif
// stop refresh temporarily
- if (m_zoomView->getRefreshtqStatus()) {
+ if (m_zoomView->getRefreshStatus()) {
slotToggleRefresh();
toggled = true;
}
@@ -864,7 +864,7 @@ void KmagApp::slotFileQuit()
void KmagApp::copyToClipBoard()
{
- TQClipboard *cb=KApplication::tqclipboard();
+ TQClipboard *cb=KApplication::clipboard();
cb->setPixmap(m_zoomView->getPixmap());
}
diff --git a/kmag/kmag.h b/kmag/kmag.h
index aeee22b..445d51e 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -71,7 +71,7 @@ class KmagApp : public KMainWindow
protected:
- /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp
index 236bddf..73caf5a 100644
--- a/kmag/kmagselrect.cpp
+++ b/kmag/kmagselrect.cpp
@@ -184,19 +184,19 @@ void KMagSelRect::hide()
void KMagSelRect::update()
{
// make sure the selection window does not go outside of the display
- if (height() > TQApplication::desktop()->tqgeometry().height())
- setHeight (TQApplication::desktop()->tqgeometry().height());
- if (width() > TQApplication::desktop()->tqgeometry().width())
- setWidth (TQApplication::desktop()->tqgeometry().width());
+ if (height() > TQApplication::desktop()->geometry().height())
+ setHeight (TQApplication::desktop()->geometry().height());
+ if (width() > TQApplication::desktop()->geometry().width())
+ setWidth (TQApplication::desktop()->geometry().width());
if (top() < 0)
moveTop (0);
if (left() < 0)
moveLeft (0);
- if (bottom() > TQApplication::desktop()->tqgeometry().bottom())
- moveBottom (TQApplication::desktop()->tqgeometry().bottom());
- if (right() > TQApplication::desktop()->tqgeometry().right())
- moveRight (TQApplication::desktop()->tqgeometry().right());
+ if (bottom() > TQApplication::desktop()->geometry().bottom())
+ moveBottom (TQApplication::desktop()->geometry().bottom());
+ if (right() > TQApplication::desktop()->geometry().right())
+ moveRight (TQApplication::desktop()->geometry().right());
if (selectionwindow != 0)
selectionwindow->setSelRect (TQRect (topLeft(), bottomRight()));
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index f0f3715..47f6a46 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -80,22 +80,22 @@ static uchar phand_bits[] = {
static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Window start = 0, int level = -1) {
- Window root, parent, *tqchildren; uint ntqchildren;
+ Window root, parent, *children; uint nchildren;
if (0 == start)
start = qt_xrootwin();
bool winIdFound = false;
- if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &tqchildren, &ntqchildren)) {
- for (uint i=0; i < ntqchildren; ++i) {
+ if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &children, &nchildren)) {
+ for (uint i=0; i < nchildren; ++i) {
if (winIdFound) {
- if (ignoreId != tqchildren [i]) {
+ if (ignoreId != children [i]) {
XWindowAttributes atts;
- XGetWindowAttributes (qt_xdisplay(), tqchildren [i], &atts);
+ XGetWindowAttributes (qt_xdisplay(), children [i], &atts);
if (atts.map_state == IsViewable)
region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle);
}
}
- else if (winId == tqchildren [i])
+ else if (winId == children [i])
winIdFound = true;
// According to tests, my own window ID is either on toplevel or two levels below.
@@ -103,15 +103,15 @@ static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Win
// then to five recursion levels, and make a full recursive search only if that
// was unsuccessful.
else if (level > 1)
- winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], level-1);
+ winIdFound = obscuredRegion (region, winId, ignoreId, children [i], level-1);
else if (level == -1)
- if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 0)))
- if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 1)))
- winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], -1);
+ if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 0)))
+ if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 1)))
+ winIdFound = obscuredRegion (region, winId, ignoreId, children [i], -1);
}
- if (tqchildren != NULL)
- XFree (tqchildren);
+ if (children != NULL)
+ XFree (children);
}
return winIdFound;
@@ -255,7 +255,7 @@ void KMagZoomView::drawContents ( TQPainter * p, int clipx, int clipy, int clipw
if (m_invert) {
TQImage zoomedImage;
zoomedImage = zoomedPixmap.convertToImage();
- zoomedImage.tqinvertPixels (false);
+ zoomedImage.invertPixels (false);
p->drawImage (TQPoint (clipx-contentsX(), clipy-contentsY()), zoomedImage, zoomedImage.rect(),
TQt::ThresholdDither | TQt::ThresholdAlphaDither | TQt::AvoidDither);
} else {
@@ -493,7 +493,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
// set the mouse mode to normal
m_mouseMode = Normal;
- // restore the cursor tqshape
+ // restore the cursor shape
setCursor(arrowCursor);
// restore the cursor position
@@ -504,7 +504,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
// set the mouse mode to normal
m_mouseMode = Normal;
- // restore the cursor tqshape
+ // restore the cursor shape
setCursor(arrowCursor);
// restore the cursor position
@@ -516,7 +516,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
// set the mouse mode to normal
m_mouseMode = Normal;
- // restore the cursor tqshape
+ // restore the cursor shape
setCursor(arrowCursor);
}
break;
@@ -706,7 +706,7 @@ void KMagZoomView::fitToWindow()
m_selRect.moveCenter(currCenter);
m_selRect.update();
- viewport()->tqrepaint(false);
+ viewport()->repaint(false);
}
void KMagZoomView::setFitToWindow(bool fit)
@@ -751,18 +751,18 @@ void KMagZoomView::grabFrame()
intersection &= TQRegion (selRect, TQRegion::Rectangle);
// We don't want to overpaint other windows that happen to be on top
- obscuredRegion (intersection, tqtopLevelWidget()->winId(), m_selRect.winId());
+ obscuredRegion (intersection, topLevelWidget()->winId(), m_selRect.winId());
intersection.translate (-selRect.x(), -selRect.y());
TQPainter painter (&m_grabbedPixmap, true);
- TQMemArray<TQRect> rects (intersection.tqrects());
+ TQMemArray<TQRect> rects (intersection.rects());
for (uint i = 0; i < rects.size(); i++)
painter.fillRect (rects[i], TQBrush (TQColor (128, 128, 128)));
- // call tqrepaint to display the newly grabbed image
+ // call repaint to display the newly grabbed image
TQRect newSize = m_zoomMatrix.mapRect (m_grabbedPixmap.rect());
resizeContents (newSize.width(), newSize.height());
- viewport()->tqrepaint(false);
+ viewport()->repaint(false);
}
@@ -775,7 +775,7 @@ void KMagZoomView::updateMouseView()
if(m_selRect.left() <= pos.x() && pos.x() <= m_selRect.right() &&
m_selRect.top() <= pos.y() && pos.y() <= m_selRect.bottom() &&
m_refreshSwitch)
- viewport()->tqrepaint(false);
+ viewport()->repaint(false);
}
/**
@@ -801,7 +801,7 @@ void KMagZoomView::setZoom(float zoom)
{
m_zoom = zoom;
updateMatrix();
- viewport()->tqrepaint();
+ viewport()->repaint();
}
/**
@@ -811,7 +811,7 @@ void KMagZoomView::setRotation(int rotation)
{
m_rotation = rotation;
updateMatrix();
- viewport()->tqrepaint();
+ viewport()->repaint();
}
/**
@@ -820,7 +820,7 @@ void KMagZoomView::setRotation(int rotation)
void KMagZoomView::setInvertation(bool invert)
{
m_invert = invert;
- viewport()->tqrepaint();
+ viewport()->repaint();
}
/**
diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h
index 1f8d9bc..89882b4 100644
--- a/kmag/kmagzoomview.h
+++ b/kmag/kmagzoomview.h
@@ -61,7 +61,7 @@ class KMagZoomView : public TQScrollView
TQPixmap getPixmap();
/// Returns the state of the refresh switch
- bool getRefreshtqStatus() const { return m_refreshSwitch; };
+ bool getRefreshStatus() const { return m_refreshSwitch; };
/// Returns teh status of followMouse
bool getFollowMouse() const { return m_followMouse; };
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 13:58:12 +0000