Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 10 insertions, 10 deletions

diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cpp b/kspread/dialogs/kspread_dlg_paperlayout.cpp
index 8f18de6d..060f65ba 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cpp
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp
@@ -354,7 +354,7 @@ void PaperLayout::slotOk()
 
       if ( tmpRepeatCols.isEmpty() )
       {
-        print->setPrintRepeatColumns( tqMakePair( 0, 0 ) );
+        print->setPrintRepeatColumns( qMakePair( 0, 0 ) );
       }
       else
       {
@@ -369,7 +369,7 @@ void PaperLayout::slotOk()
                 if ( col2 > 0 && col2 <= KS_colMax )
                 {
                     error = false;
-                    print->setPrintRepeatColumns ( tqMakePair( col1, col2 ) );
+                    print->setPrintRepeatColumns ( qMakePair( col1, col2 ) );
                 }
             }
         }
@@ -380,7 +380,7 @@ void PaperLayout::slotOk()
 
       if ( tmpRepeatRows.isEmpty() )
       {
-        print->setPrintRepeatRows ( tqMakePair( 0, 0 ) );
+        print->setPrintRepeatRows ( qMakePair( 0, 0 ) );
       }
       else
       {
@@ -395,7 +395,7 @@ void PaperLayout::slotOk()
                 if ( row2 > 0 && row2 <= KS_rowMax )
                 {
                     error = false;
-                    print->setPrintRepeatRows ( tqMakePair( row1, row2 ) );
+                    print->setPrintRepeatRows ( qMakePair( row1, row2 ) );
                 }
             }
         }
diff --git a/kspread/kspread_sheet.cpp b/kspread/kspread_sheet.cpp
index 85e8f15f..8e20757e 100644
--- a/kspread/kspread_sheet.cpp
+++ b/kspread/kspread_sheet.cpp
@@ -7941,7 +7941,7 @@ bool Sheet::loadXML( const TQDomElement& sheet )
     {
         int left = printrepeatcolumns.attribute( "left" ).toInt();
         int right = printrepeatcolumns.attribute( "right" ).toInt();
-        d->print->setPrintRepeatColumns( tqMakePair( left, right ) );
+        d->print->setPrintRepeatColumns( qMakePair( left, right ) );
     }
 
     // load print repeat rows
@@ -7950,7 +7950,7 @@ bool Sheet::loadXML( const TQDomElement& sheet )
     {
         int top = printrepeatrows.attribute( "top" ).toInt();
         int bottom = printrepeatrows.attribute( "bottom" ).toInt();
-        d->print->setPrintRepeatRows( tqMakePair( top, bottom ) );
+        d->print->setPrintRepeatRows( qMakePair( top, bottom ) );
     }
 
     if( !sheet.hasAttribute( "borders1.2" ) )
diff --git a/kspread/kspread_sheetprint.cpp b/kspread/kspread_sheetprint.cpp
index b8a3a919..5520c5ad 100644
--- a/kspread/kspread_sheetprint.cpp
+++ b/kspread/kspread_sheetprint.cpp
@@ -76,8 +76,8 @@ SheetPrint::SheetPrint( Sheet* sheet )
     m_maxCheckedNewPageY = 1;
     m_dPrintRepeatColumnsWidth = 0.0;
     m_dPrintRepeatRowsHeight = 0.0;
-    m_printRepeatColumns = tqMakePair( 0, 0 );
-    m_printRepeatRows = tqMakePair( 0, 0 );
+    m_printRepeatColumns = qMakePair( 0, 0 );
+    m_printRepeatRows = qMakePair( 0, 0 );
     m_dZoom = 1.0;
     m_iPageLimitX = 0;
     m_iPageLimitY = 0;
@@ -1734,7 +1734,7 @@ void SheetPrint::removeColumn( int col, int nbCol )
         //Validity checks
         if ( left < 1 ) left = 1;
         if ( right < 1 ) right = 1;
-        setPrintRepeatColumns ( tqMakePair( left, right ) );
+        setPrintRepeatColumns ( qMakePair( left, right ) );
     }
 }
 
@@ -1772,7 +1772,7 @@ void SheetPrint::removeRow( int row, int nbRow )
         //Validity checks
         if ( top < 1 ) top = 1;
         if ( bottom < 1 ) bottom = 1;
-        setPrintRepeatRows( tqMakePair( top, bottom ) );
+        setPrintRepeatRows( qMakePair( top, bottom ) );
     }
 }