summaryrefslogtreecommitdiffstats
path: root/kivio/kiviopart/kivio_view.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kivio/kiviopart/kivio_view.cpp')
-rw-r--r--kivio/kiviopart/kivio_view.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 282312a0..8d529449 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -24,7 +24,7 @@
#include <time.h>
#include <assert.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwidgetstack.h>
#include <tqsplitter.h>
#include <tqpushbutton.h>
@@ -37,7 +37,7 @@
#include <tqtoolbutton.h>
#include <tqtimer.h>
#include <tqbutton.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqprogressbar.h>
#include <tqstringlist.h>
@@ -153,7 +153,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
if(KStatusBar* sb = statusBar()) { // No statusbar in e.g. konqueror
m_pageCountSLbl = new KStatusBarLabel(i18n("%1 current page, %2 total number of pages",
- "Page %1/%2").arg(0).arg(0), PAGECOUNT_TEXT, sb);
+ "Page %1/%2").tqarg(0).tqarg(0), PAGECOUNT_TEXT, sb);
addStatusBarItem(m_pageCountSLbl, 0, false);
m_infoSLbl = new KStatusBarLabel("", INFO_TEXT, sb);
@@ -163,8 +163,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
TQString unit = KoUnit::unitName(m_pDoc->unit());
KoPoint xy(0, 0);
TQString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit",
- "X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
- .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+ "X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2))
+ .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit);
m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb);
addStatusBarItem(m_coordSLbl, 0, true);
}
@@ -245,20 +245,20 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
&(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int)));
connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*)));
- TQGridLayout* layout = new TQGridLayout(pRightSide);
- layout->addWidget(hRuler, 0, 1);
- layout->addWidget(vRuler, 1, 0);
- layout->addWidget(canvasBase, 1, 1);
- layout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
- layout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
- layout->setRowStretch(1, 10);
- layout->setColStretch(1, 10);
+ TQGridLayout* tqlayout = new TQGridLayout(pRightSide);
+ tqlayout->addWidget(hRuler, 0, 1);
+ tqlayout->addWidget(vRuler, 1, 0);
+ tqlayout->addWidget(canvasBase, 1, 1);
+ tqlayout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
+ tqlayout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
+ tqlayout->setRowStretch(1, 10);
+ tqlayout->setColStretch(1, 10);
TQWidget::setFocusPolicy( TQ_StrongFocus );
setFocusProxy( m_pCanvas );
connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) );
+ connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) );
setInstance(KivioFactory::global());
if ( !m_pDoc->isReadWrite() )
@@ -390,7 +390,7 @@ void KivioView::setupActions()
m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" );
m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" );
m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" );
- connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged()));
+ connect(TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged()));
m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils");
m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils");
@@ -1134,13 +1134,13 @@ void KivioView::ungroupStencils()
void KivioView::selectAllStencils()
{
m_pActivePage->selectAllStencils();
- m_pCanvas->repaint();
+ m_pCanvas->tqrepaint();
}
void KivioView::unselectAllStencils()
{
m_pActivePage->unselectAllStencils();
- m_pCanvas->repaint();
+ m_pCanvas->tqrepaint();
}
TQColor KivioView::fgColor() const
@@ -1733,7 +1733,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
m_pActivePage->addStencil( pStencil );
m_pActivePage->selectStencil( pStencil );
- // Mark the page as modified and repaint
+ // Mark the page as modified and tqrepaint
m_pDoc->updateView(m_pActivePage);
pluginManager()->activateDefaultTool();
m_pCanvas->updateAutoGuideLines();
@@ -1748,7 +1748,7 @@ void KivioView::alignStencilsDlg()
m_pActivePage->alignStencils(dlg->align());
m_pActivePage->distributeStencils(dlg->distribute());
- m_pCanvas->repaint();
+ m_pCanvas->tqrepaint();
}
delete dlg;
@@ -1842,8 +1842,8 @@ void KivioView::setMousePos( int mx, int my )
KoPoint xy = m_pCanvas->mapFromScreen(TQPoint(mx, my));
xy.setX(KoUnit::toUserValue(xy.x(), m_pDoc->unit()));
xy.setY(KoUnit::toUserValue(xy.y(), m_pDoc->unit()));
- TQString text = i18n("X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
- .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+ TQString text = i18n("X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2))
+ .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit);
m_coordSLbl->setText(text);
}
}
@@ -2113,7 +2113,7 @@ Kivio::PluginManager* KivioView::pluginManager()
void KivioView::clipboardDataChanged()
{
- TQMimeSource* data = TQApplication::clipboard()->data();
+ TQMimeSource* data = TQApplication::tqclipboard()->data();
KivioDragObject decoder(this);
bool paste = decoder.canDecode(data);
m_editPaste->setEnabled(paste);
@@ -2191,7 +2191,7 @@ int KivioView::vTextAlign()
void KivioView::updatePageStatusLabel()
{
- TQString text = i18n("Page %1/%2").arg(m_pDoc->map()->pageList().find(activePage()) + 1).arg(m_pDoc->map()->count());
+ TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().find(activePage()) + 1).tqarg(m_pDoc->map()->count());
m_pageCountSLbl->setText(text);
}