diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:09 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:09 -0600 |
commit | 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b (patch) | |
tree | 4405f233f4b0eee7f4ad3d265a5584c9ce681011 /umbrello/umbrello/uml.cpp | |
parent | d6331f1b56eb6dca7a1950658b2932f208015da0 (diff) | |
download | tdesdk-3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b.tar.gz tdesdk-3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.
Diffstat (limited to 'umbrello/umbrello/uml.cpp')
-rw-r--r-- | umbrello/umbrello/uml.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 8f991962..8a305952 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -13,7 +13,7 @@ #include "uml.h" // qt includes -#include <clipboard.h> +#include <tqclipboard.h> #include <tqpopupmenu.h> #include <tqtimer.h> #include <tqwidgetstack.h> @@ -55,7 +55,7 @@ #include "umlviewlist.h" #include "worktoolbar.h" #ifdef HAVE_DOT -# include "autolayout/autolayoutdlg.h" //dimitri +# include "autotqlayout/autolayoutdlg.h" //dimitri #endif #include "model_utils.h" #include "clipboard/umlclipboard.h" @@ -225,8 +225,8 @@ void UMLApp::initActions() { TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); #if defined (HAVE_DOT) - autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()), - actionCollection(),"autolayout"); + autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()), + actionCollection(),"autotqlayout"); #endif sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); @@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() { void UMLApp::initStatusBar() { m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() ); - m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() ); + m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() ); m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); m_statusLabel->setMargin( 0 ); @@ -382,7 +382,7 @@ void UMLApp::initStatusBar() { statusBar()->addWidget( m_statusLabel, 1, false ); - m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter); + m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter); connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) )); } @@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs() TQDir d = url.path(-1); if(TQFile::exists(d.path())) { - int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite")); + int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite")); if(want_save == KMessageBox::Continue) cont = false; } else @@ -776,7 +776,7 @@ void UMLApp::slotFilePrint() DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc); printer.addDialogPage(selectPage); TQString msg; - if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) { + if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) { m_doc -> print(&printer); } @@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() { void UMLApp::slotEditPaste() { slotStatusMsg(i18n("Inserting clipboard contents...")); - TQMimeSource* data = TQApplication::clipboard()->data(); + TQMimeSource* data = TQApplication::tqclipboard()->data(); UMLClipboard clipboard; setCursor(KCursor::waitCursor()); if(!clipboard.paste(data)) { @@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) { statusBar()->clear(); m_statusLabel->setText( text ); - m_statusLabel->repaint(); + m_statusLabel->tqrepaint(); } void UMLApp::slotClassDiagram() { @@ -977,7 +977,7 @@ void UMLApp::enableRedo(bool enable) { /** initialize the QT's global clipboard support for the application */ void UMLApp::initClip() { - TQClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); // Don't poll the X11 clipboard every second. This is a little expensive and resulted @@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) { } void UMLApp::slotClipDataChanged() { - TQMimeSource * data = TQApplication::clipboard()->data(); + TQMimeSource * data = TQApplication::tqclipboard()->data(); //Pass the MimeSource to the Doc editPaste->setEnabled( data && canDecode(data) ); @@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) { TQMimeSource * clipdata = 0; if ((clipdata = clipboard.copy(bFromView)) != 0) { - TQClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); return true; @@ -1679,7 +1679,7 @@ void UMLApp::slotMoveTabRight() { //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 ); } -void UMLApp::slotAutolayout(){ +void UMLApp::slotAutotqlayout(){ #ifdef HAVE_DOT /* TQDialog* d = new AutolayoutDlg(getCurrentView()); |