Francois Andriot
13 years ago
parent
6bb431be79
commit
9750a057f2
@ -0,0 +1,662 @@
|
|||||||
|
commit c7e29c4606e72cf1d3d0052eec08805c8cf3fce7
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324253375 -0600
|
||||||
|
|
||||||
|
Rename old tq methods that no longer need a unique name
|
||||||
|
|
||||||
|
diff --git a/src/diff.h b/src/diff.h
|
||||||
|
index ee3076e..a4015d1 100644
|
||||||
|
--- a/src/diff.h
|
||||||
|
+++ b/src/diff.h
|
||||||
|
@@ -169,10 +169,10 @@ public:
|
||||||
|
typedef std::vector<Diff3WrapLine> Diff3WrapLineVector;
|
||||||
|
|
||||||
|
|
||||||
|
-class TotalDifftqStatus
|
||||||
|
+class TotalDiffStatus
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
- TotalDifftqStatus(){ reset(); }
|
||||||
|
+ TotalDiffStatus(){ reset(); }
|
||||||
|
void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false;
|
||||||
|
bTextAEqC=false; bTextBEqC=false; bTextAEqB=false;
|
||||||
|
nofUnsolvedConflicts=0; nofSolvedConflicts=0;
|
||||||
|
diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
|
||||||
|
index 3c570e4..361eb73 100644
|
||||||
|
--- a/src/difftextwindow.cpp
|
||||||
|
+++ b/src/difftextwindow.cpp
|
||||||
|
@@ -860,9 +860,9 @@ void DiffTextWindowData::writeLine(
|
||||||
|
else
|
||||||
|
{
|
||||||
|
p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
||||||
|
- fontWidth*(spaces), fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() );
|
||||||
|
+ fontWidth*(spaces), fontHeight, m_pDiffTextWindow->colorGroup().highlight() );
|
||||||
|
|
||||||
|
- p.setPen( m_pDiffTextWindow->tqcolorGroup().highlightedText() );
|
||||||
|
+ p.setPen( m_pDiffTextWindow->colorGroup().highlightedText() );
|
||||||
|
p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s );
|
||||||
|
|
||||||
|
m_selection.bSelectionContainsData = true;
|
||||||
|
@@ -875,7 +875,7 @@ void DiffTextWindowData::writeLine(
|
||||||
|
if( m_selection.lineWithin( line ) && m_selection.lineWithin( line+1 ) )
|
||||||
|
{
|
||||||
|
p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
||||||
|
- deviceWidth, fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() );
|
||||||
|
+ deviceWidth, fontHeight, m_pDiffTextWindow->colorGroup().highlight() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
|
||||||
|
index 7565e20..0520af3 100644
|
||||||
|
--- a/src/directorymergewindow.cpp
|
||||||
|
+++ b/src/directorymergewindow.cpp
|
||||||
|
@@ -387,7 +387,7 @@ static TQPixmap pixCombiner2( const TQPixmap* pm1, const TQPixmap* pm2 )
|
||||||
|
return pix;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
|
||||||
|
+static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
|
||||||
|
int& nofDirs, int& nofEqualFiles, int& nofManualMerges )
|
||||||
|
{
|
||||||
|
if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC )
|
||||||
|
@@ -408,7 +408,7 @@ static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for( TQListViewItem* p = i->firstChild(); p!=0; p = p->nextSibling() )
|
||||||
|
- calcDirtqStatus( bThreeDirs, static_cast<DirMergeItem*>(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
|
||||||
|
+ calcDirStatus( bThreeDirs, static_cast<DirMergeItem*>(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
|
||||||
|
}
|
||||||
|
|
||||||
|
static TQString sortString(const TQString& s, bool bCaseSensitive)
|
||||||
|
@@ -698,7 +698,7 @@ bool DirectoryMergeWindow::init
|
||||||
|
int nofEqualFiles=0;
|
||||||
|
int nofManualMerges=0;
|
||||||
|
for( TQListViewItem* p = firstChild(); p!=0; p = p->nextSibling() )
|
||||||
|
- calcDirtqStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(p),
|
||||||
|
+ calcDirStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(p),
|
||||||
|
nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
|
||||||
|
|
||||||
|
TQString s;
|
||||||
|
@@ -915,10 +915,10 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
|
||||||
|
mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : TQString(""),
|
||||||
|
mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : TQString(""),
|
||||||
|
"",
|
||||||
|
- "","","",&mfi.m_totalDifftqStatus
|
||||||
|
+ "","","",&mfi.m_totalDiffStatus
|
||||||
|
);
|
||||||
|
- int nofNonwhiteConflicts = mfi.m_totalDifftqStatus.nofUnsolvedConflicts +
|
||||||
|
- mfi.m_totalDifftqStatus.nofSolvedConflicts - mfi.m_totalDifftqStatus.nofWhitespaceConflicts;
|
||||||
|
+ int nofNonwhiteConflicts = mfi.m_totalDiffStatus.nofUnsolvedConflicts +
|
||||||
|
+ mfi.m_totalDiffStatus.nofSolvedConflicts - mfi.m_totalDiffStatus.nofWhitespaceConflicts;
|
||||||
|
|
||||||
|
if (m_pOptions->m_bDmWhiteSpaceEqual && nofNonwhiteConflicts == 0)
|
||||||
|
{
|
||||||
|
@@ -928,25 +928,25 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- mfi.m_bEqualAB = mfi.m_totalDifftqStatus.bBinaryAEqB;
|
||||||
|
- mfi.m_bEqualBC = mfi.m_totalDifftqStatus.bBinaryBEqC;
|
||||||
|
- mfi.m_bEqualAC = mfi.m_totalDifftqStatus.bBinaryAEqC;
|
||||||
|
+ mfi.m_bEqualAB = mfi.m_totalDiffStatus.bBinaryAEqB;
|
||||||
|
+ mfi.m_bEqualBC = mfi.m_totalDiffStatus.bBinaryBEqC;
|
||||||
|
+ mfi.m_bEqualAC = mfi.m_totalDiffStatus.bBinaryAEqC;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bool bError;
|
||||||
|
- TQString eqtqStatus;
|
||||||
|
+ TQString eqStatus;
|
||||||
|
if( mfi.m_bExistsInA && mfi.m_bExistsInB )
|
||||||
|
{
|
||||||
|
if( mfi.m_bDirA ) mfi.m_bEqualAB=true;
|
||||||
|
- else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqtqStatus );
|
||||||
|
+ else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus );
|
||||||
|
}
|
||||||
|
if( mfi.m_bExistsInA && mfi.m_bExistsInC )
|
||||||
|
{
|
||||||
|
if( mfi.m_bDirA ) mfi.m_bEqualAC=true;
|
||||||
|
- else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqtqStatus );
|
||||||
|
+ else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus );
|
||||||
|
}
|
||||||
|
if( mfi.m_bExistsInB && mfi.m_bExistsInC )
|
||||||
|
{
|
||||||
|
@@ -955,7 +955,7 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if( mfi.m_bDirB ) mfi.m_bEqualBC=true;
|
||||||
|
- else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqtqStatus );
|
||||||
|
+ else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1723,7 +1723,7 @@ void DirMergeItem::init(MergeFileInfos* pMFI)
|
||||||
|
{
|
||||||
|
pMFI->m_pDMI = this;
|
||||||
|
m_pMFI = pMFI;
|
||||||
|
- TotalDifftqStatus& tds = pMFI->m_totalDifftqStatus;
|
||||||
|
+ TotalDiffStatus& tds = pMFI->m_totalDiffStatus;
|
||||||
|
if ( m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@@ -2820,7 +2820,7 @@ TQTextStream& operator<<( TQTextStream& ts, MergeFileInfos& mfi )
|
||||||
|
//FileAccess m_fileInfoB;
|
||||||
|
//FileAccess m_fileInfoC;
|
||||||
|
|
||||||
|
- //TotalDifftqStatus m_totalDifftqStatus;
|
||||||
|
+ //TotalDiffStatus m_totalDiffStatus;
|
||||||
|
|
||||||
|
vm.save(ts);
|
||||||
|
|
||||||
|
diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h
|
||||||
|
index 25a66f7..99c0405 100644
|
||||||
|
--- a/src/directorymergewindow.h
|
||||||
|
+++ b/src/directorymergewindow.h
|
||||||
|
@@ -26,7 +26,7 @@
|
||||||
|
#include <map>
|
||||||
|
#include "common.h"
|
||||||
|
#include "fileaccess.h"
|
||||||
|
-#include "diff.h" //TotalDifftqStatus
|
||||||
|
+#include "diff.h" //TotalDiffStatus
|
||||||
|
|
||||||
|
class OptionDialog;
|
||||||
|
class KIconLoader;
|
||||||
|
@@ -37,7 +37,7 @@ class TQLabel;
|
||||||
|
class KAction;
|
||||||
|
class KToggleAction;
|
||||||
|
class KActionCollection;
|
||||||
|
-class TotalDifftqStatus;
|
||||||
|
+class TotalDiffStatus;
|
||||||
|
|
||||||
|
enum e_MergeOperation
|
||||||
|
{
|
||||||
|
@@ -99,7 +99,7 @@ public:
|
||||||
|
FileAccess m_fileInfoB;
|
||||||
|
FileAccess m_fileInfoC;
|
||||||
|
|
||||||
|
- TotalDifftqStatus m_totalDifftqStatus;
|
||||||
|
+ TotalDiffStatus m_totalDiffStatus;
|
||||||
|
};
|
||||||
|
|
||||||
|
class DirMergeItem : public TQListViewItem
|
||||||
|
@@ -319,7 +319,7 @@ protected:
|
||||||
|
KAction* m_pDirSaveMergeState;
|
||||||
|
KAction* m_pDirLoadMergeState;
|
||||||
|
signals:
|
||||||
|
- void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDifftqStatus*);
|
||||||
|
+ void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDiffStatus*);
|
||||||
|
void checkIfCanContinue( bool* pbContinue );
|
||||||
|
void updateAvailabilities();
|
||||||
|
void statusBarMessage( const TQString& msg );
|
||||||
|
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
|
||||||
|
index c2be1dc..01b8d48 100644
|
||||||
|
--- a/src/fileaccess.cpp
|
||||||
|
+++ b/src/fileaccess.cpp
|
||||||
|
@@ -407,11 +407,11 @@ bool FileAccess::writeFile( const void* pSrcBuffer, unsigned long length )
|
||||||
|
if ( isExecutable() ) // value is true if the old file was executable
|
||||||
|
{
|
||||||
|
// Preserve attributes
|
||||||
|
- struct stat srcFiletqStatus;
|
||||||
|
- int statResult = ::stat( filePath().ascii(), &srcFiletqStatus );
|
||||||
|
+ struct stat srcFileStatus;
|
||||||
|
+ int statResult = ::stat( filePath().ascii(), &srcFileStatus );
|
||||||
|
if (statResult==0)
|
||||||
|
{
|
||||||
|
- ::chmod ( filePath().ascii(), srcFiletqStatus.st_mode | S_IXUSR );
|
||||||
|
+ ::chmod ( filePath().ascii(), srcFileStatus.st_mode | S_IXUSR );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -938,28 +938,28 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
|
||||||
|
|
||||||
|
// Update the times of the destFile
|
||||||
|
#ifdef _WIN32
|
||||||
|
- struct _stat srcFiletqStatus;
|
||||||
|
- int statResult = ::_stat( srcName.ascii(), &srcFiletqStatus );
|
||||||
|
+ struct _stat srcFileStatus;
|
||||||
|
+ int statResult = ::_stat( srcName.ascii(), &srcFileStatus );
|
||||||
|
if (statResult==0)
|
||||||
|
{
|
||||||
|
_utimbuf destTimes;
|
||||||
|
- destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */
|
||||||
|
- destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */
|
||||||
|
+ destTimes.actime = srcFileStatus.st_atime;/* time of last access */
|
||||||
|
+ destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */
|
||||||
|
|
||||||
|
_utime ( destName.ascii(), &destTimes );
|
||||||
|
- _chmod ( destName.ascii(), srcFiletqStatus.st_mode );
|
||||||
|
+ _chmod ( destName.ascii(), srcFileStatus.st_mode );
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
- struct stat srcFiletqStatus;
|
||||||
|
- int statResult = ::stat( srcName.ascii(), &srcFiletqStatus );
|
||||||
|
+ struct stat srcFileStatus;
|
||||||
|
+ int statResult = ::stat( srcName.ascii(), &srcFileStatus );
|
||||||
|
if (statResult==0)
|
||||||
|
{
|
||||||
|
utimbuf destTimes;
|
||||||
|
- destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */
|
||||||
|
- destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */
|
||||||
|
+ destTimes.actime = srcFileStatus.st_atime;/* time of last access */
|
||||||
|
+ destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */
|
||||||
|
|
||||||
|
utime ( destName.ascii(), &destTimes );
|
||||||
|
- chmod ( destName.ascii(), srcFiletqStatus.st_mode );
|
||||||
|
+ chmod ( destName.ascii(), srcFileStatus.st_mode );
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
@@ -1010,7 +1010,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore )
|
||||||
|
".nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj "
|
||||||
|
"*.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$";
|
||||||
|
|
||||||
|
- addEntriesFromString(TQString::tqfromLatin1(ignorestr));
|
||||||
|
+ addEntriesFromString(TQString::fromLatin1(ignorestr));
|
||||||
|
addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore");
|
||||||
|
addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE")));
|
||||||
|
|
||||||
|
@@ -1032,7 +1032,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore )
|
||||||
|
{
|
||||||
|
if (pos>pos1)
|
||||||
|
{
|
||||||
|
- addEntry( TQString::tqfromLatin1( &buf[pos1], pos-pos1 ) );
|
||||||
|
+ addEntry( TQString::fromLatin1( &buf[pos1], pos-pos1 ) );
|
||||||
|
}
|
||||||
|
++pos1;
|
||||||
|
}
|
||||||
|
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
|
||||||
|
index c3541ec..e6b3f40 100644
|
||||||
|
--- a/src/kdiff3.cpp
|
||||||
|
+++ b/src/kdiff3.cpp
|
||||||
|
@@ -280,8 +280,8 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
|
||||||
|
KApplication::kApplication()->iconLoader() );
|
||||||
|
m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter );
|
||||||
|
m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo );
|
||||||
|
- connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDifftqStatus*)),
|
||||||
|
- TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDifftqStatus*)));
|
||||||
|
+ connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)),
|
||||||
|
+ TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)));
|
||||||
|
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities()));
|
||||||
|
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities()));
|
||||||
|
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), TQT_TQOBJECT(this), TQT_SLOT(slotCheckIfCanContinue(bool*)));
|
||||||
|
@@ -341,13 +341,13 @@ void KDiff3App::completeInit( const TQString& fn1, const TQString& fn2, const TQ
|
||||||
|
SourceData* pSD=0;
|
||||||
|
if ( m_sd3.isEmpty() )
|
||||||
|
{
|
||||||
|
- if ( m_totalDifftqStatus.bBinaryAEqB ){ pSD = &m_sd1; }
|
||||||
|
+ if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd1; }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- if ( m_totalDifftqStatus.bBinaryBEqC ){ pSD = &m_sd3; } // B==C (assume A is old)
|
||||||
|
- else if ( m_totalDifftqStatus.bBinaryAEqB ){ pSD = &m_sd3; } // assuming C has changed
|
||||||
|
- else if ( m_totalDifftqStatus.bBinaryAEqC ){ pSD = &m_sd2; } // assuming B has changed
|
||||||
|
+ if ( m_totalDiffStatus.bBinaryBEqC ){ pSD = &m_sd3; } // B==C (assume A is old)
|
||||||
|
+ else if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd3; } // assuming C has changed
|
||||||
|
+ else if ( m_totalDiffStatus.bBinaryAEqC ){ pSD = &m_sd2; } // assuming B has changed
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( pSD!=0 )
|
||||||
|
diff --git a/src/kdiff3.h b/src/kdiff3.h
|
||||||
|
index f5e240f..c81ae71 100644
|
||||||
|
--- a/src/kdiff3.h
|
||||||
|
+++ b/src/kdiff3.h
|
||||||
|
@@ -144,7 +144,7 @@ class KDiff3App : public TQSplitter
|
||||||
|
/** open a file and load it into the document*/
|
||||||
|
void slotFileOpen();
|
||||||
|
void slotFileOpen2( TQString fn1, TQString fn2, TQString fn3, TQString ofn,
|
||||||
|
- TQString an1, TQString an2, TQString an3, TotalDifftqStatus* pTotalDifftqStatus );
|
||||||
|
+ TQString an1, TQString an2, TQString an3, TotalDiffStatus* pTotalDiffStatus );
|
||||||
|
|
||||||
|
void slotFileNameChanged(const TQString& fileName, int winIdx);
|
||||||
|
|
||||||
|
@@ -281,7 +281,7 @@ class KDiff3App : public TQSplitter
|
||||||
|
|
||||||
|
TQWidget* m_pCornerWidget;
|
||||||
|
|
||||||
|
- TotalDifftqStatus m_totalDifftqStatus;
|
||||||
|
+ TotalDiffStatus m_totalDiffStatus;
|
||||||
|
|
||||||
|
SourceData m_sd1;
|
||||||
|
SourceData m_sd2;
|
||||||
|
@@ -310,7 +310,7 @@ class KDiff3App : public TQSplitter
|
||||||
|
OptionDialog* m_pOptionDialog;
|
||||||
|
FindDialog* m_pFindDialog;
|
||||||
|
|
||||||
|
- void init( bool bAuto=false, TotalDifftqStatus* pTotalDifftqStatus=0, bool bLoadFiles=true );
|
||||||
|
+ void init( bool bAuto=false, TotalDiffStatus* pTotalDiffStatus=0, bool bLoadFiles=true );
|
||||||
|
|
||||||
|
virtual bool eventFilter( TQObject* o, TQEvent* e );
|
||||||
|
virtual void resizeEvent(TQResizeEvent*);
|
||||||
|
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
|
||||||
|
index 119294f..a222a14 100644
|
||||||
|
--- a/src/mergeresultwindow.cpp
|
||||||
|
+++ b/src/mergeresultwindow.cpp
|
||||||
|
@@ -72,7 +72,7 @@ MergeResultWindow::MergeResultWindow(
|
||||||
|
m_sizeC = 0;
|
||||||
|
|
||||||
|
m_pDiff3LineList = 0;
|
||||||
|
- m_pTotalDifftqStatus = 0;
|
||||||
|
+ m_pTotalDiffStatus = 0;
|
||||||
|
m_pStatusBar = pStatusBar;
|
||||||
|
|
||||||
|
m_pOptionDialog = pOptionDialog;
|
||||||
|
@@ -97,7 +97,7 @@ void MergeResultWindow::init(
|
||||||
|
const LineData* pLineDataB, int sizeB,
|
||||||
|
const LineData* pLineDataC, int sizeC,
|
||||||
|
const Diff3LineList* pDiff3LineList,
|
||||||
|
- TotalDifftqStatus* pTotalDifftqStatus
|
||||||
|
+ TotalDiffStatus* pTotalDiffStatus
|
||||||
|
)
|
||||||
|
{
|
||||||
|
m_firstLine = 0;
|
||||||
|
@@ -118,7 +118,7 @@ void MergeResultWindow::init(
|
||||||
|
m_sizeC = sizeC;
|
||||||
|
|
||||||
|
m_pDiff3LineList = pDiff3LineList;
|
||||||
|
- m_pTotalDifftqStatus = pTotalDifftqStatus;
|
||||||
|
+ m_pTotalDiffStatus = pTotalDiffStatus;
|
||||||
|
|
||||||
|
m_selection.reset();
|
||||||
|
m_cursorXPos=0;
|
||||||
|
@@ -140,7 +140,7 @@ void MergeResultWindow::init(
|
||||||
|
void MergeResultWindow::reset()
|
||||||
|
{
|
||||||
|
m_pDiff3LineList = 0;
|
||||||
|
- m_pTotalDifftqStatus = 0;
|
||||||
|
+ m_pTotalDiffStatus = 0;
|
||||||
|
m_pldA = 0;
|
||||||
|
m_pldB = 0;
|
||||||
|
m_pldC = 0;
|
||||||
|
@@ -467,9 +467,9 @@ void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConfli
|
||||||
|
++nrOfWhiteSpaceConflicts;
|
||||||
|
}
|
||||||
|
|
||||||
|
- m_pTotalDifftqStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts;
|
||||||
|
- m_pTotalDifftqStatus->nofSolvedConflicts = nrOfSolvedConflicts;
|
||||||
|
- m_pTotalDifftqStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts;
|
||||||
|
+ m_pTotalDiffStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts;
|
||||||
|
+ m_pTotalDiffStatus->nofSolvedConflicts = nrOfSolvedConflicts;
|
||||||
|
+ m_pTotalDiffStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts;
|
||||||
|
|
||||||
|
|
||||||
|
m_cursorXPos=0;
|
||||||
|
@@ -804,17 +804,17 @@ void MergeResultWindow::showNrOfConflicts()
|
||||||
|
++nrOfConflicts;
|
||||||
|
}
|
||||||
|
TQString totalInfo;
|
||||||
|
- if ( m_pTotalDifftqStatus->bBinaryAEqB && m_pTotalDifftqStatus->bBinaryAEqC )
|
||||||
|
+ if ( m_pTotalDiffStatus->bBinaryAEqB && m_pTotalDiffStatus->bBinaryAEqC )
|
||||||
|
totalInfo += i18n("All input files are binary equal.");
|
||||||
|
- else if ( m_pTotalDifftqStatus->bTextAEqB && m_pTotalDifftqStatus->bTextAEqC )
|
||||||
|
+ else if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC )
|
||||||
|
totalInfo += i18n("All input files contain the same text.");
|
||||||
|
else {
|
||||||
|
- if ( m_pTotalDifftqStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B");
|
||||||
|
- else if ( m_pTotalDifftqStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B");
|
||||||
|
- if ( m_pTotalDifftqStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C");
|
||||||
|
- else if ( m_pTotalDifftqStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C");
|
||||||
|
- if ( m_pTotalDifftqStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C");
|
||||||
|
- else if ( m_pTotalDifftqStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C");
|
||||||
|
+ if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B");
|
||||||
|
+ else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B");
|
||||||
|
+ if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C");
|
||||||
|
+ else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C");
|
||||||
|
+ if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C");
|
||||||
|
+ else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C");
|
||||||
|
}
|
||||||
|
|
||||||
|
int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts();
|
||||||
|
@@ -1661,12 +1661,12 @@ void MergeResultWindow::writeLine(
|
||||||
|
|
||||||
|
if( m_selection.lineWithin( line+1 ) )
|
||||||
|
p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset,
|
||||||
|
- width(), fontHeight, tqcolorGroup().highlight() );
|
||||||
|
+ width(), fontHeight, colorGroup().highlight() );
|
||||||
|
else if ( lengthInLine2>0 )
|
||||||
|
p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset,
|
||||||
|
- fontWidth*lengthInLine2, fontHeight, tqcolorGroup().highlight() );
|
||||||
|
+ fontWidth*lengthInLine2, fontHeight, colorGroup().highlight() );
|
||||||
|
|
||||||
|
- p.setPen( tqcolorGroup().highlightedText() );
|
||||||
|
+ p.setPen( colorGroup().highlightedText() );
|
||||||
|
p.drawText( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset+fontAscent,
|
||||||
|
s.mid(firstPosInLine2,lengthInLine2), true );
|
||||||
|
}
|
||||||
|
@@ -3072,7 +3072,7 @@ WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog, TQWidget* pPar
|
||||||
|
|
||||||
|
m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this);
|
||||||
|
pHLayout->addWidget( m_pModifiedLabel );
|
||||||
|
- m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->tqsizeHint() );
|
||||||
|
+ m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->sizeHint() );
|
||||||
|
m_pModifiedLabel->setText("");
|
||||||
|
|
||||||
|
pHLayout->addStretch(1);
|
||||||
|
@@ -3137,7 +3137,7 @@ void WindowTitleWidget::setEncodings( TQTextCodec* pCodecForA, TQTextCodec* pCod
|
||||||
|
m_codecMap[i]=it->second;
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
- m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->tqsizeHint() );
|
||||||
|
+ m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->sizeHint() );
|
||||||
|
|
||||||
|
if ( pCodecForC && pCodecForB && pCodecForA )
|
||||||
|
{
|
||||||
|
diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h
|
||||||
|
index ed524a5..2b61e6f 100644
|
||||||
|
--- a/src/mergeresultwindow.h
|
||||||
|
+++ b/src/mergeresultwindow.h
|
||||||
|
@@ -110,7 +110,7 @@ public:
|
||||||
|
const LineData* pLineDataB, int sizeB,
|
||||||
|
const LineData* pLineDataC, int sizeC,
|
||||||
|
const Diff3LineList* pDiff3LineList,
|
||||||
|
- TotalDifftqStatus* pTotalDifftqStatus
|
||||||
|
+ TotalDiffStatus* pTotalDiffStatus
|
||||||
|
);
|
||||||
|
|
||||||
|
void reset();
|
||||||
|
@@ -187,7 +187,7 @@ private:
|
||||||
|
int m_sizeC;
|
||||||
|
|
||||||
|
const Diff3LineList* m_pDiff3LineList;
|
||||||
|
- TotalDifftqStatus* m_pTotalDifftqStatus;
|
||||||
|
+ TotalDiffStatus* m_pTotalDiffStatus;
|
||||||
|
|
||||||
|
bool m_bPaintingAllowed;
|
||||||
|
int m_delayedDrawTimer;
|
||||||
|
diff --git a/src/pdiff.cpp b/src/pdiff.cpp
|
||||||
|
index 033fd31..1452eca 100644
|
||||||
|
--- a/src/pdiff.cpp
|
||||||
|
+++ b/src/pdiff.cpp
|
||||||
|
@@ -235,14 +235,14 @@ bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bLoadFiles )
|
||||||
|
+void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles )
|
||||||
|
{
|
||||||
|
ProgressProxy pp;
|
||||||
|
// When doing a full analysis in the directory-comparison, then the statistics-results
|
||||||
|
- // will be stored in the given TotalDifftqStatus. Otherwise it will be 0.
|
||||||
|
- bool bGUI = pTotalDifftqStatus == 0;
|
||||||
|
- if (pTotalDifftqStatus==0)
|
||||||
|
- pTotalDifftqStatus = &m_totalDifftqStatus;
|
||||||
|
+ // will be stored in the given TotalDiffStatus. Otherwise it will be 0.
|
||||||
|
+ bool bGUI = pTotalDiffStatus == 0;
|
||||||
|
+ if (pTotalDiffStatus==0)
|
||||||
|
+ pTotalDiffStatus = &m_totalDiffStatus;
|
||||||
|
|
||||||
|
bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn;
|
||||||
|
|
||||||
|
@@ -310,11 +310,11 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
|
||||||
|
pp.setMaxNofSteps( 6 ); // 3 comparisons, 3 finediffs
|
||||||
|
}
|
||||||
|
|
||||||
|
- pTotalDifftqStatus->reset();
|
||||||
|
+ pTotalDiffStatus->reset();
|
||||||
|
// Run the diff.
|
||||||
|
if ( m_sd3.isEmpty() )
|
||||||
|
{
|
||||||
|
- pTotalDifftqStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
|
||||||
|
+ pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
|
||||||
|
pp.setInformation(i18n("Diff: A <-> B"));
|
||||||
|
|
||||||
|
runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
|
||||||
|
@@ -323,8 +323,8 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
|
||||||
|
|
||||||
|
pp.setInformation(i18n("Linediff: A <-> B"));
|
||||||
|
calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
|
||||||
|
- fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqB );
|
||||||
|
- if ( m_sd1.getSizeBytes()==0 ) pTotalDifftqStatus->bTextAEqB=false;
|
||||||
|
+ fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
|
||||||
|
+ if ( m_sd1.getSizeBytes()==0 ) pTotalDiffStatus->bTextAEqB=false;
|
||||||
|
|
||||||
|
pp.step();
|
||||||
|
}
|
||||||
|
@@ -337,9 +337,9 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
|
||||||
|
pp.step();
|
||||||
|
}
|
||||||
|
|
||||||
|
- pTotalDifftqStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
|
||||||
|
- pTotalDifftqStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 );
|
||||||
|
- pTotalDifftqStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 );
|
||||||
|
+ pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
|
||||||
|
+ pTotalDiffStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 );
|
||||||
|
+ pTotalDiffStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 );
|
||||||
|
|
||||||
|
pp.setInformation(i18n("Diff: A <-> B"));
|
||||||
|
runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
|
||||||
|
@@ -364,16 +364,16 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
|
||||||
|
debugLineCheck( m_diff3LineList, m_sd3.getSizeLines(), 3 );
|
||||||
|
|
||||||
|
pp.setInformation(i18n("Linediff: A <-> B"));
|
||||||
|
- fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqB );
|
||||||
|
+ fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
|
||||||
|
pp.step();
|
||||||
|
pp.setInformation(i18n("Linediff: B <-> C"));
|
||||||
|
- fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDifftqStatus->bTextBEqC );
|
||||||
|
+ fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDiffStatus->bTextBEqC );
|
||||||
|
pp.step();
|
||||||
|
pp.setInformation(i18n("Linediff: A <-> C"));
|
||||||
|
- fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqC );
|
||||||
|
+ fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqC );
|
||||||
|
pp.step();
|
||||||
|
- if ( m_sd1.getSizeBytes()==0 ) { pTotalDifftqStatus->bTextAEqB=false; pTotalDifftqStatus->bTextAEqC=false; }
|
||||||
|
- if ( m_sd2.getSizeBytes()==0 ) { pTotalDifftqStatus->bTextAEqB=false; pTotalDifftqStatus->bTextBEqC=false; }
|
||||||
|
+ if ( m_sd1.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextAEqC=false; }
|
||||||
|
+ if ( m_sd2.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextBEqC=false; }
|
||||||
|
}
|
||||||
|
m_diffBufferInfo.init( &m_diff3LineList, &m_diff3LineVector,
|
||||||
|
m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(),
|
||||||
|
@@ -420,7 +420,7 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
|
||||||
|
m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(),
|
||||||
|
m_bTripleDiff ? m_sd3.getLineDataForDisplay() : 0, m_sd3.getSizeLines(),
|
||||||
|
&m_diff3LineList,
|
||||||
|
- pTotalDifftqStatus
|
||||||
|
+ pTotalDiffStatus
|
||||||
|
);
|
||||||
|
m_pMergeResultWindowTitle->setFileName( m_outputFilename.isEmpty() ? TQString("unnamed.txt") : m_outputFilename );
|
||||||
|
|
||||||
|
@@ -507,17 +507,17 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
|
||||||
|
)
|
||||||
|
{
|
||||||
|
TQString totalInfo;
|
||||||
|
- if ( pTotalDifftqStatus->bBinaryAEqB && pTotalDifftqStatus->bBinaryAEqC )
|
||||||
|
+ if ( pTotalDiffStatus->bBinaryAEqB && pTotalDiffStatus->bBinaryAEqC )
|
||||||
|
totalInfo += i18n("All input files are binary equal.");
|
||||||
|
- else if ( pTotalDifftqStatus->bTextAEqB && pTotalDifftqStatus->bTextAEqC )
|
||||||
|
+ else if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC )
|
||||||
|
totalInfo += i18n("All input files contain the same text, but are not binary equal.");
|
||||||
|
else {
|
||||||
|
- if ( pTotalDifftqStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("B");
|
||||||
|
- else if ( pTotalDifftqStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B");
|
||||||
|
- if ( pTotalDifftqStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("C");
|
||||||
|
- else if ( pTotalDifftqStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C");
|
||||||
|
- if ( pTotalDifftqStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("B").tqarg("C");
|
||||||
|
- else if ( pTotalDifftqStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C");
|
||||||
|
+ if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("B");
|
||||||
|
+ else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B");
|
||||||
|
+ if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("C");
|
||||||
|
+ else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C");
|
||||||
|
+ if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("B").tqarg("C");
|
||||||
|
+ else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !totalInfo.isEmpty() )
|
||||||
|
@@ -609,12 +609,12 @@ void KDiff3App::sourceMask( int srcMask, int enabledMask )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-// Function uses setMinSize( tqsizeHint ) before adding the widget.
|
||||||
|
+// Function uses setMinSize( sizeHint ) before adding the widget.
|
||||||
|
// void addWidget(TQBoxLayout* tqlayout, TQWidget* widget);
|
||||||
|
template <class W, class L>
|
||||||
|
void addWidget( L* tqlayout, W* widget)
|
||||||
|
{
|
||||||
|
- TQSize s = widget->tqsizeHint();
|
||||||
|
+ TQSize s = widget->sizeHint();
|
||||||
|
widget->setMinimumSize( TQSize(max2(s.width(),0),max2(s.height(),0) ) );
|
||||||
|
tqlayout->addWidget( widget );
|
||||||
|
}
|
||||||
|
@@ -1071,7 +1071,7 @@ void KDiff3App::slotFileOpen()
|
||||||
|
}
|
||||||
|
|
||||||
|
void KDiff3App::slotFileOpen2(TQString fn1, TQString fn2, TQString fn3, TQString ofn,
|
||||||
|
- TQString an1, TQString an2, TQString an3, TotalDifftqStatus* pTotalDifftqStatus )
|
||||||
|
+ TQString an1, TQString an2, TQString an3, TotalDiffStatus* pTotalDiffStatus )
|
||||||
|
{
|
||||||
|
if ( !canContinue() ) return;
|
||||||
|
|
||||||
|
@@ -1111,9 +1111,9 @@ void KDiff3App::slotFileOpen2(TQString fn1, TQString fn2, TQString fn3, TQString
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_bDirCompare = bDirCompare; // Don't allow this to change here.
|
||||||
|
- init( false, pTotalDifftqStatus );
|
||||||
|
+ init( false, pTotalDiffStatus );
|
||||||
|
|
||||||
|
- if ( pTotalDifftqStatus!=0 )
|
||||||
|
+ if ( pTotalDiffStatus!=0 )
|
||||||
|
return;
|
||||||
|
|
||||||
|
if ( ! m_sd1.isEmpty() && ! m_sd1.hasData() ||
|
||||||
|
@@ -1969,7 +1969,7 @@ void KDiff3App::slotMergeCurrentFile()
|
||||||
|
|
||||||
|
void KDiff3App::slotWinFocusNext()
|
||||||
|
{
|
||||||
|
- TQWidget* focus = tqApp->tqfocusWidget();
|
||||||
|
+ TQWidget* focus = tqApp->focusWidget();
|
||||||
|
if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
||||||
|
{
|
||||||
|
slotDirViewToggle();
|
||||||
|
@@ -1999,7 +1999,7 @@ void KDiff3App::slotWinFocusNext()
|
||||||
|
|
||||||
|
void KDiff3App::slotWinFocusPrev()
|
||||||
|
{
|
||||||
|
- TQWidget* focus = tqApp->tqfocusWidget();
|
||||||
|
+ TQWidget* focus = tqApp->focusWidget();
|
||||||
|
if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
|
||||||
|
{
|
||||||
|
slotDirViewToggle();
|
||||||
|
diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
|
||||||
|
index 7dc6340..5ed0c26 100644
|
||||||
|
--- a/src/smalldialogs.cpp
|
||||||
|
+++ b/src/smalldialogs.cpp
|
||||||
|
@@ -170,7 +170,7 @@ OpenDialog::OpenDialog(
|
||||||
|
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( reject() ) );
|
||||||
|
l->addWidget( button,1 );
|
||||||
|
|
||||||
|
- TQSize sh = tqsizeHint();
|
||||||
|
+ TQSize sh = sizeHint();
|
||||||
|
setFixedHeight( sh.height() );
|
||||||
|
m_bInputFileNameChanged = false;
|
||||||
|
|
||||||
|
@@ -498,7 +498,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
|
||||||
|
pGrid->addWidget(pButton,line,1);
|
||||||
|
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
|
||||||
|
|
||||||
|
- resize( 800, tqsizeHint().height() );
|
||||||
|
+ resize( 800, sizeHint().height() );
|
||||||
|
}
|
||||||
|
|
||||||
|
void RegExpTester::init( const TQString& autoMergeRegExp, const TQString& historyStartRegExp, const TQString& historyEntryStartRegExp, const TQString historySortKeyOrder )
|
||||||
@ -0,0 +1,627 @@
|
|||||||
|
commit 9b57232f1beb774a8a4bab4ae1f85999e193d037
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324316180 -0600
|
||||||
|
|
||||||
|
Remove additional unneeded tq method conversions
|
||||||
|
|
||||||
|
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
|
||||||
|
index 53360b6..ec008f1 100755
|
||||||
|
--- a/kdiff3plugin/kdiff3plugin.cpp
|
||||||
|
+++ b/kdiff3plugin/kdiff3plugin.cpp
|
||||||
|
@@ -101,17 +101,17 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
|
||||||
|
if(m_list.count() == 1)
|
||||||
|
{
|
||||||
|
int historyCount = s_pHistory ? s_pHistory->count() : 0;
|
||||||
|
- s = i18n("Compare with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() );
|
||||||
|
+ s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
|
||||||
|
pAction = new KAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection());
|
||||||
|
pAction->setEnabled( m_list.count()>0 && historyCount>0 );
|
||||||
|
pActionMenu->insert (pAction);
|
||||||
|
|
||||||
|
- s = i18n("Merge with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() );
|
||||||
|
+ s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
|
||||||
|
pAction = new KAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection());
|
||||||
|
pAction->setEnabled( m_list.count()>0 && historyCount>0 );
|
||||||
|
pActionMenu->insert (pAction);
|
||||||
|
|
||||||
|
- s = i18n("Save '%1' for later").tqarg( ( m_list.front() ) );
|
||||||
|
+ s = i18n("Save '%1' for later").arg( ( m_list.front() ) );
|
||||||
|
pAction = new KAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection());
|
||||||
|
pAction->setEnabled( m_list.count()>0 );
|
||||||
|
pActionMenu->insert(pAction);
|
||||||
|
diff --git a/src/diff.cpp b/src/diff.cpp
|
||||||
|
index 136275c..722950f 100644
|
||||||
|
--- a/src/diff.cpp
|
||||||
|
+++ b/src/diff.cpp
|
||||||
|
@@ -492,7 +492,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
|
||||||
|
KMessageBox::error(m_pOptionDialog,
|
||||||
|
i18n("Preprocessing possibly failed. Check this command:\n\n %1"
|
||||||
|
"\n\nThe preprocessing command will be disabled now."
|
||||||
|
- ).tqarg(cmd) );
|
||||||
|
+ ).arg(cmd) );
|
||||||
|
m_pOptionDialog->m_PreProcessorCmd = "";
|
||||||
|
m_normalData.readFile( fileNameIn1 );
|
||||||
|
pEncoding1 = m_pEncoding;
|
||||||
|
@@ -527,7 +527,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
|
||||||
|
KMessageBox::error(m_pOptionDialog,
|
||||||
|
i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n %1"
|
||||||
|
"\n\nThe line-matching-preprocessing command will be disabled now."
|
||||||
|
- ).tqarg(cmd) );
|
||||||
|
+ ).arg(cmd) );
|
||||||
|
m_pOptionDialog->m_LineMatchingPreProcessorCmd = "";
|
||||||
|
m_lmppData.readFile( fileNameIn2 );
|
||||||
|
}
|
||||||
|
@@ -1190,7 +1190,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
|
||||||
|
if ( pManualDiffHelpList->empty() )
|
||||||
|
return;
|
||||||
|
|
||||||
|
- // If a line appears unaligned in comparison to the manual tqalignment, correct this.
|
||||||
|
+ // If a line appears unaligned in comparison to the manual alignment, correct this.
|
||||||
|
|
||||||
|
ManualDiffHelpList::iterator iMDHL;
|
||||||
|
for( iMDHL = pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL )
|
||||||
|
@@ -1228,7 +1228,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
|
||||||
|
|
||||||
|
if (wi>=1 && wi <= 3)
|
||||||
|
{
|
||||||
|
- // Found manual tqalignment for one source
|
||||||
|
+ // Found manual alignment for one source
|
||||||
|
Diff3LineList::iterator iDest = i3;
|
||||||
|
|
||||||
|
// Move lines up until the next firstLine is found. Omit wi from move and search.
|
||||||
|
diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
|
||||||
|
index 361eb73..e8124fa 100644
|
||||||
|
--- a/src/difftextwindow.cpp
|
||||||
|
+++ b/src/difftextwindow.cpp
|
||||||
|
@@ -1656,7 +1656,7 @@ void DiffTextWindowFrame::setFirstLine( int firstLine )
|
||||||
|
s += " " + TQString::number( l+1 );
|
||||||
|
|
||||||
|
d->m_pTopLine->setText( s );
|
||||||
|
- d->m_pTopLine->tqrepaint();
|
||||||
|
+ d->m_pTopLine->repaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
|
||||||
|
index 0520af3..b4f6b20 100644
|
||||||
|
--- a/src/directorymergewindow.cpp
|
||||||
|
+++ b/src/directorymergewindow.cpp
|
||||||
|
@@ -187,13 +187,13 @@ void DirectoryMergeWindow::fastFileComparison(
|
||||||
|
TempRemover tr1( fileName1, fi1 );
|
||||||
|
if ( !tr1.success() )
|
||||||
|
{
|
||||||
|
- status = i18n("Creating temp copy of %1 failed.").tqarg(fileName1);
|
||||||
|
+ status = i18n("Creating temp copy of %1 failed.").arg(fileName1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
TempRemover tr2( fileName2, fi2 );
|
||||||
|
if ( !tr2.success() )
|
||||||
|
{
|
||||||
|
- status = i18n("Creating temp copy of %1 failed.").tqarg(fileName2);
|
||||||
|
+ status = i18n("Creating temp copy of %1 failed.").arg(fileName2);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -204,7 +204,7 @@ void DirectoryMergeWindow::fastFileComparison(
|
||||||
|
|
||||||
|
if ( ! file1.open(IO_ReadOnly) )
|
||||||
|
{
|
||||||
|
- status = i18n("Opening %1 failed.").tqarg(fileName1);
|
||||||
|
+ status = i18n("Opening %1 failed.").arg(fileName1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -212,7 +212,7 @@ void DirectoryMergeWindow::fastFileComparison(
|
||||||
|
|
||||||
|
if ( ! file2.open(IO_ReadOnly) )
|
||||||
|
{
|
||||||
|
- status = i18n("Opening %1 failed.").tqarg(fileName2);
|
||||||
|
+ status = i18n("Opening %1 failed.").arg(fileName2);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -230,13 +230,13 @@ void DirectoryMergeWindow::fastFileComparison(
|
||||||
|
int len = min2( sizeLeft, (t_FileSize)buf1.size() );
|
||||||
|
if( len != file1.readBlock( &buf1[0], len ) )
|
||||||
|
{
|
||||||
|
- status = i18n("Error reading from %1").tqarg(fileName1);
|
||||||
|
+ status = i18n("Error reading from %1").arg(fileName1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( len != file2.readBlock( &buf2[0], len ) )
|
||||||
|
{
|
||||||
|
- status = i18n("Error reading from %1").tqarg(fileName2);
|
||||||
|
+ status = i18n("Error reading from %1").arg(fileName2);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -507,13 +507,13 @@ bool DirectoryMergeWindow::init
|
||||||
|
TQString text( i18n("Opening of directories failed:") );
|
||||||
|
text += "\n\n";
|
||||||
|
if ( !dirA.isDir() )
|
||||||
|
- { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").tqarg(m_dirA.prettyAbsPath()); }
|
||||||
|
+ { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").arg(m_dirA.prettyAbsPath()); }
|
||||||
|
|
||||||
|
if ( !dirB.isDir() )
|
||||||
|
- { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").tqarg(m_dirB.prettyAbsPath()); }
|
||||||
|
+ { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").arg(m_dirB.prettyAbsPath()); }
|
||||||
|
|
||||||
|
if ( m_dirC.isValid() && !m_dirC.isDir() )
|
||||||
|
- { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").tqarg(m_dirC.prettyAbsPath()); }
|
||||||
|
+ { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").arg(m_dirC.prettyAbsPath()); }
|
||||||
|
|
||||||
|
KMessageBox::sorry( this, text, i18n("Directory Open Error") );
|
||||||
|
return false;
|
||||||
|
@@ -2138,7 +2138,7 @@ void DirectoryMergeWindow::slotRunOperationForCurrentItem()
|
||||||
|
if ( m_mergeItemList.empty() )
|
||||||
|
{
|
||||||
|
TQListViewItem* pBegin = currentItem();
|
||||||
|
- TQListViewItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no tqchildren)
|
||||||
|
+ TQListViewItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no children)
|
||||||
|
|
||||||
|
prepareMergeStart( pBegin, pEnd, bVerbose );
|
||||||
|
mergeContinue(true, bVerbose);
|
||||||
|
@@ -2411,16 +2411,16 @@ bool DirectoryMergeWindow::deleteFLD( const TQString& name, bool bCreateBackup )
|
||||||
|
bool bSuccess = renameFLD( name, name+".orig" );
|
||||||
|
if (!bSuccess)
|
||||||
|
{
|
||||||
|
- m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").tqarg(name) );
|
||||||
|
+ m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").arg(name) );
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if ( fi.isDir() && !fi.isSymLink() )
|
||||||
|
- m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").tqarg(name));
|
||||||
|
+ m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").arg(name));
|
||||||
|
else
|
||||||
|
- m_pStatusInfo->addText(i18n("delete( %1 )").tqarg(name));
|
||||||
|
+ m_pStatusInfo->addText(i18n("delete( %1 )").arg(name));
|
||||||
|
|
||||||
|
if ( m_bSimulatedMergeStarted )
|
||||||
|
{
|
||||||
|
@@ -2454,7 +2454,7 @@ bool DirectoryMergeWindow::deleteFLD( const TQString& name, bool bCreateBackup )
|
||||||
|
bSuccess = FileAccess::removeDir( name );
|
||||||
|
if ( !bSuccess )
|
||||||
|
{
|
||||||
|
- m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").tqarg(name));
|
||||||
|
+ m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").arg(name));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2490,7 +2490,7 @@ bool DirectoryMergeWindow::mergeFLD( const TQString& nameA,const TQString& nameB
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
- m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").tqarg(nameA).tqarg(nameB).tqarg(nameC).tqarg(nameDest));
|
||||||
|
+ m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").arg(nameA).arg(nameB).arg(nameC).arg(nameDest));
|
||||||
|
if ( m_bSimulatedMergeStarted )
|
||||||
|
{
|
||||||
|
m_pStatusInfo->addText(i18n(" Note: After a manual merge the user should continue by pressing F7.") );
|
||||||
|
@@ -2517,7 +2517,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
|
||||||
|
if ( !bSuccess )
|
||||||
|
{
|
||||||
|
m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed."
|
||||||
|
- "Deleting existing destination failed.").tqarg(srcName).tqarg(destName));
|
||||||
|
+ "Deleting existing destination failed.").arg(srcName).arg(destName));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2526,7 +2526,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
|
||||||
|
|
||||||
|
if ( fi.isSymLink() && (fi.isDir() && !m_bFollowDirLinks || !fi.isDir() && !m_bFollowFileLinks) )
|
||||||
|
{
|
||||||
|
- m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").tqarg(srcName).tqarg(destName));
|
||||||
|
+ m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").arg(srcName).arg(destName));
|
||||||
|
#ifdef _WIN32
|
||||||
|
// What are links?
|
||||||
|
#else
|
||||||
|
@@ -2563,7 +2563,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
- m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").tqarg(srcName).tqarg(destName));
|
||||||
|
+ m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").arg(srcName).arg(destName));
|
||||||
|
|
||||||
|
if ( m_bSimulatedMergeStarted )
|
||||||
|
{
|
||||||
|
@@ -2590,12 +2590,12 @@ bool DirectoryMergeWindow::renameFLD( const TQString& srcName, const TQString& d
|
||||||
|
if (!bSuccess)
|
||||||
|
{
|
||||||
|
m_pStatusInfo->addText( i18n("Error during rename( %1 -> %2 ): "
|
||||||
|
- "Cannot delete existing destination." ).tqarg(srcName).tqarg(destName));
|
||||||
|
+ "Cannot delete existing destination." ).arg(srcName).arg(destName));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").tqarg(srcName).tqarg(destName));
|
||||||
|
+ m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").arg(srcName).arg(destName));
|
||||||
|
if ( m_bSimulatedMergeStarted )
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
@@ -2623,7 +2623,7 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet )
|
||||||
|
if (!bSuccess)
|
||||||
|
{
|
||||||
|
m_pStatusInfo->addText( i18n("Error during makeDir of %1. "
|
||||||
|
- "Cannot delete existing file." ).tqarg(name));
|
||||||
|
+ "Cannot delete existing file." ).arg(name));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2638,7 +2638,7 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet )
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( ! bQuiet )
|
||||||
|
- m_pStatusInfo->addText(i18n("makeDir( %1 )").tqarg(name));
|
||||||
|
+ m_pStatusInfo->addText(i18n("makeDir( %1 )").arg(name));
|
||||||
|
|
||||||
|
if ( m_bSimulatedMergeStarted )
|
||||||
|
{
|
||||||
|
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
|
||||||
|
index 01b8d48..1f90d5d 100644
|
||||||
|
--- a/src/fileaccess.cpp
|
||||||
|
+++ b/src/fileaccess.cpp
|
||||||
|
@@ -625,7 +625,7 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite )
|
||||||
|
|
||||||
|
connect( pStatJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotStatResult(KIO::Job*)));
|
||||||
|
|
||||||
|
- g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
+ g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
@@ -668,7 +668,7 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength )
|
||||||
|
connect( pJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(KIO::Job*, const TQByteArray&)));
|
||||||
|
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
|
||||||
|
|
||||||
|
- g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -704,7 +704,7 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve
|
||||||
|
connect( pJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(KIO::Job*, TQByteArray&)));
|
||||||
|
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
|
||||||
|
|
||||||
|
- g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -721,7 +721,7 @@ void FileAccessJobHandler::slotPutData( KIO::Job* pJob, TQByteArray& data )
|
||||||
|
{
|
||||||
|
long maxChunkSize = 100000;
|
||||||
|
long length = min2( maxChunkSize, m_maxLength - m_transferredBytes );
|
||||||
|
- bool bSuccess = data.tqresize( length );
|
||||||
|
+ bool bSuccess = data.resize( length );
|
||||||
|
if ( bSuccess )
|
||||||
|
{
|
||||||
|
if ( length>0 )
|
||||||
|
@@ -767,7 +767,7 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName )
|
||||||
|
KIO::SimpleJob* pJob = KIO::mkdir( dirURL );
|
||||||
|
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
|
||||||
|
|
||||||
|
- g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").tqarg(dirName) );
|
||||||
|
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) );
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -787,7 +787,7 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName )
|
||||||
|
KIO::SimpleJob* pJob = KIO::rmdir( dirURL );
|
||||||
|
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
|
||||||
|
|
||||||
|
- g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").tqarg(dirName));
|
||||||
|
+ g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName));
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -802,7 +802,7 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName )
|
||||||
|
KIO::SimpleJob* pJob = KIO::file_delete( KURL::fromPathOrURL(fileName), false );
|
||||||
|
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
|
||||||
|
|
||||||
|
- g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").tqarg(fileName) );
|
||||||
|
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) );
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -818,7 +818,7 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString&
|
||||||
|
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
|
||||||
|
|
||||||
|
g_pProgressDialog->enterEventLoop( pJob,
|
||||||
|
- i18n("Creating symbolic link: %1 -> %2").tqarg(linkLocation).tqarg(linkTarget) );
|
||||||
|
+ i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) );
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -848,7 +848,7 @@ bool FileAccessJobHandler::rename( const TQString& dest )
|
||||||
|
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
|
||||||
|
|
||||||
|
g_pProgressDialog->enterEventLoop( pJob,
|
||||||
|
- i18n("Renaming file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) );
|
||||||
|
+ i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
|
||||||
|
return m_bSuccess;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -884,7 +884,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
|
||||||
|
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
|
||||||
|
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
|
||||||
|
g_pProgressDialog->enterEventLoop( pJob,
|
||||||
|
- i18n("Copying file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) );
|
||||||
|
+ i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
|
||||||
|
|
||||||
|
return m_bSuccess;
|
||||||
|
// Note that the KIO-slave preserves the original date, if this is supported.
|
||||||
|
@@ -898,13 +898,13 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
|
||||||
|
bool bReadSuccess = srcFile.open( IO_ReadOnly );
|
||||||
|
if ( bReadSuccess == false )
|
||||||
|
{
|
||||||
|
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").tqarg(srcName);
|
||||||
|
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").arg(srcName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
bool bWriteSuccess = destFile.open( IO_WriteOnly );
|
||||||
|
if ( bWriteSuccess == false )
|
||||||
|
{
|
||||||
|
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").tqarg(destName);
|
||||||
|
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").arg(destName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -916,7 +916,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
|
||||||
|
TQ_LONG readSize = srcFile.readBlock( &buffer[0], min2( srcSize, bufSize ) );
|
||||||
|
if ( readSize==-1 || readSize==0 )
|
||||||
|
{
|
||||||
|
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").tqarg(srcName);
|
||||||
|
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").arg(srcName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
srcSize -= readSize;
|
||||||
|
@@ -925,7 +925,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
|
||||||
|
TQ_LONG writeSize = destFile.writeBlock( &buffer[0], readSize );
|
||||||
|
if ( writeSize==-1 || writeSize==0 )
|
||||||
|
{
|
||||||
|
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").tqarg(destName);
|
||||||
|
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").arg(destName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
readSize -= writeSize;
|
||||||
|
@@ -1344,7 +1344,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
|
||||||
|
//connect( pListJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
|
||||||
|
|
||||||
|
g_pProgressDialog->enterEventLoop( pListJob,
|
||||||
|
- i18n("Listing directory: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
+ i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/gnudiff_diff.h b/src/gnudiff_diff.h
|
||||||
|
index 7bc8b92..482435c 100644
|
||||||
|
--- a/src/gnudiff_diff.h
|
||||||
|
+++ b/src/gnudiff_diff.h
|
||||||
|
@@ -110,7 +110,7 @@ bool brief;
|
||||||
|
bool expand_tabs;
|
||||||
|
|
||||||
|
/* Use a tab in the output, rather than a space, before the text of an
|
||||||
|
- input line, so as to keep the proper tqalignment in the input line
|
||||||
|
+ input line, so as to keep the proper alignment in the input line
|
||||||
|
without changing the characters in it (-T). */
|
||||||
|
bool initial_tab;
|
||||||
|
|
||||||
|
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
|
||||||
|
index e6b3f40..ef1a843 100644
|
||||||
|
--- a/src/kdiff3.cpp
|
||||||
|
+++ b/src/kdiff3.cpp
|
||||||
|
@@ -259,7 +259,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
|
||||||
|
slotViewStatusBar();
|
||||||
|
if( toolBar("mainToolBar")!=0 )
|
||||||
|
toolBar("mainToolBar")->setBarPos( (KToolBar::BarPosition) m_pOptionDialog->m_toolBarPos );
|
||||||
|
-/* TQSize size = m_pOptionDialog->m_tqgeometry;
|
||||||
|
+/* TQSize size = m_pOptionDialog->m_geometry;
|
||||||
|
TQPoint pos = m_pOptionDialog->m_position;
|
||||||
|
if(!size.isEmpty())
|
||||||
|
{
|
||||||
|
@@ -303,7 +303,7 @@ void KDiff3App::completeInit( const TQString& fn1, const TQString& fn2, const TQ
|
||||||
|
{
|
||||||
|
if (m_pKDiff3Shell!=0)
|
||||||
|
{
|
||||||
|
- TQSize size=m_pOptionDialog->m_tqgeometry;
|
||||||
|
+ TQSize size=m_pOptionDialog->m_geometry;
|
||||||
|
TQPoint pos=m_pOptionDialog->m_position;
|
||||||
|
if(!size.isEmpty())
|
||||||
|
{
|
||||||
|
@@ -577,7 +577,7 @@ void KDiff3App::saveOptions( KConfig* config )
|
||||||
|
m_pOptionDialog->m_bMaximised = m_pKDiff3Shell->isMaximized();
|
||||||
|
if( ! m_pKDiff3Shell->isMaximized() && m_pKDiff3Shell->isVisible() )
|
||||||
|
{
|
||||||
|
- m_pOptionDialog->m_tqgeometry = m_pKDiff3Shell->size();
|
||||||
|
+ m_pOptionDialog->m_geometry = m_pKDiff3Shell->size();
|
||||||
|
m_pOptionDialog->m_position = m_pKDiff3Shell->pos();
|
||||||
|
}
|
||||||
|
if ( toolBar("mainToolBar")!=0 )
|
||||||
|
diff --git a/src/kdiff3.h b/src/kdiff3.h
|
||||||
|
index c81ae71..46c0d3c 100644
|
||||||
|
--- a/src/kdiff3.h
|
||||||
|
+++ b/src/kdiff3.h
|
||||||
|
@@ -110,7 +110,7 @@ class KDiff3App : public TQSplitter
|
||||||
|
/** initializes the KActions of the application */
|
||||||
|
void initActions( KActionCollection* );
|
||||||
|
|
||||||
|
- /** save general Options like all bar positions and status as well as the tqgeometry
|
||||||
|
+ /** 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( KConfig* );
|
||||||
|
|
||||||
|
diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
|
||||||
|
index 75894a1..c49adaf 100644
|
||||||
|
--- a/src/kreplacements/kreplacements.cpp
|
||||||
|
+++ b/src/kreplacements/kreplacements.cpp
|
||||||
|
@@ -676,7 +676,7 @@ KToggleAction* KStdAction::showStatusbar( TQWidget* parent, const char* slot, KA
|
||||||
|
KAction* KStdAction::preferences( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
|
||||||
|
{
|
||||||
|
KMainWindow* p = actionCollection->m_pMainWindow;
|
||||||
|
- KAction* a = new KAction( i18n("&Configure %1...").tqarg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false );
|
||||||
|
+ KAction* a = new KAction( i18n("&Configure %1...").arg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false );
|
||||||
|
if(p) a->addTo( p->settingsMenu );
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
|
||||||
|
index a222a14..dea1407 100644
|
||||||
|
--- a/src/mergeresultwindow.cpp
|
||||||
|
+++ b/src/mergeresultwindow.cpp
|
||||||
|
@@ -134,7 +134,7 @@ void MergeResultWindow::init(
|
||||||
|
int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
|
||||||
|
if (m_pStatusBar)
|
||||||
|
m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
|
||||||
|
- .tqarg(nofUnsolved).tqarg(wsc) );
|
||||||
|
+ .arg(nofUnsolved).arg(wsc) );
|
||||||
|
}
|
||||||
|
|
||||||
|
void MergeResultWindow::reset()
|
||||||
|
@@ -809,12 +809,12 @@ void MergeResultWindow::showNrOfConflicts()
|
||||||
|
else if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC )
|
||||||
|
totalInfo += i18n("All input files contain the same text.");
|
||||||
|
else {
|
||||||
|
- if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B");
|
||||||
|
- else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B");
|
||||||
|
- if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C");
|
||||||
|
- else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C");
|
||||||
|
- if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C");
|
||||||
|
- else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C");
|
||||||
|
+ if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("B");
|
||||||
|
+ else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("B");
|
||||||
|
+ if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("C");
|
||||||
|
+ else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("C");
|
||||||
|
+ if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("B").arg("C");
|
||||||
|
+ else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("B").arg("C");
|
||||||
|
}
|
||||||
|
|
||||||
|
int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts();
|
||||||
|
@@ -948,7 +948,7 @@ void MergeResultWindow::choose( int selector )
|
||||||
|
int wsc;
|
||||||
|
int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
|
||||||
|
m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
|
||||||
|
- .tqarg(nofUnsolved).tqarg(wsc) );
|
||||||
|
+ .arg(nofUnsolved).arg(wsc) );
|
||||||
|
}
|
||||||
|
|
||||||
|
// bConflictsOnly: automatically choose for conflicts only (true) or for everywhere (false)
|
||||||
|
@@ -962,7 +962,7 @@ void MergeResultWindow::chooseGlobal(int selector, bool bConflictsOnly, bool bWh
|
||||||
|
int wsc;
|
||||||
|
int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
|
||||||
|
m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
|
||||||
|
- .tqarg(nofUnsolved).tqarg(wsc) );
|
||||||
|
+ .arg(nofUnsolved).arg(wsc) );
|
||||||
|
}
|
||||||
|
|
||||||
|
void MergeResultWindow::slotAutoSolve()
|
||||||
|
@@ -974,7 +974,7 @@ void MergeResultWindow::slotAutoSolve()
|
||||||
|
int wsc;
|
||||||
|
int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
|
||||||
|
m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
|
||||||
|
- .tqarg(nofUnsolved).tqarg(wsc) );
|
||||||
|
+ .arg(nofUnsolved).arg(wsc) );
|
||||||
|
}
|
||||||
|
|
||||||
|
void MergeResultWindow::slotUnsolve()
|
||||||
|
@@ -986,7 +986,7 @@ void MergeResultWindow::slotUnsolve()
|
||||||
|
int wsc;
|
||||||
|
int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
|
||||||
|
m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
|
||||||
|
- .tqarg(nofUnsolved).tqarg(wsc) );
|
||||||
|
+ .arg(nofUnsolved).arg(wsc) );
|
||||||
|
}
|
||||||
|
|
||||||
|
static TQString calcHistoryLead(const TQString& s )
|
||||||
|
@@ -2105,9 +2105,9 @@ void MergeResultWindow::slotCursorUpdate()
|
||||||
|
int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset;
|
||||||
|
|
||||||
|
if (!m_pOptionDialog->m_bRightToLeftLanguage)
|
||||||
|
- tqrepaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
|
||||||
|
+ repaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
|
||||||
|
else
|
||||||
|
- tqrepaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
|
||||||
|
+ repaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
|
||||||
|
|
||||||
|
m_bCursorUpdate=false;
|
||||||
|
}
|
||||||
|
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
|
||||||
|
index 9b46a6d..8b15dc8 100644
|
||||||
|
--- a/src/optiondialog.cpp
|
||||||
|
+++ b/src/optiondialog.cpp
|
||||||
|
@@ -495,7 +495,7 @@ void OptionDialog::setupOtherOptions()
|
||||||
|
new OptionToggleAction( true, "Show Statusbar", &m_bShowStatusBar, this );
|
||||||
|
|
||||||
|
new OptionNum( (int)KToolBar::Top, "ToolBarPos", &m_toolBarPos, this );
|
||||||
|
- new OptionSize( TQSize(600,400),"Geometry", &m_tqgeometry, this );
|
||||||
|
+ new OptionSize( TQSize(600,400),"Geometry", &m_geometry, this );
|
||||||
|
new OptionPoint( TQPoint(0,22), "Position", &m_position, this );
|
||||||
|
new OptionToggleAction( false, "WindowStateMaximised", &m_bMaximised, this );
|
||||||
|
|
||||||
|
diff --git a/src/optiondialog.h b/src/optiondialog.h
|
||||||
|
index 697dfe3..b7a27e6 100644
|
||||||
|
--- a/src/optiondialog.h
|
||||||
|
+++ b/src/optiondialog.h
|
||||||
|
@@ -59,7 +59,7 @@ public:
|
||||||
|
TQString calcOptionHelp();
|
||||||
|
|
||||||
|
// Some settings are not available in the option dialog:
|
||||||
|
- TQSize m_tqgeometry;
|
||||||
|
+ TQSize m_geometry;
|
||||||
|
TQPoint m_position;
|
||||||
|
bool m_bMaximised;
|
||||||
|
bool m_bShowToolBar;
|
||||||
|
diff --git a/src/pdiff.cpp b/src/pdiff.cpp
|
||||||
|
index 1452eca..3986596 100644
|
||||||
|
--- a/src/pdiff.cpp
|
||||||
|
+++ b/src/pdiff.cpp
|
||||||
|
@@ -512,12 +512,12 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF
|
||||||
|
else if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC )
|
||||||
|
totalInfo += i18n("All input files contain the same text, but are not binary equal.");
|
||||||
|
else {
|
||||||
|
- if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("B");
|
||||||
|
- else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B");
|
||||||
|
- if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("C");
|
||||||
|
- else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C");
|
||||||
|
- if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("B").tqarg("C");
|
||||||
|
- else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C");
|
||||||
|
+ if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("A").arg("B");
|
||||||
|
+ else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("B");
|
||||||
|
+ if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("A").arg("C");
|
||||||
|
+ else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("C");
|
||||||
|
+ if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("B").arg("C");
|
||||||
|
+ else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("B").arg("C");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !totalInfo.isEmpty() )
|
||||||
|
diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
|
||||||
|
index 5ed0c26..ff7ca56 100644
|
||||||
|
--- a/src/smalldialogs.cpp
|
||||||
|
+++ b/src/smalldialogs.cpp
|
||||||
|
@@ -111,15 +111,15 @@ OpenDialog::OpenDialog(
|
||||||
|
|
||||||
|
TQPopupMenu* m = new TQPopupMenu(this);
|
||||||
|
int id=0;
|
||||||
|
- m->insertItem( i18n("Swap %1<->%2").tqarg("A").tqarg("B"), id++ );
|
||||||
|
- m->insertItem( i18n("Swap %1<->%2").tqarg("B").tqarg("C"), id++ );
|
||||||
|
- m->insertItem( i18n("Swap %1<->%2").tqarg("C").tqarg("A"), id++ );
|
||||||
|
- m->insertItem( i18n("Copy %1->Output").tqarg("A"), id++ );
|
||||||
|
- m->insertItem( i18n("Copy %1->Output").tqarg("B"), id++ );
|
||||||
|
- m->insertItem( i18n("Copy %1->Output").tqarg("C"), id++ );
|
||||||
|
- m->insertItem( i18n("Swap %1<->Output").tqarg("A"), id++ );
|
||||||
|
- m->insertItem( i18n("Swap %1<->Output").tqarg("B"), id++ );
|
||||||
|
- m->insertItem( i18n("Swap %1<->Output").tqarg("C"), id++ );
|
||||||
|
+ m->insertItem( i18n("Swap %1<->%2").arg("A").arg("B"), id++ );
|
||||||
|
+ m->insertItem( i18n("Swap %1<->%2").arg("B").arg("C"), id++ );
|
||||||
|
+ m->insertItem( i18n("Swap %1<->%2").arg("C").arg("A"), id++ );
|
||||||
|
+ m->insertItem( i18n("Copy %1->Output").arg("A"), id++ );
|
||||||
|
+ m->insertItem( i18n("Copy %1->Output").arg("B"), id++ );
|
||||||
|
+ m->insertItem( i18n("Copy %1->Output").arg("C"), id++ );
|
||||||
|
+ m->insertItem( i18n("Swap %1<->Output").arg("A"), id++ );
|
||||||
|
+ m->insertItem( i18n("Swap %1<->Output").arg("B"), id++ );
|
||||||
|
+ m->insertItem( i18n("Swap %1<->Output").arg("C"), id++ );
|
||||||
|
connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwapCopyNames(int)));
|
||||||
|
button->setPopup(m);
|
||||||
|
|
||||||
@ -0,0 +1,328 @@
|
|||||||
|
commit d654b1079f7801b0a65c8de8936d0d174656702b
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324497860 -0600
|
||||||
|
|
||||||
|
Rename obsolete tq methods to standard names
|
||||||
|
|
||||||
|
diff --git a/src/diff.cpp b/src/diff.cpp
|
||||||
|
index 722950f..feb1373 100644
|
||||||
|
--- a/src/diff.cpp
|
||||||
|
+++ b/src/diff.cpp
|
||||||
|
@@ -557,7 +557,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
|
||||||
|
m_lmppData.m_v.resize( m_normalData.m_vSize );
|
||||||
|
for(int i=m_lmppData.m_vSize; i<m_normalData.m_vSize; ++i )
|
||||||
|
{ // Set all empty lines to point to the end of the buffer.
|
||||||
|
- m_lmppData.m_v[i].pLine = m_lmppData.m_tqunicodeBuf.tqunicode()+m_lmppData.m_tqunicodeBuf.length();
|
||||||
|
+ m_lmppData.m_v[i].pLine = m_lmppData.m_unicodeBuf.unicode()+m_lmppData.m_unicodeBuf.length();
|
||||||
|
}
|
||||||
|
|
||||||
|
m_lmppData.m_vSize = m_normalData.m_vSize;
|
||||||
|
@@ -567,8 +567,8 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
|
||||||
|
if ( m_pOptionDialog->m_bIgnoreCase )
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
- TQChar* pBuf = const_cast<TQChar*>(m_lmppData.m_tqunicodeBuf.tqunicode());
|
||||||
|
- int ucSize = m_lmppData.m_tqunicodeBuf.length();
|
||||||
|
+ TQChar* pBuf = const_cast<TQChar*>(m_lmppData.m_unicodeBuf.unicode());
|
||||||
|
+ int ucSize = m_lmppData.m_unicodeBuf.length();
|
||||||
|
for(i=0; i<ucSize; ++i)
|
||||||
|
{
|
||||||
|
pBuf[i] = pBuf[i].upper();
|
||||||
|
@@ -604,7 +604,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
|
||||||
|
/** Prepare the linedata vector for every input line.*/
|
||||||
|
void SourceData::FileData::preprocess( bool bPreserveCR, TQTextCodec* pEncoding )
|
||||||
|
{
|
||||||
|
- //m_tqunicodeBuf = decodeString( m_pBuf, m_size, eEncoding );
|
||||||
|
+ //m_unicodeBuf = decodeString( m_pBuf, m_size, eEncoding );
|
||||||
|
|
||||||
|
long skipBytes = 0;
|
||||||
|
TQTextCodec* pCodec = ::detectEncoding( m_pBuf, m_size, skipBytes );
|
||||||
|
@@ -616,11 +616,11 @@ void SourceData::FileData::preprocess( bool bPreserveCR, TQTextCodec* pEncoding
|
||||||
|
TQTextStream ts( ba, IO_ReadOnly );
|
||||||
|
ts.setCodec( pEncoding);
|
||||||
|
//ts.setAutoDetectUnicode( false );
|
||||||
|
- m_tqunicodeBuf = ts.read();
|
||||||
|
+ m_unicodeBuf = ts.read();
|
||||||
|
ba.resetRawData( m_pBuf+skipBytes, m_size-skipBytes );
|
||||||
|
|
||||||
|
- int ucSize = m_tqunicodeBuf.length();
|
||||||
|
- const TQChar* p = m_tqunicodeBuf.tqunicode();
|
||||||
|
+ int ucSize = m_unicodeBuf.length();
|
||||||
|
+ const TQChar* p = m_unicodeBuf.unicode();
|
||||||
|
|
||||||
|
m_bIsText = true;
|
||||||
|
int lines = 1;
|
||||||
|
@@ -770,9 +770,9 @@ static void checkLineForComments(
|
||||||
|
void SourceData::FileData::removeComments()
|
||||||
|
{
|
||||||
|
int line=0;
|
||||||
|
- TQChar* p = const_cast<TQChar*>(m_tqunicodeBuf.tqunicode());
|
||||||
|
+ TQChar* p = const_cast<TQChar*>(m_unicodeBuf.unicode());
|
||||||
|
bool bWithinComment=false;
|
||||||
|
- int size = m_tqunicodeBuf.length();
|
||||||
|
+ int size = m_unicodeBuf.length();
|
||||||
|
for(int i=0; i<size; ++i )
|
||||||
|
{
|
||||||
|
// std::cout << "2 " << std::string(&p[i], m_v[line].size) << std::endl;
|
||||||
|
diff --git a/src/diff.h b/src/diff.h
|
||||||
|
index a4015d1..3f876f8 100644
|
||||||
|
--- a/src/diff.h
|
||||||
|
+++ b/src/diff.h
|
||||||
|
@@ -293,7 +293,7 @@ private:
|
||||||
|
const char* m_pBuf;
|
||||||
|
int m_size;
|
||||||
|
int m_vSize; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
|
||||||
|
- TQString m_tqunicodeBuf;
|
||||||
|
+ TQString m_unicodeBuf;
|
||||||
|
std::vector<LineData> m_v;
|
||||||
|
bool m_bIsText;
|
||||||
|
bool readFile( const TQString& filename );
|
||||||
|
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
|
||||||
|
index 1f90d5d..5584c50 100644
|
||||||
|
--- a/src/fileaccess.cpp
|
||||||
|
+++ b/src/fileaccess.cpp
|
||||||
|
@@ -1088,7 +1088,7 @@ void CvsIgnoreList::addEntry(const TQString& pattern)
|
||||||
|
unsigned int nofMetaCharacters = 0;
|
||||||
|
|
||||||
|
const TQChar* pos;
|
||||||
|
- pos = pattern.tqunicode();
|
||||||
|
+ pos = pattern.unicode();
|
||||||
|
const TQChar* posEnd;
|
||||||
|
posEnd=pos + pattern.length();
|
||||||
|
while (pos < posEnd)
|
||||||
|
@@ -1454,27 +1454,27 @@ ProgressDialog::ProgressDialog( TQWidget* pParent )
|
||||||
|
: TQDialog( pParent, 0, true )
|
||||||
|
{
|
||||||
|
m_bStayHidden = false;
|
||||||
|
- TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
|
||||||
|
+ TQVBoxLayout* layout = new TQVBoxLayout(this);
|
||||||
|
|
||||||
|
m_pInformation = new TQLabel( " ", this );
|
||||||
|
- tqlayout->addWidget( m_pInformation );
|
||||||
|
+ layout->addWidget( m_pInformation );
|
||||||
|
|
||||||
|
m_pProgressBar = new KProgress(1000, this);
|
||||||
|
- tqlayout->addWidget( m_pProgressBar );
|
||||||
|
+ layout->addWidget( m_pProgressBar );
|
||||||
|
|
||||||
|
m_pSubInformation = new TQLabel( " ", this);
|
||||||
|
- tqlayout->addWidget( m_pSubInformation );
|
||||||
|
+ layout->addWidget( m_pSubInformation );
|
||||||
|
|
||||||
|
m_pSubProgressBar = new KProgress(1000, this);
|
||||||
|
- tqlayout->addWidget( m_pSubProgressBar );
|
||||||
|
+ layout->addWidget( m_pSubProgressBar );
|
||||||
|
|
||||||
|
m_pSlowJobInfo = new TQLabel( " ", this);
|
||||||
|
- tqlayout->addWidget( m_pSlowJobInfo );
|
||||||
|
+ layout->addWidget( m_pSlowJobInfo );
|
||||||
|
|
||||||
|
- TQHBoxLayout* htqlayout = new TQHBoxLayout( tqlayout );
|
||||||
|
- htqlayout->addStretch(1);
|
||||||
|
+ TQHBoxLayout* hlayout = new TQHBoxLayout( layout );
|
||||||
|
+ hlayout->addStretch(1);
|
||||||
|
m_pAbortButton = new TQPushButton( i18n("&Cancel"), this);
|
||||||
|
- htqlayout->addWidget( m_pAbortButton );
|
||||||
|
+ hlayout->addWidget( m_pAbortButton );
|
||||||
|
connect( m_pAbortButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAbort()) );
|
||||||
|
|
||||||
|
m_progressDelayTimer = 0;
|
||||||
|
diff --git a/src/gnudiff_io.cpp b/src/gnudiff_io.cpp
|
||||||
|
index f29fd31..aab645f 100644
|
||||||
|
--- a/src/gnudiff_io.cpp
|
||||||
|
+++ b/src/gnudiff_io.cpp
|
||||||
|
@@ -169,7 +169,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
|
||||||
|
while ( p<bufend && (c = *p) != '\n' )
|
||||||
|
{
|
||||||
|
if (! (isWhite(c) || bIgnoreNumbers && (c.isDigit() || c=='-' || c=='.' ) ))
|
||||||
|
- h = HASH (h, c.lower().tqunicode());
|
||||||
|
+ h = HASH (h, c.lower().unicode());
|
||||||
|
++p;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -177,7 +177,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
|
||||||
|
default:
|
||||||
|
while ( p<bufend && (c = *p) != '\n' )
|
||||||
|
{
|
||||||
|
- h = HASH (h, c.lower().tqunicode());
|
||||||
|
+ h = HASH (h, c.lower().unicode());
|
||||||
|
++p;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -189,7 +189,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
|
||||||
|
while ( p<bufend && (c = *p) != '\n')
|
||||||
|
{
|
||||||
|
if (! (isWhite(c)|| bIgnoreNumbers && (c.isDigit() || c=='-' || c=='.' ) ))
|
||||||
|
- h = HASH (h, c.tqunicode());
|
||||||
|
+ h = HASH (h, c.unicode());
|
||||||
|
++p;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -197,7 +197,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
|
||||||
|
default:
|
||||||
|
while ( p<bufend && (c = *p) != '\n')
|
||||||
|
{
|
||||||
|
- h = HASH (h, c.tqunicode());
|
||||||
|
+ h = HASH (h, c.unicode());
|
||||||
|
++p;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
|
||||||
|
index dea1407..760d794 100644
|
||||||
|
--- a/src/mergeresultwindow.cpp
|
||||||
|
+++ b/src/mergeresultwindow.cpp
|
||||||
|
@@ -2613,10 +2613,10 @@ void MergeResultWindow::pasteClipboard( bool bFromSelection )
|
||||||
|
TQString str = melIt->getString( this );
|
||||||
|
int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize );
|
||||||
|
|
||||||
|
- if ( !TQApplication::tqclipboard()->supportsSelection() )
|
||||||
|
+ if ( !TQApplication::clipboard()->supportsSelection() )
|
||||||
|
bFromSelection = false;
|
||||||
|
|
||||||
|
- TQString clipBoard = TQApplication::tqclipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard );
|
||||||
|
+ TQString clipBoard = TQApplication::clipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard );
|
||||||
|
|
||||||
|
TQString currentLine = str.left(x);
|
||||||
|
TQString endOfLine = str.mid(x);
|
||||||
|
diff --git a/src/pdiff.cpp b/src/pdiff.cpp
|
||||||
|
index 3986596..0a10b00 100644
|
||||||
|
--- a/src/pdiff.cpp
|
||||||
|
+++ b/src/pdiff.cpp
|
||||||
|
@@ -610,13 +610,13 @@ void KDiff3App::sourceMask( int srcMask, int enabledMask )
|
||||||
|
|
||||||
|
|
||||||
|
// Function uses setMinSize( sizeHint ) before adding the widget.
|
||||||
|
-// void addWidget(TQBoxLayout* tqlayout, TQWidget* widget);
|
||||||
|
+// void addWidget(TQBoxLayout* layout, TQWidget* widget);
|
||||||
|
template <class W, class L>
|
||||||
|
-void addWidget( L* tqlayout, W* widget)
|
||||||
|
+void addWidget( L* layout, W* widget)
|
||||||
|
{
|
||||||
|
TQSize s = widget->sizeHint();
|
||||||
|
widget->setMinimumSize( TQSize(max2(s.width(),0),max2(s.height(),0) ) );
|
||||||
|
- tqlayout->addWidget( widget );
|
||||||
|
+ layout->addWidget( widget );
|
||||||
|
}
|
||||||
|
|
||||||
|
void KDiff3App::initView()
|
||||||
|
@@ -1174,7 +1174,7 @@ void KDiff3App::slotEditCut()
|
||||||
|
|
||||||
|
if ( !s.isNull() )
|
||||||
|
{
|
||||||
|
- TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard );
|
||||||
|
+ TQApplication::clipboard()->setText( s, TQClipboard::Clipboard );
|
||||||
|
}
|
||||||
|
|
||||||
|
slotStatusMsg(i18n("Ready."));
|
||||||
|
@@ -1190,7 +1190,7 @@ void KDiff3App::slotEditCopy()
|
||||||
|
if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
|
||||||
|
if ( !s.isNull() )
|
||||||
|
{
|
||||||
|
- TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard );
|
||||||
|
+ TQApplication::clipboard()->setText( s, TQClipboard::Clipboard );
|
||||||
|
}
|
||||||
|
|
||||||
|
slotStatusMsg(i18n("Ready."));
|
||||||
|
@@ -1208,17 +1208,17 @@ void KDiff3App::slotEditPaste()
|
||||||
|
{
|
||||||
|
if ( m_pDiffTextWindow1->hasFocus() )
|
||||||
|
{
|
||||||
|
- m_sd1.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
|
||||||
|
+ m_sd1.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
else if ( m_pDiffTextWindow2->hasFocus() )
|
||||||
|
{
|
||||||
|
- m_sd2.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
|
||||||
|
+ m_sd2.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
else if ( m_pDiffTextWindow3->hasFocus() )
|
||||||
|
{
|
||||||
|
- m_sd3.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
|
||||||
|
+ m_sd3.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1465,7 +1465,7 @@ void KDiff3App::slotSelectionEnd()
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- TQClipboard *clipBoard = TQApplication::tqclipboard();
|
||||||
|
+ TQClipboard *clipBoard = TQApplication::clipboard();
|
||||||
|
|
||||||
|
if (clipBoard->supportsSelection ())
|
||||||
|
{
|
||||||
|
@@ -1484,7 +1484,7 @@ void KDiff3App::slotSelectionEnd()
|
||||||
|
|
||||||
|
void KDiff3App::slotClipboardChanged()
|
||||||
|
{
|
||||||
|
- TQString s = TQApplication::tqclipboard()->text();
|
||||||
|
+ TQString s = TQApplication::clipboard()->text();
|
||||||
|
//editPaste->setEnabled(!s.isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
|
||||||
|
index ff7ca56..b19b7c2 100644
|
||||||
|
--- a/src/smalldialogs.cpp
|
||||||
|
+++ b/src/smalldialogs.cpp
|
||||||
|
@@ -339,47 +339,47 @@ void OpenDialog::slotSwapCopyNames( int id ) // id selected in the popup menu
|
||||||
|
FindDialog::FindDialog(TQWidget* pParent)
|
||||||
|
: TQDialog( pParent )
|
||||||
|
{
|
||||||
|
- TQGridLayout* tqlayout = new TQGridLayout( this );
|
||||||
|
- tqlayout->setMargin(5);
|
||||||
|
- tqlayout->setSpacing(5);
|
||||||
|
+ TQGridLayout* layout = new TQGridLayout( this );
|
||||||
|
+ layout->setMargin(5);
|
||||||
|
+ layout->setSpacing(5);
|
||||||
|
|
||||||
|
int line=0;
|
||||||
|
- tqlayout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 );
|
||||||
|
+ layout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 );
|
||||||
|
++line;
|
||||||
|
|
||||||
|
m_pSearchString = new TQLineEdit( this );
|
||||||
|
- tqlayout->addMultiCellWidget( m_pSearchString, line,line,0,1 );
|
||||||
|
+ layout->addMultiCellWidget( m_pSearchString, line,line,0,1 );
|
||||||
|
++line;
|
||||||
|
|
||||||
|
m_pCaseSensitive = new TQCheckBox(i18n("Case sensitive"),this);
|
||||||
|
- tqlayout->addWidget( m_pCaseSensitive, line, 1 );
|
||||||
|
+ layout->addWidget( m_pCaseSensitive, line, 1 );
|
||||||
|
|
||||||
|
m_pSearchInA = new TQCheckBox(i18n("Search A"),this);
|
||||||
|
- tqlayout->addWidget( m_pSearchInA, line, 0 );
|
||||||
|
+ layout->addWidget( m_pSearchInA, line, 0 );
|
||||||
|
m_pSearchInA->setChecked( true );
|
||||||
|
++line;
|
||||||
|
|
||||||
|
m_pSearchInB = new TQCheckBox(i18n("Search B"),this);
|
||||||
|
- tqlayout->addWidget( m_pSearchInB, line, 0 );
|
||||||
|
+ layout->addWidget( m_pSearchInB, line, 0 );
|
||||||
|
m_pSearchInB->setChecked( true );
|
||||||
|
++line;
|
||||||
|
|
||||||
|
m_pSearchInC = new TQCheckBox(i18n("Search C"),this);
|
||||||
|
- tqlayout->addWidget( m_pSearchInC, line, 0 );
|
||||||
|
+ layout->addWidget( m_pSearchInC, line, 0 );
|
||||||
|
m_pSearchInC->setChecked( true );
|
||||||
|
++line;
|
||||||
|
|
||||||
|
m_pSearchInOutput = new TQCheckBox(i18n("Search output"),this);
|
||||||
|
- tqlayout->addWidget( m_pSearchInOutput, line, 0 );
|
||||||
|
+ layout->addWidget( m_pSearchInOutput, line, 0 );
|
||||||
|
m_pSearchInOutput->setChecked( true );
|
||||||
|
++line;
|
||||||
|
|
||||||
|
TQPushButton* pButton = new TQPushButton( i18n("&Search"), this );
|
||||||
|
- tqlayout->addWidget( pButton, line, 0 );
|
||||||
|
+ layout->addWidget( pButton, line, 0 );
|
||||||
|
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
|
||||||
|
|
||||||
|
pButton = new TQPushButton( i18n("&Cancel"), this );
|
||||||
|
- tqlayout->addWidget( pButton, line, 1 );
|
||||||
|
+ layout->addWidget( pButton, line, 1 );
|
||||||
|
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
|
||||||
|
|
||||||
|
hide();
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
commit 3f02b2be383bb2ab233fe8885f062f75fd902e78
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1332366465 -0500
|
||||||
|
|
||||||
|
Change tqaddAction -> addAction. There is no tqaddAction defined in tqt headers.
|
||||||
|
|
||||||
|
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
|
||||||
|
index ec008f1..02fa72d 100755
|
||||||
|
--- a/kdiff3plugin/kdiff3plugin.cpp
|
||||||
|
+++ b/kdiff3plugin/kdiff3plugin.cpp
|
||||||
|
@@ -150,7 +150,7 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
|
||||||
|
pActionMenu->insert (pAction);
|
||||||
|
|
||||||
|
addSeparator();
|
||||||
|
- tqaddAction( pActionMenu );
|
||||||
|
+ addAction( pActionMenu );
|
||||||
|
addSeparator();
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,84 @@
|
|||||||
|
commit 96f2a488786e370c355778e00c795e776e09d199
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1322168535 -0600
|
||||||
|
|
||||||
|
Fix FTBFS
|
||||||
|
|
||||||
|
diff --git a/konversation/src/alias_preferences.h b/konversation/src/alias_preferences.h
|
||||||
|
index cf70b4f..aeb3062 100644
|
||||||
|
--- a/konversation/src/alias_preferences.h
|
||||||
|
+++ b/konversation/src/alias_preferences.h
|
||||||
|
@@ -13,6 +13,8 @@
|
||||||
|
#ifndef EXALIASPREFERENCES_H
|
||||||
|
#define EXALIASPREFERENCES_H
|
||||||
|
|
||||||
|
+#include <tqlistview.h>
|
||||||
|
+
|
||||||
|
#include "alias_preferencesui.h"
|
||||||
|
#include "konvisettingspage.h"
|
||||||
|
|
||||||
|
diff --git a/konversation/src/autoreplace_preferences.h b/konversation/src/autoreplace_preferences.h
|
||||||
|
index c73da29..9cab1f0 100644
|
||||||
|
--- a/konversation/src/autoreplace_preferences.h
|
||||||
|
+++ b/konversation/src/autoreplace_preferences.h
|
||||||
|
@@ -13,6 +13,8 @@
|
||||||
|
#ifndef AUTOREPLACECONFIG_H
|
||||||
|
#define AUTOREPLACECONFIG_H
|
||||||
|
|
||||||
|
+#include <tqlistview.h>
|
||||||
|
+
|
||||||
|
#include "autoreplace_preferencesui.h"
|
||||||
|
#include "konvisettingspage.h"
|
||||||
|
|
||||||
|
diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg
|
||||||
|
index a2a2582..8cf2b82 100644
|
||||||
|
--- a/konversation/src/config/konversation.kcfg
|
||||||
|
+++ b/konversation/src/config/konversation.kcfg
|
||||||
|
@@ -294,7 +294,7 @@
|
||||||
|
<whatsthis></whatsthis>
|
||||||
|
</entry>
|
||||||
|
<entry key="LogfileReaderGeometry" type="Size" name="LogfileReaderSize">
|
||||||
|
- <default code="true">QSize(400, 200)</default>
|
||||||
|
+ <default code="true">TQSize(400, 200)</default>
|
||||||
|
<label></label>
|
||||||
|
<whatsthis></whatsthis>
|
||||||
|
</entry>
|
||||||
|
diff --git a/konversation/src/highlight_preferences.h b/konversation/src/highlight_preferences.h
|
||||||
|
index 67863a7..89974ca 100644
|
||||||
|
--- a/konversation/src/highlight_preferences.h
|
||||||
|
+++ b/konversation/src/highlight_preferences.h
|
||||||
|
@@ -17,7 +17,7 @@
|
||||||
|
#include "konvisettingspage.h"
|
||||||
|
|
||||||
|
#include <tqobject.h>
|
||||||
|
-
|
||||||
|
+#include <tqlistview.h>
|
||||||
|
|
||||||
|
class Highlight_Config;
|
||||||
|
class Highlight;
|
||||||
|
diff --git a/konversation/src/ignore_preferences.h b/konversation/src/ignore_preferences.h
|
||||||
|
index e910b78..a19ff03 100644
|
||||||
|
--- a/konversation/src/ignore_preferences.h
|
||||||
|
+++ b/konversation/src/ignore_preferences.h
|
||||||
|
@@ -17,7 +17,7 @@
|
||||||
|
#include "konvisettingspage.h"
|
||||||
|
|
||||||
|
#include <tqptrlist.h>
|
||||||
|
-
|
||||||
|
+#include <tqlistview.h>
|
||||||
|
|
||||||
|
class Ignore;
|
||||||
|
class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage
|
||||||
|
diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h
|
||||||
|
index c8cc0e1..ccf26af 100644
|
||||||
|
--- a/konversation/src/quickbuttons_preferences.h
|
||||||
|
+++ b/konversation/src/quickbuttons_preferences.h
|
||||||
|
@@ -13,6 +13,8 @@
|
||||||
|
#ifndef TQUICKBUTTONSCONFIG_H
|
||||||
|
#define TQUICKBUTTONSCONFIG_H
|
||||||
|
|
||||||
|
+#include <tqlistview.h>
|
||||||
|
+
|
||||||
|
#include "quickbuttons_preferencesui.h"
|
||||||
|
#include "konvisettingspage.h"
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,697 @@
|
|||||||
|
commit c64099e59a4e9ba6bdb8eebecd88e3363aee479b
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324497946 -0600
|
||||||
|
|
||||||
|
Rename obsolete tq methods to standard names
|
||||||
|
|
||||||
|
diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui
|
||||||
|
index 3783955..10d926a 100644
|
||||||
|
--- a/konversation/src/alias_preferencesui.ui
|
||||||
|
+++ b/konversation/src/alias_preferencesui.ui
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget" row="1" column="0">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout7</cstring>
|
||||||
|
+ <cstring>layout7</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -114,7 +114,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout8</cstring>
|
||||||
|
+ <cstring>layout8</cstring>
|
||||||
|
</property>
|
||||||
|
<vbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui
|
||||||
|
index 769ba9b..494427f 100644
|
||||||
|
--- a/konversation/src/autoreplace_preferencesui.ui
|
||||||
|
+++ b/konversation/src/autoreplace_preferencesui.ui
|
||||||
|
@@ -22,7 +22,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout6</cstring>
|
||||||
|
+ <cstring>layout6</cstring>
|
||||||
|
</property>
|
||||||
|
<vbox>
|
||||||
|
<property name="name">
|
||||||
|
@@ -137,7 +137,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="1" column="0">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout16</cstring>
|
||||||
|
+ <cstring>layout16</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui
|
||||||
|
index 33bb6ff..529207d 100644
|
||||||
|
--- a/konversation/src/channeloptionsui.ui
|
||||||
|
+++ b/konversation/src/channeloptionsui.ui
|
||||||
|
@@ -215,7 +215,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout11</cstring>
|
||||||
|
+ <cstring>layout11</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -289,7 +289,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout2</cstring>
|
||||||
|
+ <cstring>layout2</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui
|
||||||
|
index 909e5b3..b0e9c1e 100644
|
||||||
|
--- a/konversation/src/colorsappearance_preferences.ui
|
||||||
|
+++ b/konversation/src/colorsappearance_preferences.ui
|
||||||
|
@@ -726,7 +726,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="12">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout18</cstring>
|
||||||
|
+ <cstring>layout18</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/dccrecipientdialog.cpp b/konversation/src/dccrecipientdialog.cpp
|
||||||
|
index 6be72d2..bb5d334 100644
|
||||||
|
--- a/konversation/src/dccrecipientdialog.cpp
|
||||||
|
+++ b/konversation/src/dccrecipientdialog.cpp
|
||||||
|
@@ -30,7 +30,7 @@ DccRecipientDialog::DccRecipientDialog(TQWidget* parent, const TQStringList &lis
|
||||||
|
// Create the top level widget
|
||||||
|
TQWidget* page=new TQWidget(this);
|
||||||
|
setMainWidget(page);
|
||||||
|
- // Add the tqlayout to the widget
|
||||||
|
+ // Add the layout to the widget
|
||||||
|
TQVBoxLayout* dialogLayout=new TQVBoxLayout(page);
|
||||||
|
dialogLayout->setSpacing(spacingHint());
|
||||||
|
// Add the nickname list widget
|
||||||
|
diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui
|
||||||
|
index 967b1ae..ea04cf8 100644
|
||||||
|
--- a/konversation/src/dcctransferdetailedinfopanelui.ui
|
||||||
|
+++ b/konversation/src/dcctransferdetailedinfopanelui.ui
|
||||||
|
@@ -26,7 +26,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout7</cstring>
|
||||||
|
+ <cstring>layout7</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -115,7 +115,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="6" column="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout6</cstring>
|
||||||
|
+ <cstring>layout6</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
@@ -162,7 +162,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout26</cstring>
|
||||||
|
+ <cstring>layout26</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
@@ -170,7 +170,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout24</cstring>
|
||||||
|
+ <cstring>layout24</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -344,7 +344,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout25</cstring>
|
||||||
|
+ <cstring>layout25</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/editnotifydialog.cpp b/konversation/src/editnotifydialog.cpp
|
||||||
|
index 312d69c..8874463 100644
|
||||||
|
--- a/konversation/src/editnotifydialog.cpp
|
||||||
|
+++ b/konversation/src/editnotifydialog.cpp
|
||||||
|
@@ -37,8 +37,8 @@ KDialogBase::Ok,true)
|
||||||
|
TQWidget* page=new TQWidget(this);
|
||||||
|
setMainWidget(page);
|
||||||
|
|
||||||
|
- TQHBoxLayout* tqlayout = new TQHBoxLayout(page);
|
||||||
|
- tqlayout->setSpacing(spacingHint());
|
||||||
|
+ TQHBoxLayout* layout = new TQHBoxLayout(page);
|
||||||
|
+ layout->setSpacing(spacingHint());
|
||||||
|
|
||||||
|
TQLabel* networkNameLabel=new TQLabel(i18n("&Network name:"),page);
|
||||||
|
TQString networkNameWT = i18n(
|
||||||
|
@@ -80,10 +80,10 @@ KDialogBase::Ok,true)
|
||||||
|
if(*it == network) m_networkNameCombo->setCurrentItem(m_networkNameCombo->count()-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
- tqlayout->addWidget(networkNameLabel);
|
||||||
|
- tqlayout->addWidget(m_networkNameCombo);
|
||||||
|
- tqlayout->addWidget(nicknameLabel);
|
||||||
|
- tqlayout->addWidget(m_nicknameInput);
|
||||||
|
+ layout->addWidget(networkNameLabel);
|
||||||
|
+ layout->addWidget(m_networkNameCombo);
|
||||||
|
+ layout->addWidget(nicknameLabel);
|
||||||
|
+ layout->addWidget(m_nicknameInput);
|
||||||
|
|
||||||
|
setButtonOK(KGuiItem(i18n("&OK"),"button_ok",i18n("Change notify information")));
|
||||||
|
setButtonCancel(KGuiItem(i18n("&Cancel"),"button_cancel",i18n("Discards all changes made")));
|
||||||
|
diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui
|
||||||
|
index 3b42a4d..df28e7e 100644
|
||||||
|
--- a/konversation/src/highlight_preferencesui.ui
|
||||||
|
+++ b/konversation/src/highlight_preferencesui.ui
|
||||||
|
@@ -93,7 +93,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="4" rowspan="5" colspan="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout13</cstring>
|
||||||
|
+ <cstring>layout13</cstring>
|
||||||
|
</property>
|
||||||
|
<vbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp
|
||||||
|
index 0f9e672..cfa592a 100644
|
||||||
|
--- a/konversation/src/identitydialog.cpp
|
||||||
|
+++ b/konversation/src/identitydialog.cpp
|
||||||
|
@@ -90,7 +90,7 @@ namespace Konversation
|
||||||
|
|
||||||
|
TQGroupBox* nicknameGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Nickname"), generalWidget);
|
||||||
|
nicknameGBox->setMargin(marginHint());
|
||||||
|
- TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->tqlayout(), 1, 2, spacingHint());
|
||||||
|
+ TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->layout(), 1, 2, spacingHint());
|
||||||
|
|
||||||
|
m_nicknameLBox = new TQListBox(nicknameGBox);
|
||||||
|
TQWhatsThis::add(m_nicknameLBox, i18n("This is your list of nicknames. A nickname is the name that other users will know you by. You may use any name you desire. The first character must be a letter.\n\nSince nicknames must be unique across an entire IRC network, your desired name may be rejected by the server because someone else is already using that nickname. Enter alternate nicknames for yourself. If your first choice is rejected by the server, Konversation will try the alternate nicknames."));
|
||||||
|
@@ -126,7 +126,7 @@ namespace Konversation
|
||||||
|
|
||||||
|
TQGroupBox* autoIdentifyGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Auto Identify"), generalWidget);
|
||||||
|
autoIdentifyGBox->setMargin(marginHint());
|
||||||
|
- TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->tqlayout(), 1, 2, spacingHint());
|
||||||
|
+ TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->layout(), 1, 2, spacingHint());
|
||||||
|
|
||||||
|
TQLabel* botLabel=new TQLabel(i18n("Ser&vice:"), autoIdentifyGBox);
|
||||||
|
TQWhatsThis::add(botLabel,i18n("Service name can be <b><i>nickserv</i></b> or a network dependant name like <b><i>nickserv@services.dal.net</i></b>"));
|
||||||
|
@@ -167,7 +167,7 @@ namespace Konversation
|
||||||
|
m_automaticAwayGBox->setCheckable(true);
|
||||||
|
m_automaticAwayGBox->setColumnLayout(0, Qt::Horizontal);
|
||||||
|
m_automaticAwayGBox->setMargin(marginHint());
|
||||||
|
- TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->tqlayout(), 1, 2, spacingHint());
|
||||||
|
+ TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->layout(), 1, 2, spacingHint());
|
||||||
|
|
||||||
|
TQWhatsThis::add(m_automaticAwayGBox, i18n("If you check this box, Konversation will automatically set all connections using this Identity away when the screensaver starts or after a period of user inactivity configured below."));
|
||||||
|
|
||||||
|
@@ -198,7 +198,7 @@ namespace Konversation
|
||||||
|
m_awayMessageGBox->setCheckable(true);
|
||||||
|
m_awayMessageGBox->setColumnLayout(0, Qt::Horizontal);
|
||||||
|
m_awayMessageGBox->setMargin(marginHint());
|
||||||
|
- TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->tqlayout(), 1, 2, spacingHint());
|
||||||
|
+ TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->layout(), 1, 2, spacingHint());
|
||||||
|
|
||||||
|
TQWhatsThis::add(m_awayMessageGBox, i18n("If you check this box, Konversation will automatically send the Away message to all channels joined with this Identity. <b>%s</b> is replaced with <b>msg</b>. Whenever you perform an <b>/away</b> command, the Return message will be displayed in all channels joined with this Identity."));
|
||||||
|
|
||||||
|
diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui
|
||||||
|
index 88aa423..501fa89 100644
|
||||||
|
--- a/konversation/src/ignore_preferencesui.ui
|
||||||
|
+++ b/konversation/src/ignore_preferencesui.ui
|
||||||
|
@@ -145,7 +145,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="2" rowspan="3" colspan="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout20</cstring>
|
||||||
|
+ <cstring>layout20</cstring>
|
||||||
|
</property>
|
||||||
|
<vbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/irccharsets.cpp b/konversation/src/irccharsets.cpp
|
||||||
|
index 0849cfc..692820c 100644
|
||||||
|
--- a/konversation/src/irccharsets.cpp
|
||||||
|
+++ b/konversation/src/irccharsets.cpp
|
||||||
|
@@ -130,7 +130,7 @@ namespace Konversation
|
||||||
|
|
||||||
|
// setup m_shortNameAliases
|
||||||
|
// use only [a-z0-9] for keys!
|
||||||
|
- m_shortNameAliases["tqunicode"] = "utf8";
|
||||||
|
+ m_shortNameAliases["unicode"] = "utf8";
|
||||||
|
m_shortNameAliases["latin1"] = "iso-8859-1";
|
||||||
|
|
||||||
|
// setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames
|
||||||
|
diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
|
||||||
|
index e76b032..7766351 100644
|
||||||
|
--- a/konversation/src/ircinput.cpp
|
||||||
|
+++ b/konversation/src/ircinput.cpp
|
||||||
|
@@ -371,7 +371,7 @@ void IRCInput::paste(bool useSelection)
|
||||||
|
|
||||||
|
void IRCInput::paste()
|
||||||
|
{
|
||||||
|
- TQClipboard *cb = KApplication::kApplication()->tqclipboard();
|
||||||
|
+ TQClipboard *cb = KApplication::kApplication()->clipboard();
|
||||||
|
setFocus();
|
||||||
|
|
||||||
|
// Copy text from the clipboard (paste)
|
||||||
|
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
|
||||||
|
index 94a10b5..b2711ff 100644
|
||||||
|
--- a/konversation/src/ircview.cpp
|
||||||
|
+++ b/konversation/src/ircview.cpp
|
||||||
|
@@ -645,7 +645,7 @@ TQString IRCView::createNickLine(const TQString& nick, bool encapsulateNick, boo
|
||||||
|
|
||||||
|
for (uint index = 0; index < nick.length(); index++)
|
||||||
|
{
|
||||||
|
- nickvalue += nick[index].tqunicode();
|
||||||
|
+ nickvalue += nick[index].unicode();
|
||||||
|
}
|
||||||
|
|
||||||
|
nickColor = Preferences::nickColor((nickvalue % 8)).name();
|
||||||
|
@@ -1344,7 +1344,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce)
|
||||||
|
break;
|
||||||
|
case CopyUrl:
|
||||||
|
{
|
||||||
|
- TQClipboard *cb = KApplication::kApplication()->tqclipboard();
|
||||||
|
+ TQClipboard *cb = KApplication::kApplication()->clipboard();
|
||||||
|
cb->setText(m_urlToCopy,TQClipboard::Selection);
|
||||||
|
cb->setText(m_urlToCopy,TQClipboard::Clipboard);
|
||||||
|
break;
|
||||||
|
@@ -1621,8 +1621,8 @@ TQPopupMenu* IRCView::getPopup() const
|
||||||
|
}
|
||||||
|
|
||||||
|
// for more information about these RTFM
|
||||||
|
-// http://www.tqunicode.org/reports/tr9/
|
||||||
|
-// http://www.w3.org/TR/tqunicode-xml/
|
||||||
|
+// http://www.unicode.org/reports/tr9/
|
||||||
|
+// http://www.w3.org/TR/unicode-xml/
|
||||||
|
TQChar IRCView::LRM = (ushort)0x200e; // Right-to-Left Mark
|
||||||
|
TQChar IRCView::RLM = (ushort)0x200f; // Left-to-Right Mark
|
||||||
|
TQChar IRCView::LRE = (ushort)0x202a; // Left-to-Right Embedding
|
||||||
|
diff --git a/konversation/src/konversationapplication.h b/konversation/src/konversationapplication.h
|
||||||
|
index 4795659..8651b19 100644
|
||||||
|
--- a/konversation/src/konversationapplication.h
|
||||||
|
+++ b/konversation/src/konversationapplication.h
|
||||||
|
@@ -89,7 +89,7 @@ class KonversationApplication : public KUniqueApplication
|
||||||
|
static KonversationApplication* instance();
|
||||||
|
|
||||||
|
/** For dcop and addressbook, a user can be specified as user@irc.server.net
|
||||||
|
- * or user\@servergroup or using the tqunicode separator symbol 0xE120 instead
|
||||||
|
+ * or user\@servergroup or using the unicode separator symbol 0xE120 instead
|
||||||
|
* of the "@". This function takes a string like the above examples, and
|
||||||
|
* modifies ircnick and serverOrGroup to contain the split up string. If
|
||||||
|
* the string doesn't have an @ or 0xE120, ircnick is set to the
|
||||||
|
diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp
|
||||||
|
index 48f6973..935dcd0 100644
|
||||||
|
--- a/konversation/src/linkaddressbook/addressbook_base.cpp
|
||||||
|
+++ b/konversation/src/linkaddressbook/addressbook_base.cpp
|
||||||
|
@@ -194,7 +194,7 @@ namespace Konversation
|
||||||
|
lnick_servergroup = lnick + TQChar(0xE120) + servergroup.lower();
|
||||||
|
|
||||||
|
//We should now have lnick = ircnick, and versions with servername and servergroup -
|
||||||
|
- // like johnflux, johnflux@freenode, or johnflux@irc.kde.org except with the tqunicode
|
||||||
|
+ // like johnflux, johnflux@freenode, or johnflux@irc.kde.org except with the unicode
|
||||||
|
// separator char 0xe120 instead of the @
|
||||||
|
|
||||||
|
kdDebug() << "nick" << ircnick<< endl;
|
||||||
|
diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
|
||||||
|
index e67d306..1fa3c3e 100644
|
||||||
|
--- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui
|
||||||
|
+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
|
||||||
|
@@ -125,7 +125,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout1</cstring>
|
||||||
|
+ <cstring>layout1</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/multilineedit.cpp b/konversation/src/multilineedit.cpp
|
||||||
|
index 3999bbc..b4af548 100644
|
||||||
|
--- a/konversation/src/multilineedit.cpp
|
||||||
|
+++ b/konversation/src/multilineedit.cpp
|
||||||
|
@@ -28,7 +28,7 @@ KGuiItem(i18n("Add &Quotation Indicators")))
|
||||||
|
// Create the top level widget
|
||||||
|
TQWidget* page=new TQWidget(this);
|
||||||
|
setMainWidget(page);
|
||||||
|
- // Add the tqlayout to the widget
|
||||||
|
+ // Add the layout to the widget
|
||||||
|
TQVBoxLayout* dialogLayout=new TQVBoxLayout(page);
|
||||||
|
dialogLayout->setSpacing(spacingHint());
|
||||||
|
// add the text editor
|
||||||
|
diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
|
||||||
|
index 640003a..2f44e4d 100644
|
||||||
|
--- a/konversation/src/nick.cpp
|
||||||
|
+++ b/konversation/src/nick.cpp
|
||||||
|
@@ -238,7 +238,7 @@ void Nick::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int wid
|
||||||
|
|
||||||
|
if(nickInfo->isAway())
|
||||||
|
{
|
||||||
|
- cg2.setColor(TQColorGroup::Text, kapp->tqpalette(listView()).disabled().text());
|
||||||
|
+ cg2.setColor(TQColorGroup::Text, kapp->palette(listView()).disabled().text());
|
||||||
|
}
|
||||||
|
|
||||||
|
KListViewItem::paintCell(p,cg2,column,width,align);
|
||||||
|
diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp
|
||||||
|
index 17765ca..efc218e 100644
|
||||||
|
--- a/konversation/src/nickinfo.cpp
|
||||||
|
+++ b/konversation/src/nickinfo.cpp
|
||||||
|
@@ -85,7 +85,7 @@ uint NickInfo::getNickColor()
|
||||||
|
|
||||||
|
for (uint index = 0; index < m_nickname.length(); index++)
|
||||||
|
{
|
||||||
|
- nickvalue += m_nickname[index].tqunicode();
|
||||||
|
+ nickvalue += m_nickname[index].unicode();
|
||||||
|
}
|
||||||
|
|
||||||
|
m_nickColor = (nickvalue % 8) + 1;
|
||||||
|
diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui
|
||||||
|
index 6bb1c7a..2a974e0 100644
|
||||||
|
--- a/konversation/src/queuetunerbase.ui
|
||||||
|
+++ b/konversation/src/queuetunerbase.ui
|
||||||
|
@@ -32,7 +32,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout92</cstring>
|
||||||
|
+ <cstring>layout92</cstring>
|
||||||
|
</property>
|
||||||
|
<vbox>
|
||||||
|
<property name="name">
|
||||||
|
@@ -132,7 +132,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout164</cstring>
|
||||||
|
+ <cstring>layout164</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
@@ -185,7 +185,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="0">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout242</cstring>
|
||||||
|
+ <cstring>layout242</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -239,7 +239,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout236_2_2</cstring>
|
||||||
|
+ <cstring>layout236_2_2</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -314,7 +314,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout163</cstring>
|
||||||
|
+ <cstring>layout163</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
@@ -367,7 +367,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout236_2</cstring>
|
||||||
|
+ <cstring>layout236_2</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -415,7 +415,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="0">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout240</cstring>
|
||||||
|
+ <cstring>layout240</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -496,7 +496,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout161</cstring>
|
||||||
|
+ <cstring>layout161</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
@@ -552,7 +552,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="0">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout237</cstring>
|
||||||
|
+ <cstring>layout237</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -606,7 +606,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout236</cstring>
|
||||||
|
+ <cstring>layout236</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -681,7 +681,7 @@
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout88</cstring>
|
||||||
|
+ <cstring>layout88</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui
|
||||||
|
index 4e22b30..c0fd88f 100644
|
||||||
|
--- a/konversation/src/quickbuttons_preferencesui.ui
|
||||||
|
+++ b/konversation/src/quickbuttons_preferencesui.ui
|
||||||
|
@@ -63,7 +63,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="1" column="0">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout3</cstring>
|
||||||
|
+ <cstring>layout3</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
@@ -161,7 +161,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout1</cstring>
|
||||||
|
+ <cstring>layout1</cstring>
|
||||||
|
</property>
|
||||||
|
<vbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/quickconnectdialog.cpp b/konversation/src/quickconnectdialog.cpp
|
||||||
|
index 671b17a..0d86fcc 100644
|
||||||
|
--- a/konversation/src/quickconnectdialog.cpp
|
||||||
|
+++ b/konversation/src/quickconnectdialog.cpp
|
||||||
|
@@ -31,9 +31,9 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
|
||||||
|
TQWidget* page = new TQWidget(this);
|
||||||
|
setMainWidget(page);
|
||||||
|
|
||||||
|
- TQGridLayout* tqlayout = new TQGridLayout(page, 2, 4);
|
||||||
|
- tqlayout->setSpacing(spacingHint());
|
||||||
|
- tqlayout->setColStretch(1, 10);
|
||||||
|
+ TQGridLayout* layout = new TQGridLayout(page, 2, 4);
|
||||||
|
+ layout->setSpacing(spacingHint());
|
||||||
|
+ layout->setColStretch(1, 10);
|
||||||
|
|
||||||
|
TQLabel* hostNameLabel = new TQLabel(i18n("&Server host:"), page);
|
||||||
|
TQString hostNameWT = i18n("Enter the host of the network here.");
|
||||||
|
@@ -66,17 +66,17 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
|
||||||
|
sslCheckBox = new TQCheckBox(page, "sslCheckBox");
|
||||||
|
sslCheckBox->setText(i18n("&Use SSL"));
|
||||||
|
|
||||||
|
- tqlayout->addWidget(hostNameLabel, 0, 0);
|
||||||
|
- tqlayout->addWidget(hostNameInput, 0, 1);
|
||||||
|
- tqlayout->addWidget(portLabel, 0, 2);
|
||||||
|
- tqlayout->addWidget(portInput, 0, 3);
|
||||||
|
+ layout->addWidget(hostNameLabel, 0, 0);
|
||||||
|
+ layout->addWidget(hostNameInput, 0, 1);
|
||||||
|
+ layout->addWidget(portLabel, 0, 2);
|
||||||
|
+ layout->addWidget(portInput, 0, 3);
|
||||||
|
|
||||||
|
- tqlayout->addWidget(nickLabel, 1, 0);
|
||||||
|
- tqlayout->addWidget(nickInput, 1, 1);
|
||||||
|
- tqlayout->addWidget(passwordLabel, 1, 2);
|
||||||
|
- tqlayout->addWidget(passwordInput, 1, 3);
|
||||||
|
+ layout->addWidget(nickLabel, 1, 0);
|
||||||
|
+ layout->addWidget(nickInput, 1, 1);
|
||||||
|
+ layout->addWidget(passwordLabel, 1, 2);
|
||||||
|
+ layout->addWidget(passwordInput, 1, 3);
|
||||||
|
|
||||||
|
- tqlayout->addWidget(sslCheckBox, 2, 0);
|
||||||
|
+ layout->addWidget(sslCheckBox, 2, 0);
|
||||||
|
|
||||||
|
hostNameInput->setFocus();
|
||||||
|
|
||||||
|
diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp
|
||||||
|
index 38ad8f4..cd37cd1 100644
|
||||||
|
--- a/konversation/src/serverlistdialog.cpp
|
||||||
|
+++ b/konversation/src/serverlistdialog.cpp
|
||||||
|
@@ -133,14 +133,14 @@ namespace Konversation
|
||||||
|
showAtStartup->setChecked(Preferences::showServerList());
|
||||||
|
connect(showAtStartup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowAtStartup(bool)));
|
||||||
|
|
||||||
|
- TQGridLayout* tqlayout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint());
|
||||||
|
-
|
||||||
|
- tqlayout->addMultiCellWidget(m_serverList, 0, 3, 0, 0);
|
||||||
|
- tqlayout->addWidget(m_addButton, 0, 1);
|
||||||
|
- tqlayout->addWidget(m_editButton, 1, 1);
|
||||||
|
- tqlayout->addWidget(m_delButton, 2, 1);
|
||||||
|
- tqlayout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1);
|
||||||
|
- tqlayout->setRowStretch(3, 10);
|
||||||
|
+ TQGridLayout* layout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint());
|
||||||
|
+
|
||||||
|
+ layout->addMultiCellWidget(m_serverList, 0, 3, 0, 0);
|
||||||
|
+ layout->addWidget(m_addButton, 0, 1);
|
||||||
|
+ layout->addWidget(m_editButton, 1, 1);
|
||||||
|
+ layout->addWidget(m_delButton, 2, 1);
|
||||||
|
+ layout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1);
|
||||||
|
+ layout->setRowStretch(3, 10);
|
||||||
|
|
||||||
|
m_serverList->setFocus();
|
||||||
|
|
||||||
|
diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui
|
||||||
|
index 73b914c..a039acb 100644
|
||||||
|
--- a/konversation/src/tabs_preferencesui.ui
|
||||||
|
+++ b/konversation/src/tabs_preferencesui.ui
|
||||||
|
@@ -39,7 +39,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||||
|
</property>
|
||||||
|
<widget class="TQLayoutWidget">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout2</cstring>
|
||||||
|
+ <cstring>layout2</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
|
||||||
|
index 90c3a2b..f804677 100644
|
||||||
|
--- a/konversation/src/theme_preferencesui.ui
|
||||||
|
+++ b/konversation/src/theme_preferencesui.ui
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout17</cstring>
|
||||||
|
+ <cstring>layout17</cstring>
|
||||||
|
</property>
|
||||||
|
<hbox>
|
||||||
|
<property name="name">
|
||||||
|
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
|
||||||
|
index c618026..5b03382 100644
|
||||||
|
--- a/konversation/src/topiclabel.cpp
|
||||||
|
+++ b/konversation/src/topiclabel.cpp
|
||||||
|
@@ -199,7 +199,7 @@ namespace Konversation
|
||||||
|
break;
|
||||||
|
case CopyUrl:
|
||||||
|
{
|
||||||
|
- TQClipboard *cb = KApplication::kApplication()->tqclipboard();
|
||||||
|
+ TQClipboard *cb = KApplication::kApplication()->clipboard();
|
||||||
|
cb->setText(m_urlToCopy,TQClipboard::Selection);
|
||||||
|
cb->setText(m_urlToCopy,TQClipboard::Clipboard);
|
||||||
|
break;
|
||||||
|
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
|
||||||
|
index 76ff9e5..0fe0732 100644
|
||||||
|
--- a/konversation/src/urlcatcher.cpp
|
||||||
|
+++ b/konversation/src/urlcatcher.cpp
|
||||||
|
@@ -40,7 +40,7 @@
|
||||||
|
|
||||||
|
UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
|
||||||
|
{
|
||||||
|
- tqlayout()->setAutoAdd(false);
|
||||||
|
+ layout()->setAutoAdd(false);
|
||||||
|
setName(i18n("URL Catcher"));
|
||||||
|
setType(ChatWindow::UrlCatcher);
|
||||||
|
|
||||||
|
@@ -96,9 +96,9 @@ UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
|
||||||
|
saveListButton->setEnabled(false);
|
||||||
|
clearListButton->setEnabled(false);
|
||||||
|
|
||||||
|
- tqlayout()->add(searchWidget);
|
||||||
|
- tqlayout()->add(urlListView);
|
||||||
|
- tqlayout()->add(buttonBox);
|
||||||
|
+ layout()->add(searchWidget);
|
||||||
|
+ layout()->add(urlListView);
|
||||||
|
+ layout()->add(buttonBox);
|
||||||
|
|
||||||
|
urlSelected();
|
||||||
|
}
|
||||||
|
@@ -167,7 +167,7 @@ void UrlCatcher::copyUrlClicked()
|
||||||
|
TQListViewItem* item=urlListView->selectedItem();
|
||||||
|
if(item)
|
||||||
|
{
|
||||||
|
- TQClipboard *cb=KApplication::kApplication()->tqclipboard();
|
||||||
|
+ TQClipboard *cb=KApplication::kApplication()->clipboard();
|
||||||
|
cb->setText(item->text(1),TQClipboard::Selection);
|
||||||
|
cb->setText(item->text(1),TQClipboard::Clipboard);
|
||||||
|
}
|
||||||
|
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
|
||||||
|
index 7b92a86..cbb0ba6 100644
|
||||||
|
--- a/konversation/src/viewcontainer.cpp
|
||||||
|
+++ b/konversation/src/viewcontainer.cpp
|
||||||
|
@@ -1058,12 +1058,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
|
||||||
|
Channel *channel = static_cast<Channel*>(view);
|
||||||
|
|
||||||
|
if (!channel->joined())
|
||||||
|
- textColor = KonversationApplication::instance()->tqpalette(m_viewTree).disabled().text();
|
||||||
|
+ textColor = KonversationApplication::instance()->palette(m_viewTree).disabled().text();
|
||||||
|
}
|
||||||
|
else if (view->getType() == ChatWindow::Query)
|
||||||
|
{
|
||||||
|
if (!view->getServer()->isConnected())
|
||||||
|
- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
|
||||||
|
+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
|
||||||
|
}
|
||||||
|
|
||||||
|
m_viewTree->setViewColor(view, textColor);
|
||||||
|
@@ -1100,12 +1100,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
|
||||||
|
Channel *channel = static_cast<Channel*>(view);
|
||||||
|
|
||||||
|
if (!channel->joined())
|
||||||
|
- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
|
||||||
|
+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
|
||||||
|
}
|
||||||
|
else if (view->getType() == ChatWindow::Query)
|
||||||
|
{
|
||||||
|
if (!view->getServer()->isConnected())
|
||||||
|
- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
|
||||||
|
+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
|
||||||
|
}
|
||||||
|
|
||||||
|
m_tabWidget->setTabColor(view, textColor);
|
||||||
|
diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui
|
||||||
|
index 6f9860b..9df9782 100644
|
||||||
|
--- a/konversation/src/watchednicknames_preferencesui.ui
|
||||||
|
+++ b/konversation/src/watchednicknames_preferencesui.ui
|
||||||
|
@@ -273,7 +273,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames
|
||||||
|
</widget>
|
||||||
|
<widget class="TQLayoutWidget" row="0" column="4" rowspan="2" colspan="1">
|
||||||
|
<property name="name">
|
||||||
|
- <cstring>tqlayout3</cstring>
|
||||||
|
+ <cstring>layout3</cstring>
|
||||||
|
</property>
|
||||||
|
<vbox>
|
||||||
|
<property name="name">
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
commit 440010aa593e209ce5993a73b1b7cb0a843a2716
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1327529820 -0600
|
||||||
|
|
||||||
|
Fix linear alphabet string errors
|
||||||
|
|
||||||
|
diff --git a/konversation/src/blowfish/b64stuff.cpp b/konversation/src/blowfish/b64stuff.cpp
|
||||||
|
index 79d5e64..72f0776 100644
|
||||||
|
--- a/konversation/src/blowfish/b64stuff.cpp
|
||||||
|
+++ b/konversation/src/blowfish/b64stuff.cpp
|
||||||
|
@@ -36,10 +36,10 @@
|
||||||
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------
|
||||||
|
-//static char b64table[64] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
|
||||||
|
+//static char b64table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||||
|
// "abcdefghijklmnopqrstuvwxyz"
|
||||||
|
// "0123456789+/";
|
||||||
|
-static char b64table[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
+static char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
|
||||||
|
/* Accepts a binary buffer with an associated size.
|
||||||
|
* Returns a base64-encoded, NULL-terminated string.
|
||||||
|
diff --git a/konversation/src/blowfish/oldblowfish.cpp b/konversation/src/blowfish/oldblowfish.cpp
|
||||||
|
index 3eab870..1f274db 100644
|
||||||
|
--- a/konversation/src/blowfish/oldblowfish.cpp
|
||||||
|
+++ b/konversation/src/blowfish/oldblowfish.cpp
|
||||||
|
@@ -271,7 +271,7 @@ void oldCBlowFish::Decode (BYTE * pInput, BYTE * pOutput, DWORD lSize)
|
||||||
|
#define SALT2 0x23f6b095
|
||||||
|
|
||||||
|
// Convert 64-bit encrypted passphrase to text for userfile
|
||||||
|
-char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
|
||||||
|
+char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||||
|
|
||||||
|
int base64dec(char c)
|
||||||
|
{
|
||||||
@ -0,0 +1,200 @@
|
|||||||
|
commit ca3d6cef5d40d2c9faf1f0279f40b135a444d206
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1334302097 -0500
|
||||||
|
|
||||||
|
Fix inadvertent "TQ" changes.
|
||||||
|
|
||||||
|
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
|
||||||
|
index c28c844..5534ac8 100644
|
||||||
|
--- a/konversation/src/config/preferences.cpp
|
||||||
|
+++ b/konversation/src/config/preferences.cpp
|
||||||
|
@@ -105,7 +105,7 @@ const TQStringList Preferences::defaultQuickButtonList()
|
||||||
|
<< "Kick,/KICK %u%n"
|
||||||
|
<< "Ban,/BAN %u%n"
|
||||||
|
<< "Part,/PART %c Leaving...%n"
|
||||||
|
- << "Quit,/TQUIT Leaving...%n";
|
||||||
|
+ << "Quit,/QUIT Leaving...%n";
|
||||||
|
}
|
||||||
|
|
||||||
|
const TQStringList Preferences::quickButtonList()
|
||||||
|
diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h
|
||||||
|
index af7bc97..f4b03a9 100644
|
||||||
|
--- a/konversation/src/dcctransfer.h
|
||||||
|
+++ b/konversation/src/dcctransfer.h
|
||||||
|
@@ -92,9 +92,9 @@ class DccTransfer : public TQObject
|
||||||
|
|
||||||
|
// common settings for DccTransferRecv / DccTransferSend
|
||||||
|
|
||||||
|
- // RETQUIRED
|
||||||
|
+ // REQUIRED
|
||||||
|
void setConnectionId( int connectionId );
|
||||||
|
- // RETQUIRED
|
||||||
|
+ // REQUIRED
|
||||||
|
void setPartnerNick( const TQString& nick );
|
||||||
|
|
||||||
|
signals:
|
||||||
|
diff --git a/konversation/src/dcctransferrecv.h b/konversation/src/dcctransferrecv.h
|
||||||
|
index aed4624..92f4201 100644
|
||||||
|
--- a/konversation/src/dcctransferrecv.h
|
||||||
|
+++ b/konversation/src/dcctransferrecv.h
|
||||||
|
@@ -50,11 +50,11 @@ class DccTransferRecv : public DccTransfer
|
||||||
|
DccTransferRecv(TQObject* parent);
|
||||||
|
virtual ~DccTransferRecv();
|
||||||
|
|
||||||
|
- // RETQUIRED
|
||||||
|
+ // REQUIRED
|
||||||
|
void setPartnerIp( const TQString& ip );
|
||||||
|
- // RETQUIRED
|
||||||
|
+ // REQUIRED
|
||||||
|
void setPartnerPort( const TQString& port );
|
||||||
|
- // RETQUIRED
|
||||||
|
+ // REQUIRED
|
||||||
|
void setFileSize( unsigned long fileSize );
|
||||||
|
// OPTIONAL, if not specified, "unnamed_file"
|
||||||
|
// TODO: "$sendername-$receiveddate" is better
|
||||||
|
diff --git a/konversation/src/dcctransfersend.h b/konversation/src/dcctransfersend.h
|
||||||
|
index 1a3e4ea..e4f50f0 100644
|
||||||
|
--- a/konversation/src/dcctransfersend.h
|
||||||
|
+++ b/konversation/src/dcctransfersend.h
|
||||||
|
@@ -39,11 +39,11 @@ class DccTransferSend : public DccTransfer
|
||||||
|
DccTransferSend(TQObject* parent);
|
||||||
|
virtual ~DccTransferSend();
|
||||||
|
|
||||||
|
- // RETQUIRED
|
||||||
|
+ // REQUIRED
|
||||||
|
void setFileURL( const KURL& url );
|
||||||
|
// OPTIONAL
|
||||||
|
void setFileName( const TQString& fileName );
|
||||||
|
- // RETQUIED
|
||||||
|
+ // REQUIRED
|
||||||
|
// FIXME: this setting should be an optional one or be removed: make DccTransferSend itself read the configuration
|
||||||
|
void setOwnIp( const TQString& ownIp );
|
||||||
|
// OPTIONAL
|
||||||
|
diff --git a/konversation/src/ircqueue.h b/konversation/src/ircqueue.h
|
||||||
|
index b1473d6..ec5d7d2 100644
|
||||||
|
--- a/konversation/src/ircqueue.h
|
||||||
|
+++ b/konversation/src/ircqueue.h
|
||||||
|
@@ -10,8 +10,8 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
-#ifndef IRCTQUEUE_H
|
||||||
|
-#define IRCTQUEUE_H
|
||||||
|
+#ifndef IRCQUEUE_H
|
||||||
|
+#define IRCQUEUE_H
|
||||||
|
|
||||||
|
class Server;
|
||||||
|
|
||||||
|
diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
|
||||||
|
index 9ec34f6..f691a6d 100644
|
||||||
|
--- a/konversation/src/outputfilter.cpp
|
||||||
|
+++ b/konversation/src/outputfilter.cpp
|
||||||
|
@@ -1429,7 +1429,7 @@ namespace Konversation
|
||||||
|
|
||||||
|
if(parameter.isEmpty())
|
||||||
|
{
|
||||||
|
- result = usage(i18n("Usage: %1TQUOTE command list").arg(commandChar));
|
||||||
|
+ result = usage(i18n("Usage: %1QUOTE command list").arg(commandChar));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
diff --git a/konversation/src/query.h b/konversation/src/query.h
|
||||||
|
index 513377e..c390ca7 100644
|
||||||
|
--- a/konversation/src/query.h
|
||||||
|
+++ b/konversation/src/query.h
|
||||||
|
@@ -10,8 +10,8 @@
|
||||||
|
Copyright (C) 2005-2008 Eike Hein <hein@kde.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#ifndef TQUERY_H
|
||||||
|
-#define TQUERY_H
|
||||||
|
+#ifndef QUERY_H
|
||||||
|
+#define QUERY_H
|
||||||
|
|
||||||
|
#include "chatwindow.h"
|
||||||
|
#include "nickinfo.h"
|
||||||
|
diff --git a/konversation/src/queuetuner.h b/konversation/src/queuetuner.h
|
||||||
|
index c918171..be8fc55 100644
|
||||||
|
--- a/konversation/src/queuetuner.h
|
||||||
|
+++ b/konversation/src/queuetuner.h
|
||||||
|
@@ -10,8 +10,8 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
-#ifndef TQUEUETUNER_H
|
||||||
|
-#define TQUEUETUNER_H
|
||||||
|
+#ifndef QUEUETUNER_H
|
||||||
|
+#define QUEUETUNER_H
|
||||||
|
|
||||||
|
#include "queuetunerbase.h"
|
||||||
|
|
||||||
|
diff --git a/konversation/src/quickbutton.h b/konversation/src/quickbutton.h
|
||||||
|
index 7bf9cf5..bb850ad 100644
|
||||||
|
--- a/konversation/src/quickbutton.h
|
||||||
|
+++ b/konversation/src/quickbutton.h
|
||||||
|
@@ -11,8 +11,8 @@
|
||||||
|
email: eisfuchs@tigress.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#ifndef TQUICKBUTTON_H
|
||||||
|
-#define TQUICKBUTTON_H
|
||||||
|
+#ifndef QUICKBUTTON_H
|
||||||
|
+#define QUICKBUTTON_H
|
||||||
|
|
||||||
|
#include <tqpushbutton.h>
|
||||||
|
|
||||||
|
diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h
|
||||||
|
index ab04a55..8e2293c 100644
|
||||||
|
--- a/konversation/src/quickbuttons_preferences.h
|
||||||
|
+++ b/konversation/src/quickbuttons_preferences.h
|
||||||
|
@@ -10,8 +10,8 @@
|
||||||
|
Copyright (C) 2006 John Tapsell <johnflux@gmail.com>
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#ifndef TQUICKBUTTONSCONFIG_H
|
||||||
|
-#define TQUICKBUTTONSCONFIG_H
|
||||||
|
+#ifndef QUICKBUTTONSCONFIG_H
|
||||||
|
+#define QUICKBUTTONSCONFIG_H
|
||||||
|
|
||||||
|
#include <tqlistview.h>
|
||||||
|
|
||||||
|
diff --git a/konversation/src/quickconnectdialog.h b/konversation/src/quickconnectdialog.h
|
||||||
|
index b41922d..3ba2ba8 100644
|
||||||
|
--- a/konversation/src/quickconnectdialog.h
|
||||||
|
+++ b/konversation/src/quickconnectdialog.h
|
||||||
|
@@ -12,8 +12,8 @@
|
||||||
|
email: mail@tuxipuxi.de
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#ifndef TQUICKCONNECTDIALOG_H
|
||||||
|
-#define TQUICKCONNECTDIALOG_H
|
||||||
|
+#ifndef QUICKCONNECTDIALOG_H
|
||||||
|
+#define QUICKCONNECTDIALOG_H
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
|
||||||
|
index f04e75f..4c1cc6f 100644
|
||||||
|
--- a/konversation/src/server.cpp
|
||||||
|
+++ b/konversation/src/server.cpp
|
||||||
|
@@ -692,9 +692,9 @@ void Server::gotOwnResolvedHostByWelcome(KResolverResults res)
|
||||||
|
|
||||||
|
void Server::quitServer()
|
||||||
|
{
|
||||||
|
- // Make clear this is deliberate even if the TQUIT never actually goes through the queue
|
||||||
|
+ // Make clear this is deliberate even if the QUIT never actually goes through the queue
|
||||||
|
// (i.e. this is not redundant with _send_internal()'s updateConnectionState() call for
|
||||||
|
- // a TQUIT).
|
||||||
|
+ // a QUIT).
|
||||||
|
updateConnectionState(Konversation::SSDeliberatelyDisconnected);
|
||||||
|
|
||||||
|
TQString command(Preferences::commandChar()+"QUIT");
|
||||||
|
@@ -1050,7 +1050,7 @@ int Server::getPreLength(const TQString& command, const TQString& dest)
|
||||||
|
}
|
||||||
|
|
||||||
|
//Commands greater than 1 have localizeable text: 0 1 2 3 4 5 6
|
||||||
|
-static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO TQUIT PRIVMSG NOTICE KICK PART TOPIC");
|
||||||
|
+static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO QUIT PRIVMSG NOTICE KICK PART TOPIC");
|
||||||
|
|
||||||
|
int Server::_send_internal(TQString outputLine)
|
||||||
|
{
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,19 @@
|
|||||||
|
commit c3480dfed56038a7e8c11e2afbc454f59ab44843
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324748239 -0600
|
||||||
|
|
||||||
|
Rename a few stragglers
|
||||||
|
|
||||||
|
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
|
||||||
|
index 100ab62..845df4b 100644
|
||||||
|
--- a/apps/ktorrent/newui/button.cpp
|
||||||
|
+++ b/apps/ktorrent/newui/button.cpp
|
||||||
|
@@ -131,7 +131,7 @@ void Button::drawButton(TQPainter *p)
|
||||||
|
pm.fill(eraseColor());
|
||||||
|
TQPainter p2(&pm);
|
||||||
|
|
||||||
|
- tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
|
||||||
|
+ style().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
|
||||||
|
|
||||||
|
style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
|
||||||
|
TQRect(0,0,pm.width(),pm.height()),
|
||||||
@ -0,0 +1,123 @@
|
|||||||
|
commit 445a515241430cef8e8458d782649fa0e8593a4c
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1332214882 -0500
|
||||||
|
|
||||||
|
Fix inadvertent "TQ" changes.
|
||||||
|
|
||||||
|
diff --git a/apps/ktorrent/groups/queueddownloadsgroup.h b/apps/ktorrent/groups/queueddownloadsgroup.h
|
||||||
|
index 3e436a5..019a69c 100644
|
||||||
|
--- a/apps/ktorrent/groups/queueddownloadsgroup.h
|
||||||
|
+++ b/apps/ktorrent/groups/queueddownloadsgroup.h
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
|
* Free Software Foundation, Inc., *
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
|
***************************************************************************/
|
||||||
|
-#ifndef KTQUEUEDDOWNLOADSGROUP_H
|
||||||
|
-#define KTQUEUEDDOWNLOADSGROUP_H
|
||||||
|
+#ifndef KQUEUEDDOWNLOADSGROUP_H
|
||||||
|
+#define KQUEUEDDOWNLOADSGROUP_H
|
||||||
|
|
||||||
|
#include <group.h>
|
||||||
|
|
||||||
|
diff --git a/apps/ktorrent/groups/queueduploadsgroup.h b/apps/ktorrent/groups/queueduploadsgroup.h
|
||||||
|
index 675da62..601e02f 100644
|
||||||
|
--- a/apps/ktorrent/groups/queueduploadsgroup.h
|
||||||
|
+++ b/apps/ktorrent/groups/queueduploadsgroup.h
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
|
* Free Software Foundation, Inc., *
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
|
***************************************************************************/
|
||||||
|
-#ifndef KTQUEUEDUPLOADSGROUP_H
|
||||||
|
-#define KTQUEUEDUPLOADSGROUP_H
|
||||||
|
+#ifndef KQUEUEDUPLOADSGROUP_H
|
||||||
|
+#define KQUEUEDUPLOADSGROUP_H
|
||||||
|
|
||||||
|
#include <group.h>
|
||||||
|
|
||||||
|
diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
|
||||||
|
index a9392bd..ae37665 100644
|
||||||
|
--- a/apps/ktorrent/ktorrentviewitem.cpp
|
||||||
|
+++ b/apps/ktorrent/ktorrentviewitem.cpp
|
||||||
|
@@ -72,7 +72,7 @@ static TQColor StatusToColor(TorrentStatus s,const TQColorGroup & cg)
|
||||||
|
return TQt::red;
|
||||||
|
case kt::NOT_STARTED :
|
||||||
|
case kt::STOPPED:
|
||||||
|
- case kt::TQUEUED:
|
||||||
|
+ case kt::QUEUED:
|
||||||
|
case kt::DOWNLOAD_COMPLETE :
|
||||||
|
case kt::SEEDING_COMPLETE :
|
||||||
|
default:
|
||||||
|
diff --git a/apps/ktorrent/queuedialog.h b/apps/ktorrent/queuedialog.h
|
||||||
|
index d025fbf..a6900e4 100644
|
||||||
|
--- a/apps/ktorrent/queuedialog.h
|
||||||
|
+++ b/apps/ktorrent/queuedialog.h
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
|
* Free Software Foundation, Inc., *
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
|
***************************************************************************/
|
||||||
|
-#ifndef TQUEUEDIALOG_H
|
||||||
|
-#define TQUEUEDIALOG_H
|
||||||
|
+#ifndef QUEUEDIALOG_H
|
||||||
|
+#define QUEUEDIALOG_H
|
||||||
|
|
||||||
|
#include "queuedlg.h"
|
||||||
|
#include <interfaces/torrentinterface.h>
|
||||||
|
diff --git a/libktorrent/interfaces/torrentinterface.h b/libktorrent/interfaces/torrentinterface.h
|
||||||
|
index 8b21854..e76e00e 100644
|
||||||
|
--- a/libktorrent/interfaces/torrentinterface.h
|
||||||
|
+++ b/libktorrent/interfaces/torrentinterface.h
|
||||||
|
@@ -55,7 +55,7 @@ namespace kt
|
||||||
|
STOPPED,
|
||||||
|
ALLOCATING_DISKSPACE,
|
||||||
|
ERROR,
|
||||||
|
- TQUEUED,
|
||||||
|
+ QUEUED,
|
||||||
|
CHECKING_DATA,
|
||||||
|
NO_SPACE_LEFT
|
||||||
|
};
|
||||||
|
diff --git a/libktorrent/torrent/queuemanager.h b/libktorrent/torrent/queuemanager.h
|
||||||
|
index 26b1012..e49ad44 100644
|
||||||
|
--- a/libktorrent/torrent/queuemanager.h
|
||||||
|
+++ b/libktorrent/torrent/queuemanager.h
|
||||||
|
@@ -18,8 +18,8 @@
|
||||||
|
* Free Software Foundation, Inc., *
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
|
***************************************************************************/
|
||||||
|
-#ifndef TQUEUEMANAGER_H
|
||||||
|
-#define TQUEUEMANAGER_H
|
||||||
|
+#ifndef QUEUEMANAGER_H
|
||||||
|
+#define QUEUEMANAGER_H
|
||||||
|
|
||||||
|
#include <set>
|
||||||
|
#include <tqobject.h>
|
||||||
|
diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
|
||||||
|
index 3e22ec1..3cedfe9 100644
|
||||||
|
--- a/libktorrent/torrent/torrentcontrol.cpp
|
||||||
|
+++ b/libktorrent/torrent/torrentcontrol.cpp
|
||||||
|
@@ -932,7 +932,7 @@ namespace bt
|
||||||
|
else if (!stats.started)
|
||||||
|
stats.status = kt::NOT_STARTED;
|
||||||
|
else if(!stats.running && !stats.user_controlled)
|
||||||
|
- stats.status = kt::TQUEUED;
|
||||||
|
+ stats.status = kt::QUEUED;
|
||||||
|
else if (!stats.running && stats.completed && (overMaxRatio() || overMaxSeedTime()))
|
||||||
|
stats.status = kt::SEEDING_COMPLETE;
|
||||||
|
else if (!stats.running && stats.completed)
|
||||||
|
@@ -1301,7 +1301,7 @@ namespace bt
|
||||||
|
istats.priority = p;
|
||||||
|
stats.user_controlled = p == 0 ? true : false;
|
||||||
|
if(p)
|
||||||
|
- stats.status = kt::TQUEUED;
|
||||||
|
+ stats.status = kt::QUEUED;
|
||||||
|
else
|
||||||
|
updateStatusMsg();
|
||||||
|
|
||||||
|
@@ -1378,7 +1378,7 @@ namespace bt
|
||||||
|
return i18n("Error: ") + getShortErrorMessage();
|
||||||
|
case kt::ALLOCATING_DISKSPACE:
|
||||||
|
return i18n("Allocating diskspace");
|
||||||
|
- case kt::TQUEUED:
|
||||||
|
+ case kt::QUEUED:
|
||||||
|
return i18n("Queued");
|
||||||
|
case kt::CHECKING_DATA:
|
||||||
|
return i18n("Checking data");
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
commit 03d0c794dc3a15e414c627f47a31718c39a49197
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1332214935 -0500
|
||||||
|
|
||||||
|
Fix configure output message to clarify that missing avahi support
|
||||||
|
is caused by missing avahi-tqt package as well as avahi-client.
|
||||||
|
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index 29436e8..ca0b183 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -403,7 +403,8 @@ if test x$missing_avahi_warning = xyes; then
|
||||||
|
echo ""
|
||||||
|
echo "----------------------------------------------------------"
|
||||||
|
echo "KTorrent WARNING:"
|
||||||
|
- echo "Cannot find avahi-client with version 0.6.10 or later."
|
||||||
|
+ echo "Cannot find avahi-client with version 0.6.10 or later or"
|
||||||
|
+ echo "cannot find avahi-tqt."
|
||||||
|
echo "The zeroconf plugin will not be installed because of this."
|
||||||
|
echo "----------------------------------------------------------"
|
||||||
|
echo ""
|
||||||
|
diff --git a/configure.in.bot b/configure.in.bot
|
||||||
|
index b3f5186..15c2c8c 100644
|
||||||
|
--- a/configure.in.bot
|
||||||
|
+++ b/configure.in.bot
|
||||||
|
@@ -12,7 +12,8 @@ if test x$missing_avahi_warning = xyes; then
|
||||||
|
echo ""
|
||||||
|
echo "----------------------------------------------------------"
|
||||||
|
echo "KTorrent WARNING:"
|
||||||
|
- echo "Cannot find avahi-client with version 0.6.10 or later."
|
||||||
|
+ echo "Cannot find avahi-client with version 0.6.10 or later or"
|
||||||
|
+ echo "cannot find avahi-tqt."
|
||||||
|
echo "The zeroconf plugin will not be installed because of this."
|
||||||
|
echo "----------------------------------------------------------"
|
||||||
|
echo ""
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,122 @@
|
|||||||
|
commit 355c6b69c69b0bc8cf10b7a3c846b5d6ca27abc4
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1332640454 -0500
|
||||||
|
|
||||||
|
Change default configuration to use external geoip database when found and
|
||||||
|
use internal database only when external database is not found.
|
||||||
|
This resolves bug report 443.
|
||||||
|
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index 31a7116..fc4482e 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -191,7 +191,7 @@ AC_ARG_ENABLE(geoip,
|
||||||
|
esac],[geoip=true])
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(system-geoip,
|
||||||
|
- [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (no by default)])],
|
||||||
|
+ [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (auto by default)])],
|
||||||
|
[case "${enableval}" in
|
||||||
|
yes) if test "$have_system_geoip" = yes; then
|
||||||
|
system_geoip=true
|
||||||
|
@@ -199,9 +199,18 @@ AC_ARG_ENABLE(system-geoip,
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system)
|
||||||
|
fi ;;
|
||||||
|
- no) system_geoip=true ;;
|
||||||
|
+ no) system_geoip=false ;;
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;;
|
||||||
|
- esac],[system_geoip=false])
|
||||||
|
+ esac],[system_geoip=auto])
|
||||||
|
+
|
||||||
|
+if test x$system_geoip = xauto; then
|
||||||
|
+ if test "$have_system_geoip" = yes; then
|
||||||
|
+ system_geoip=true
|
||||||
|
+ geoip=false
|
||||||
|
+ else
|
||||||
|
+ system_geoip=false
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL(ENABLE_GEOIP, test x$geoip = xtrue)
|
||||||
|
AM_CONDITIONAL(USE_SYSTEM_GEOIP, test x$system_geoip = xtrue)
|
||||||
|
@@ -212,12 +221,20 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(builtin-country-flags,
|
||||||
|
- [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (yes by default)])],
|
||||||
|
+ [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (auto by default)])],
|
||||||
|
[case "${enableval}" in
|
||||||
|
yes) builtin_country_flags=true ;;
|
||||||
|
no) builtin_country_flags=false ;;
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-builtin-country-flags) ;;
|
||||||
|
- esac],[builtin_country_flags=true])
|
||||||
|
+ esac],[builtin_country_flags=auto])
|
||||||
|
+
|
||||||
|
+if test x$builtin_country_flags = xauto; then
|
||||||
|
+ if test x$geoip = xtrue; then
|
||||||
|
+ builtin_country_flags=true
|
||||||
|
+ else
|
||||||
|
+ builtin_country_flags=false
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL(ENABLE_BUILTIN_COUNTRY_FLAGS, test x$builtin_country_flags = xtrue)
|
||||||
|
|
||||||
|
diff --git a/configure.in.in b/configure.in.in
|
||||||
|
index fae7ea7..438fff9 100644
|
||||||
|
--- a/configure.in.in
|
||||||
|
+++ b/configure.in.in
|
||||||
|
@@ -126,7 +126,7 @@ AC_ARG_ENABLE(geoip,
|
||||||
|
esac],[geoip=true])
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(system-geoip,
|
||||||
|
- [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (no by default)])],
|
||||||
|
+ [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (auto by default)])],
|
||||||
|
[case "${enableval}" in
|
||||||
|
yes) if test "$have_system_geoip" = yes; then
|
||||||
|
system_geoip=true
|
||||||
|
@@ -134,9 +134,18 @@ AC_ARG_ENABLE(system-geoip,
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system)
|
||||||
|
fi ;;
|
||||||
|
- no) system_geoip=true ;;
|
||||||
|
+ no) system_geoip=false ;;
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;;
|
||||||
|
- esac],[system_geoip=false])
|
||||||
|
+ esac],[system_geoip=auto])
|
||||||
|
+
|
||||||
|
+if test x$system_geoip = xauto; then
|
||||||
|
+ if test "$have_system_geoip" = yes; then
|
||||||
|
+ system_geoip=true
|
||||||
|
+ geoip=false
|
||||||
|
+ else
|
||||||
|
+ system_geoip=false
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL(ENABLE_GEOIP, test x$geoip = xtrue)
|
||||||
|
AM_CONDITIONAL(USE_SYSTEM_GEOIP, test x$system_geoip = xtrue)
|
||||||
|
@@ -147,12 +156,20 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(builtin-country-flags,
|
||||||
|
- [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (yes by default)])],
|
||||||
|
+ [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (auto by default)])],
|
||||||
|
[case "${enableval}" in
|
||||||
|
yes) builtin_country_flags=true ;;
|
||||||
|
no) builtin_country_flags=false ;;
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-builtin-country-flags) ;;
|
||||||
|
- esac],[builtin_country_flags=true])
|
||||||
|
+ esac],[builtin_country_flags=auto])
|
||||||
|
+
|
||||||
|
+if test x$builtin_country_flags = xauto; then
|
||||||
|
+ if test x$geoip = xtrue; then
|
||||||
|
+ builtin_country_flags=true
|
||||||
|
+ else
|
||||||
|
+ builtin_country_flags=false
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL(ENABLE_BUILTIN_COUNTRY_FLAGS, test x$builtin_country_flags = xtrue)
|
||||||
|
|
||||||
@ -0,0 +1,156 @@
|
|||||||
|
diff --git a/translations/ca/messages/ktorrent.po b/translations/ca/messages/ktorrent.po
|
||||||
|
index b3a124b..7cd624f 100644
|
||||||
|
--- a/translations/ca/messages/ktorrent.po
|
||||||
|
+++ b/translations/ca/messages/ktorrent.po
|
||||||
|
@@ -10,7 +10,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2008-02-09 15:12+0100\n"
|
||||||
|
"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
|
||||||
|
-"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
|
||||||
|
+"Language-Team: Catalan <tde-i18n-ca@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/de/messages/ktorrent.po b/translations/de/messages/ktorrent.po
|
||||||
|
index 27a65ed..861e491 100644
|
||||||
|
--- a/translations/de/messages/ktorrent.po
|
||||||
|
+++ b/translations/de/messages/ktorrent.po
|
||||||
|
@@ -13,7 +13,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-11-11 13:57+0100\n"
|
||||||
|
"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
|
||||||
|
-"Language-Team: Deutsch <kde-i18n-de@lists.kde.org>\n"
|
||||||
|
+"Language-Team: Deutsch <tde-i18n-de@lists.kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/fa/messages/ktorrent.po b/translations/fa/messages/ktorrent.po
|
||||||
|
index f1c4096..f03da1d 100644
|
||||||
|
--- a/translations/fa/messages/ktorrent.po
|
||||||
|
+++ b/translations/fa/messages/ktorrent.po
|
||||||
|
@@ -8,7 +8,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-01-15 14:30+0330\n"
|
||||||
|
"Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
|
||||||
|
-"Language-Team: Persian <kde-i18n-fa@kde.org>\n"
|
||||||
|
+"Language-Team: Persian <tde-i18n-fa@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/it/messages/ktorrent.po b/translations/it/messages/ktorrent.po
|
||||||
|
index fda5204..d0f38ee 100644
|
||||||
|
--- a/translations/it/messages/ktorrent.po
|
||||||
|
+++ b/translations/it/messages/ktorrent.po
|
||||||
|
@@ -8,7 +8,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-07-09 15:09+0200\n"
|
||||||
|
"Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n"
|
||||||
|
-"Language-Team: Italian <kde-i18n-it@kde.org>\n"
|
||||||
|
+"Language-Team: Italian <tde-i18n-it@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/lt/messages/ktorrent.po b/translations/lt/messages/ktorrent.po
|
||||||
|
index fa52745..499f9fc 100644
|
||||||
|
--- a/translations/lt/messages/ktorrent.po
|
||||||
|
+++ b/translations/lt/messages/ktorrent.po
|
||||||
|
@@ -7,7 +7,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-09-03 13:21+0300\n"
|
||||||
|
"Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
|
||||||
|
-"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
|
||||||
|
+"Language-Team: Lithuanian <tde-i18n-lt@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/ms/messages/ktorrent.po b/translations/ms/messages/ktorrent.po
|
||||||
|
index ac08726..5103563 100644
|
||||||
|
--- a/translations/ms/messages/ktorrent.po
|
||||||
|
+++ b/translations/ms/messages/ktorrent.po
|
||||||
|
@@ -7,7 +7,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-02-13 12:57+0730\n"
|
||||||
|
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
|
||||||
|
-"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
|
||||||
|
+"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/nds/messages/ktorrent.po b/translations/nds/messages/ktorrent.po
|
||||||
|
index 4b3463d..58c347e 100644
|
||||||
|
--- a/translations/nds/messages/ktorrent.po
|
||||||
|
+++ b/translations/nds/messages/ktorrent.po
|
||||||
|
@@ -8,7 +8,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-12-07 22:58+0100\n"
|
||||||
|
"Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
|
||||||
|
-"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
|
||||||
|
+"Language-Team: Low Saxon <tde-i18n-nds@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/nl/messages/ktorrent.po b/translations/nl/messages/ktorrent.po
|
||||||
|
index 91cafe5..4f53930 100644
|
||||||
|
--- a/translations/nl/messages/ktorrent.po
|
||||||
|
+++ b/translations/nl/messages/ktorrent.po
|
||||||
|
@@ -10,7 +10,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2008-03-10 13:43+0100\n"
|
||||||
|
"Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
|
||||||
|
-"Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
|
||||||
|
+"Language-Team: Nederlands <tde-i18n-nl@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/pt/messages/ktorrent.po b/translations/pt/messages/ktorrent.po
|
||||||
|
index 7e123e8..7ab4997 100644
|
||||||
|
--- a/translations/pt/messages/ktorrent.po
|
||||||
|
+++ b/translations/pt/messages/ktorrent.po
|
||||||
|
@@ -4,7 +4,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-12-14 18:05+0000\n"
|
||||||
|
"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
|
||||||
|
-"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
|
||||||
|
+"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/pt_BR/messages/ktorrent.po b/translations/pt_BR/messages/ktorrent.po
|
||||||
|
index 2eafd97..e60c28c 100644
|
||||||
|
--- a/translations/pt_BR/messages/ktorrent.po
|
||||||
|
+++ b/translations/pt_BR/messages/ktorrent.po
|
||||||
|
@@ -10,7 +10,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-08-10 20:52-0300\n"
|
||||||
|
"Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
|
||||||
|
-"Language-Team: Português do Brasil <kde-i18n-pt_br@kde.org>\n"
|
||||||
|
+"Language-Team: Português do Brasil <tde-i18n-pt_br@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/sr/messages/ktorrent.po b/translations/sr/messages/ktorrent.po
|
||||||
|
index c641e05..747f10a 100644
|
||||||
|
--- a/translations/sr/messages/ktorrent.po
|
||||||
|
+++ b/translations/sr/messages/ktorrent.po
|
||||||
|
@@ -9,7 +9,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2008-02-26 13:59+0100\n"
|
||||||
|
"Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
|
||||||
|
-"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
|
||||||
|
+"Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
diff --git a/translations/sr@Latn/messages/ktorrent.po b/translations/sr@Latn/messages/ktorrent.po
|
||||||
|
index 488a470..d39cdc4 100644
|
||||||
|
--- a/translations/sr@Latn/messages/ktorrent.po
|
||||||
|
+++ b/translations/sr@Latn/messages/ktorrent.po
|
||||||
|
@@ -9,7 +9,7 @@ msgstr ""
|
||||||
|
"POT-Creation-Date: 2008-04-18 19:40+0200\n"
|
||||||
|
"PO-Revision-Date: 2007-07-24 15:03+0200\n"
|
||||||
|
"Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
|
||||||
|
-"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
|
||||||
|
+"Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
@ -0,0 +1,182 @@
|
|||||||
|
commit 8712ab46f5d6dc08d2ff6a1e238773adfc5ab85e
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324253623 -0600
|
||||||
|
|
||||||
|
Rename old tq methods that no longer need a unique name
|
||||||
|
|
||||||
|
diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
|
||||||
|
index d5d3a84..ce85788 100644
|
||||||
|
--- a/kuickshow/src/aboutwidget.cpp
|
||||||
|
+++ b/kuickshow/src/aboutwidget.cpp
|
||||||
|
@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
|
||||||
|
|
||||||
|
TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this);
|
||||||
|
gBox->setGeometry( 10, 10, width()-20, height()-20 );
|
||||||
|
- gBox->tqsetAlignment( AlignHCenter );
|
||||||
|
+ gBox->setAlignment( AlignHCenter );
|
||||||
|
gBox->installEventFilter( this );
|
||||||
|
|
||||||
|
gBox->setPalette( TQPalette( TQColor( white ) ) );
|
||||||
|
@@ -57,14 +57,14 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
|
||||||
|
|
||||||
|
TQLabel *authors = new TQLabel("Kuickshow " KUICKSHOWVERSION
|
||||||
|
" was brought to you by", gBox);
|
||||||
|
- authors->tqsetAlignment( AlignCenter );
|
||||||
|
+ authors->setAlignment( AlignCenter );
|
||||||
|
|
||||||
|
m_homepage = new KURLWidget("Carsten Pfeiffer", gBox);
|
||||||
|
m_homepage->setURL( "http://devel-home.kde.org/~pfeiffer/kuickshow/" );
|
||||||
|
- m_homepage->tqsetAlignment( AlignCenter );
|
||||||
|
+ m_homepage->setAlignment( AlignCenter );
|
||||||
|
|
||||||
|
TQLabel *copy = new TQLabel("(C) 1998-2006", gBox);
|
||||||
|
- copy->tqsetAlignment( AlignCenter );
|
||||||
|
+ copy->setAlignment( AlignCenter );
|
||||||
|
|
||||||
|
ImlibWidget *im = new ImlibWidget( 0L, gBox, "KuickShow Logo" );
|
||||||
|
if ( im->loadImage( file ) )
|
||||||
|
diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
|
||||||
|
index c0bef52..e444605 100644
|
||||||
|
--- a/kuickshow/src/defaultswidget.cpp
|
||||||
|
+++ b/kuickshow/src/defaultswidget.cpp
|
||||||
|
@@ -92,7 +92,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
|
||||||
|
// --
|
||||||
|
|
||||||
|
gbPreview = new TQGroupBox( i18n("Preview"), this );
|
||||||
|
- gbPreview->tqsetAlignment( AlignCenter );
|
||||||
|
+ gbPreview->setAlignment( AlignCenter );
|
||||||
|
|
||||||
|
lbImOrig = new TQLabel( i18n("Original"), gbPreview );
|
||||||
|
imOrig = new ImlibWidget( 0L, gbPreview, "original image" );
|
||||||
|
diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp
|
||||||
|
index d68bc89..2fb4f6d 100644
|
||||||
|
--- a/kuickshow/src/filecache.cpp
|
||||||
|
+++ b/kuickshow/src/filecache.cpp
|
||||||
|
@@ -68,7 +68,7 @@ TQString FileCache::tempDir()
|
||||||
|
|
||||||
|
KTempDir * FileCache::createTempDir()
|
||||||
|
{
|
||||||
|
- TQString tmpName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
|
||||||
|
+ TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
|
||||||
|
tmpName.append( TQString::number( getpid() ) );
|
||||||
|
TQString dirName = locateLocal( "tmp", tmpName );
|
||||||
|
KTempDir *dir = new KTempDir( dirName );
|
||||||
|
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
|
||||||
|
index 403269b..5f8df74 100644
|
||||||
|
--- a/kuickshow/src/filewidget.cpp
|
||||||
|
+++ b/kuickshow/src/filewidget.cpp
|
||||||
|
@@ -448,7 +448,7 @@ void FileWidget::slotFinishedLoading()
|
||||||
|
emit finished();
|
||||||
|
}
|
||||||
|
|
||||||
|
-TQSize FileWidget::tqsizeHint() const
|
||||||
|
+TQSize FileWidget::sizeHint() const
|
||||||
|
{
|
||||||
|
return TQSize( 300, 300 );
|
||||||
|
}
|
||||||
|
diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h
|
||||||
|
index 64f1160..8299664 100644
|
||||||
|
--- a/kuickshow/src/filewidget.h
|
||||||
|
+++ b/kuickshow/src/filewidget.h
|
||||||
|
@@ -71,7 +71,7 @@ protected:
|
||||||
|
virtual bool eventFilter( TQObject *o, TQEvent * );
|
||||||
|
virtual void resizeEvent( TQResizeEvent * );
|
||||||
|
virtual void activatedMenu( const KFileItem *, const TQPoint& );
|
||||||
|
- virtual TQSize tqsizeHint() const;
|
||||||
|
+ virtual TQSize sizeHint() const;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void slotReturnPressed( const TQString& text );
|
||||||
|
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
|
||||||
|
index f56c7b3..8b195a7 100644
|
||||||
|
--- a/kuickshow/src/imagewindow.cpp
|
||||||
|
+++ b/kuickshow/src/imagewindow.cpp
|
||||||
|
@@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
|
||||||
|
{
|
||||||
|
if ( myIsFullscreen || totalScreen )
|
||||||
|
{
|
||||||
|
- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).width();
|
||||||
|
+ return KGlobalSettings::desktopGeometry(topLevelWidget()).width();
|
||||||
|
} else
|
||||||
|
return Kuick::workArea().width();
|
||||||
|
}
|
||||||
|
@@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
|
||||||
|
int ImageWindow::desktopHeight( bool totalScreen ) const
|
||||||
|
{
|
||||||
|
if ( myIsFullscreen || totalScreen ) {
|
||||||
|
- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).height();
|
||||||
|
+ return KGlobalSettings::desktopGeometry(topLevelWidget()).height();
|
||||||
|
} else {
|
||||||
|
return Kuick::workArea().height();
|
||||||
|
}
|
||||||
|
@@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const
|
||||||
|
TQSize ImageWindow::maxImageSize() const
|
||||||
|
{
|
||||||
|
if ( myIsFullscreen ) {
|
||||||
|
- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
|
||||||
|
+ return KGlobalSettings::desktopGeometry(topLevelWidget()).size();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return Kuick::workArea().size() - Kuick::frameSize( winId() );
|
||||||
|
@@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
|
||||||
|
if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
- TQSize desktopSize = KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
|
||||||
|
+ TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size();
|
||||||
|
|
||||||
|
int desktopArea = desktopSize.width() * desktopSize.height();
|
||||||
|
int imageArea = newWidth * newHeight;
|
||||||
|
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
|
||||||
|
index 4e0aa57..b20606a 100644
|
||||||
|
--- a/kuickshow/src/kuickfile.cpp
|
||||||
|
+++ b/kuickshow/src/kuickfile.cpp
|
||||||
|
@@ -94,7 +94,7 @@ bool KuickFile::download()
|
||||||
|
return m_job != 0L;
|
||||||
|
}
|
||||||
|
|
||||||
|
-KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent )
|
||||||
|
+KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
|
||||||
|
{
|
||||||
|
if ( isAvailable() )
|
||||||
|
return OK;
|
||||||
|
@@ -152,7 +152,7 @@ void KuickFile::slotResult( KIO::Job *job )
|
||||||
|
|
||||||
|
TQString canceledFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
|
||||||
|
TQFile::remove( canceledFile );
|
||||||
|
- m_progress->tqtopLevelWidget()->hide();
|
||||||
|
+ m_progress->topLevelWidget()->hide();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
m_localFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
|
||||||
|
@@ -162,7 +162,7 @@ void KuickFile::slotResult( KIO::Job *job )
|
||||||
|
m_progress->setProgress( 100 );
|
||||||
|
#define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2)
|
||||||
|
if ( KDE::version() <= BUGGY_VERSION ) {
|
||||||
|
- m_progress->tqtopLevelWidget()->hide(); // ### workaround broken KProgressDialog
|
||||||
|
+ m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h
|
||||||
|
index af92355..49ee389 100644
|
||||||
|
--- a/kuickshow/src/kuickfile.h
|
||||||
|
+++ b/kuickshow/src/kuickfile.h
|
||||||
|
@@ -27,7 +27,7 @@ class KuickFile : public TQObject
|
||||||
|
TQ_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
- enum DownloadtqStatus
|
||||||
|
+ enum DownloadStatus
|
||||||
|
{
|
||||||
|
OK = 1,
|
||||||
|
CANCELED,
|
||||||
|
@@ -72,7 +72,7 @@ public:
|
||||||
|
* immediately.
|
||||||
|
* @return true when the download has finished or false when the user aborted the dialog
|
||||||
|
*/
|
||||||
|
- KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent );
|
||||||
|
+ KuickFile::DownloadStatus waitForDownload( TQWidget *parent );
|
||||||
|
|
||||||
|
// bool needsDownload();
|
||||||
|
|
||||||
@ -0,0 +1,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;
|
||||||
@ -0,0 +1,166 @@
|
|||||||
|
commit bdeb8b3ad3118b2be6fc62687092753cc12b2976
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324497974 -0600
|
||||||
|
|
||||||
|
Rename obsolete tq methods to standard names
|
||||||
|
|
||||||
|
diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
|
||||||
|
index e444605..7e94b1b 100644
|
||||||
|
--- a/kuickshow/src/defaultswidget.cpp
|
||||||
|
+++ b/kuickshow/src/defaultswidget.cpp
|
||||||
|
@@ -105,13 +105,13 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
|
||||||
|
////////////////
|
||||||
|
|
||||||
|
|
||||||
|
- // tqlayout management
|
||||||
|
+ // layout management
|
||||||
|
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 0,
|
||||||
|
- KDialog::spacingHint(), "main tqlayout" );
|
||||||
|
+ KDialog::spacingHint(), "main layout" );
|
||||||
|
|
||||||
|
- TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->tqlayout(),
|
||||||
|
+ TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->layout(),
|
||||||
|
KDialog::spacingHint());
|
||||||
|
- TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->tqlayout(),
|
||||||
|
+ TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->layout(),
|
||||||
|
KDialog::spacingHint());
|
||||||
|
TQGridLayout *gbPreviewLayout = new TQGridLayout(gbPreview, 2, 3, 0,
|
||||||
|
KDialog::spacingHint());
|
||||||
|
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
|
||||||
|
index 5f8df74..2662df4 100644
|
||||||
|
--- a/kuickshow/src/filewidget.cpp
|
||||||
|
+++ b/kuickshow/src/filewidget.cpp
|
||||||
|
@@ -196,7 +196,7 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e )
|
||||||
|
}
|
||||||
|
|
||||||
|
const TQString& text = k->text();
|
||||||
|
- if ( !text.isEmpty() && text.tqunicode()->isPrint() ) {
|
||||||
|
+ if ( !text.isEmpty() && text.unicode()->isPrint() ) {
|
||||||
|
k->accept();
|
||||||
|
|
||||||
|
if ( !m_fileFinder ) {
|
||||||
|
diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
|
||||||
|
index bde353d..1308885 100644
|
||||||
|
--- a/kuickshow/src/generalwidget.cpp
|
||||||
|
+++ b/kuickshow/src/generalwidget.cpp
|
||||||
|
@@ -36,8 +36,8 @@
|
||||||
|
GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
|
||||||
|
: TQWidget( parent, name )
|
||||||
|
{
|
||||||
|
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
|
||||||
|
- tqlayout->setSpacing( KDialog::spacingHint() );
|
||||||
|
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
|
||||||
|
+ layout->setSpacing( KDialog::spacingHint() );
|
||||||
|
|
||||||
|
TQPixmap pixmap = UserIcon( "logo" );
|
||||||
|
KURLLabel *logo = new KURLLabel( this );
|
||||||
|
@@ -50,7 +50,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
|
||||||
|
connect( logo, TQT_SIGNAL( leftClickedURL( const TQString & ) ),
|
||||||
|
TQT_SLOT( slotURLClicked( const TQString & ) ) );
|
||||||
|
|
||||||
|
- tqlayout->addWidget( logo, 0, AlignRight );
|
||||||
|
+ layout->addWidget( logo, 0, AlignRight );
|
||||||
|
|
||||||
|
cbFullscreen = new TQCheckBox( i18n("Fullscreen mode"), this, "boscreen" );
|
||||||
|
|
||||||
|
@@ -70,17 +70,17 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
|
||||||
|
gridLayout->addWidget( l1, 1, 0 );
|
||||||
|
gridLayout->addWidget( editFilter, 1, 1 );
|
||||||
|
|
||||||
|
- tqlayout->addWidget( cbFullscreen );
|
||||||
|
- tqlayout->addWidget( cbPreload );
|
||||||
|
- tqlayout->addWidget( cbLastdir );
|
||||||
|
- tqlayout->addLayout( gridLayout );
|
||||||
|
+ layout->addWidget( cbFullscreen );
|
||||||
|
+ layout->addWidget( cbPreload );
|
||||||
|
+ layout->addWidget( cbLastdir );
|
||||||
|
+ layout->addLayout( gridLayout );
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
TQVGroupBox *gbox2 = new TQVGroupBox( i18n("Quality/Speed"),
|
||||||
|
this, "qualitybox" );
|
||||||
|
- tqlayout->addWidget( gbox2 );
|
||||||
|
- tqlayout->addStretch();
|
||||||
|
+ layout->addWidget( gbox2 );
|
||||||
|
+ layout->addStretch();
|
||||||
|
|
||||||
|
cbSmoothScale = new TQCheckBox( i18n("Smooth scaling"), gbox2, "smoothscale" );
|
||||||
|
cbFastRender = new TQCheckBox( i18n("Fast rendering"), gbox2, "fastrender" );
|
||||||
|
diff --git a/kuickshow/src/mainwidget.cpp b/kuickshow/src/mainwidget.cpp
|
||||||
|
index d94d332..47b3d83 100644
|
||||||
|
--- a/kuickshow/src/mainwidget.cpp
|
||||||
|
+++ b/kuickshow/src/mainwidget.cpp
|
||||||
|
@@ -35,7 +35,7 @@ MainWidget::~MainWidget()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-// for now, no tqlayout managers
|
||||||
|
+// for now, no layout managers
|
||||||
|
void MainWidget::resizeEvent( TQResizeEvent * )
|
||||||
|
{
|
||||||
|
box->resize( width(), height() );
|
||||||
|
diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
|
||||||
|
index 7005bbe..0d003a0 100644
|
||||||
|
--- a/kuickshow/src/printing.cpp
|
||||||
|
+++ b/kuickshow/src/printing.cpp
|
||||||
|
@@ -199,21 +199,21 @@ KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name )
|
||||||
|
{
|
||||||
|
setTitle( i18n("Image Settings") );
|
||||||
|
|
||||||
|
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
|
||||||
|
- tqlayout->setMargin( KDialog::marginHint() );
|
||||||
|
- tqlayout->setSpacing( KDialog::spacingHint() );
|
||||||
|
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
|
||||||
|
+ layout->setMargin( KDialog::marginHint() );
|
||||||
|
+ layout->setSpacing( KDialog::spacingHint() );
|
||||||
|
|
||||||
|
m_addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this);
|
||||||
|
m_addFileName->setChecked( true );
|
||||||
|
- tqlayout->addWidget( m_addFileName );
|
||||||
|
+ layout->addWidget( m_addFileName );
|
||||||
|
|
||||||
|
m_blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this);
|
||||||
|
m_blackwhite->setChecked( false );
|
||||||
|
- tqlayout->addWidget (m_blackwhite );
|
||||||
|
+ layout->addWidget (m_blackwhite );
|
||||||
|
|
||||||
|
TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this );
|
||||||
|
group->setRadioButtonExclusive( true );
|
||||||
|
- tqlayout->addWidget( group );
|
||||||
|
+ layout->addWidget( group );
|
||||||
|
// m_shrinkToFit = new TQRadioButton( i18n("Shrink image to &fit, if necessary"), group );
|
||||||
|
m_shrinkToFit = new TQCheckBox( i18n("Shrink image to &fit, if necessary"), group );
|
||||||
|
m_shrinkToFit->setChecked( true );
|
||||||
|
diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp
|
||||||
|
index ed2bedc..9727c20 100644
|
||||||
|
--- a/kuickshow/src/slideshowwidget.cpp
|
||||||
|
+++ b/kuickshow/src/slideshowwidget.cpp
|
||||||
|
@@ -31,8 +31,8 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
|
||||||
|
{
|
||||||
|
// setTitle( i18n("Slideshow") );
|
||||||
|
|
||||||
|
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
|
||||||
|
- tqlayout->setSpacing( KDialog::spacingHint() );
|
||||||
|
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
|
||||||
|
+ layout->setSpacing( KDialog::spacingHint() );
|
||||||
|
|
||||||
|
m_fullScreen = new TQCheckBox( i18n("Switch to &full-screen"), this );
|
||||||
|
m_startWithCurrent = new TQCheckBox( i18n("S&tart with current image"), this);
|
||||||
|
@@ -48,11 +48,11 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
|
||||||
|
m_cycles->setSpecialValueText( i18n("infinite") );
|
||||||
|
m_cycles->setRange( 0, 500 );
|
||||||
|
|
||||||
|
- tqlayout->addWidget( m_fullScreen );
|
||||||
|
- tqlayout->addWidget( m_startWithCurrent );
|
||||||
|
- tqlayout->addWidget( m_delayTime );
|
||||||
|
- tqlayout->addWidget( m_cycles );
|
||||||
|
- tqlayout->addStretch( 1 );
|
||||||
|
+ layout->addWidget( m_fullScreen );
|
||||||
|
+ layout->addWidget( m_startWithCurrent );
|
||||||
|
+ layout->addWidget( m_delayTime );
|
||||||
|
+ layout->addWidget( m_cycles );
|
||||||
|
+ layout->addStretch( 1 );
|
||||||
|
|
||||||
|
loadSettings( *kdata );
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
commit d97e403f9f70425a59f0d3bdbcfd4dd6360fa6e0
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1331655316 -0500
|
||||||
|
|
||||||
|
Remove inadvertent renaming. This resolves bug report 863.
|
||||||
|
|
||||||
|
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
|
||||||
|
index 39af7f5..51367f2 100644
|
||||||
|
--- a/kuickshow/src/imagewindow.cpp
|
||||||
|
+++ b/kuickshow/src/imagewindow.cpp
|
||||||
|
@@ -182,10 +182,10 @@ void ImageWindow::setupActions()
|
||||||
|
TQT_TQOBJECT(this), TQT_SLOT( rotate270() ),
|
||||||
|
m_actions, "rotate270" );
|
||||||
|
|
||||||
|
- new KAction( i18n("FlipQt::Horizontally"), Key_Asterisk,
|
||||||
|
+ new KAction( i18n("Flip Horizontally"), Key_Asterisk,
|
||||||
|
TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ),
|
||||||
|
m_actions, "flip_horicontally" );
|
||||||
|
- new KAction( i18n("FlipQt::Vertically"), Key_Slash,
|
||||||
|
+ new KAction( i18n("Flip Vertically"), Key_Slash,
|
||||||
|
TQT_TQOBJECT(this), TQT_SLOT( flipVert() ),
|
||||||
|
m_actions, "flip_vertically" );
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,19 @@
|
|||||||
|
commit 1c00d6ffa847ef0cc0cc6deaf1da412c8264f7ac
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1324748257 -0600
|
||||||
|
|
||||||
|
Rename a few stragglers
|
||||||
|
|
||||||
|
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
|
||||||
|
index b7bd8bc..c5ed5ea 100644
|
||||||
|
--- a/src/modules/list/listwindow.cpp
|
||||||
|
+++ b/src/modules/list/listwindow.cpp
|
||||||
|
@@ -140,7 +140,7 @@ void KviChannelListViewItem::paintCell(TQPainter * p,const TQColorGroup &cg,int
|
||||||
|
if ( isEnabled() || !lv )
|
||||||
|
p->setPen( cg.highlightedText() );
|
||||||
|
else if ( !isEnabled() && lv)
|
||||||
|
- p->setPen( lv->tqpalette().disabled().highlightedText() );
|
||||||
|
+ p->setPen( lv->palette().disabled().highlightedText() );
|
||||||
|
} else {
|
||||||
|
if ( isEnabled() || !lv )
|
||||||
|
p->setPen( cg.text() );
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
commit ff96f491739a5bee6e9d9c2b0c6b9b38e790f9af
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1325294026 -0600
|
||||||
|
|
||||||
|
Fix FTBFS
|
||||||
|
|
||||||
|
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
|
||||||
|
index 9947aff..c426230 100755
|
||||||
|
--- a/src/modules/options/mkcreateinstanceproc.sh
|
||||||
|
+++ b/src/modules/options/mkcreateinstanceproc.sh
|
||||||
|
@@ -355,7 +355,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
|
||||||
|
if(e->pWidget->parent() != par)
|
||||||
|
{
|
||||||
|
QWidget * oldPar = (QWidget *)e->pWidget->parent();
|
||||||
|
- e->pWidget->reparent(par,QPoint(0,0));
|
||||||
|
+ e->pWidget->reparent(par,TQPoint(0,0));
|
||||||
|
delete oldPar;
|
||||||
|
}
|
||||||
|
if(e->bIsContainer)
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
commit 2285efe5dc2c83eda4578527b65f759f6382d094
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1325323706 -0600
|
||||||
|
|
||||||
|
Fix FTBFS
|
||||||
|
|
||||||
|
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
|
||||||
|
index c426230..5e504fa 100755
|
||||||
|
--- a/src/modules/options/mkcreateinstanceproc.sh
|
||||||
|
+++ b/src/modules/options/mkcreateinstanceproc.sh
|
||||||
|
@@ -56,7 +56,7 @@ typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
|
||||||
|
|
||||||
|
typedef struct _KviOptionsWidgetInstanceEntry
|
||||||
|
{
|
||||||
|
- KviOptionsWidget * (*createProc)(QWidget *);
|
||||||
|
+ KviOptionsWidget * (*createProc)(TQWidget *);
|
||||||
|
KviOptionsWidget * pWidget; // singleton
|
||||||
|
int iIcon;
|
||||||
|
QString szName;
|
||||||
|
@@ -73,9 +73,10 @@ typedef struct _KviOptionsWidgetInstanceEntry
|
||||||
|
} KviOptionsWidgetInstanceEntry;
|
||||||
|
|
||||||
|
|
||||||
|
-class KviOptionsInstanceManager : public QObject
|
||||||
|
+class KviOptionsInstanceManager : public TQObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
+ TQ_OBJECT
|
||||||
|
public:
|
||||||
|
KviOptionsInstanceManager();
|
||||||
|
virtual ~KviOptionsInstanceManager();
|
||||||
|
@@ -83,14 +84,14 @@ protected:
|
||||||
|
KviPointerList<KviOptionsWidgetInstanceEntry> * m_pInstanceTree;
|
||||||
|
public:
|
||||||
|
KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
|
||||||
|
- KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
|
||||||
|
+ KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par);
|
||||||
|
KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
|
||||||
|
void cleanup(KviModule * m);
|
||||||
|
protected:
|
||||||
|
KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
|
||||||
|
- KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
|
||||||
|
+ KviOptionsWidgetInstanceEntry * findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
|
||||||
|
void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
|
||||||
|
-protected Q_SLOTS:
|
||||||
|
+protected slots:
|
||||||
|
void widgetDestroyed();
|
||||||
|
};
|
||||||
|
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
commit 51bbe9e5da9c9ebf2109ab59f98d182c3ee23d86
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1327529886 -0600
|
||||||
|
|
||||||
|
Fix linear alphabet string errors
|
||||||
|
|
||||||
|
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
|
||||||
|
index 54a1c4a..a02d6c7 100644
|
||||||
|
--- a/src/kvilib/core/kvi_string.cpp
|
||||||
|
+++ b/src/kvilib/core/kvi_string.cpp
|
||||||
|
@@ -1342,7 +1342,7 @@ int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static const char * base64_chars = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
+static const char * base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
|
||||||
|
|
||||||
|
void KviStr::bufferToBase64(const char * buffer,int len)
|
||||||
|
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
|
||||||
|
index 2bd8e6e..e9c7051 100644
|
||||||
|
--- a/src/modules/rijndael/libkvirijndael.cpp
|
||||||
|
+++ b/src/modules/rijndael/libkvirijndael.cpp
|
||||||
|
@@ -471,7 +471,7 @@
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
- static unsigned char fake_base64[]="./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
|
||||||
|
+ static unsigned char fake_base64[]="./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||||
|
|
||||||
|
unsigned int fake_base64dec(unsigned char c)
|
||||||
|
{
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,66 @@
|
|||||||
|
diff -u a/acinclude.m4 b/acinclude.m4
|
||||||
|
--- a/acinclude.m4
|
||||||
|
+++ b/acinclude.m4
|
||||||
|
@@ -2149,7 +2149,7 @@
|
||||||
|
if test -n "$KDEDIR"; then
|
||||||
|
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
|
||||||
|
fi
|
||||||
|
- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
|
||||||
|
+ ss_kde_general_test_path_suffix="trinity kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
|
||||||
|
|
||||||
|
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
|
||||||
|
|
||||||
|
@@ -2524,7 +2524,7 @@
|
||||||
|
|
||||||
|
if test -n "$SS_OTHER_LIBDIRS"; then
|
||||||
|
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
|
||||||
|
- $SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
|
||||||
|
+ SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
|
||||||
|
SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
diff -u a/admin/acinclude.m4.in b/admin/acinclude.m4.in
|
||||||
|
--- a/admin/acinclude.m4.in
|
||||||
|
+++ b/admin/acinclude.m4.in
|
||||||
|
@@ -2149,7 +2149,7 @@
|
||||||
|
if test -n "$KDEDIR"; then
|
||||||
|
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
|
||||||
|
fi
|
||||||
|
- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
|
||||||
|
+ ss_kde_general_test_path_suffix="trinity kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
|
||||||
|
|
||||||
|
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
|
||||||
|
|
||||||
|
@@ -2524,7 +2524,7 @@
|
||||||
|
|
||||||
|
if test -n "$SS_OTHER_LIBDIRS"; then
|
||||||
|
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
|
||||||
|
- $SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
|
||||||
|
+ SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
|
||||||
|
SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
diff -u a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am
|
||||||
|
--- a/src/modules/mediaplayer/Makefile.am
|
||||||
|
+++ b/src/modules/mediaplayer/Makefile.am
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
#%.moc: %.h
|
||||||
|
# $(SS_QT_MOC) $< -o $@
|
||||||
|
|
||||||
|
-libkvimediaplayer_la_LDFLAGS = -avoid-version -module
|
||||||
|
+libkvimediaplayer_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
|
||||||
|
|
||||||
|
libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \
|
||||||
|
mp_amarokinterface.cpp \
|
||||||
|
diff -u a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am
|
||||||
|
--- a/src/modules/torrent/Makefile.am
|
||||||
|
+++ b/src/modules/torrent/Makefile.am
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
#%.moc: %.h
|
||||||
|
# $(SS_QT_MOC) $< -o $@
|
||||||
|
|
||||||
|
-libkvitorrent_la_LDFLAGS = -avoid-version -module
|
||||||
|
+libkvitorrent_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
|
||||||
|
|
||||||
|
libkvitorrent_la_SOURCES = libkvitorrent.cpp \
|
||||||
|
tc_interface.cpp \
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
--- piklab/src/common/common/range.h.ORI 2012-05-06 11:39:36.080834047 +0200
|
||||||
|
+++ piklab/src/common/common/range.h 2012-05-06 11:39:43.239684938 +0200
|
||||||
|
@@ -43,7 +43,7 @@
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
GenericRangeVector() {}
|
||||||
|
- GenericRangeVector(const RangeType &range) { append(range); }
|
||||||
|
+ GenericRangeVector(const RangeType &range) { this->append(range); }
|
||||||
|
bool isEmpty() const {
|
||||||
|
uint nb = this->count();
|
||||||
|
for (uint i=0; i<nb; i++) if ( !this->at(i).isEmpty() ) return false;
|
||||||
|
--- piklab/src/xml_to_data/device_xml_to_data.h.ORI 2012-05-06 11:45:56.824911257 +0200
|
||||||
|
+++ piklab/src/xml_to_data/device_xml_to_data.h 2012-05-06 11:46:04.135759246 +0200
|
||||||
|
@@ -76,7 +76,7 @@
|
||||||
|
TQValueList<DataType *> list;
|
||||||
|
for (it=_map.begin(); it!=_map.end(); ++it)
|
||||||
|
list.append(const_cast<DataType *>(static_cast<const DataType *>(it.data())));
|
||||||
|
- uint size = toCppString(list, ts);
|
||||||
|
+ uint size = this->toCppString(list, ts);
|
||||||
|
ts << ";" << endl;
|
||||||
|
ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl;
|
||||||
|
file.close();
|
||||||
|
--- piklab/src/devices/base/device_group.h.ORI 2012-05-06 11:47:08.950411718 +0200
|
||||||
|
+++ piklab/src/devices/base/device_group.h 2012-05-06 11:47:17.607231757 +0200
|
||||||
|
@@ -52,7 +52,7 @@
|
||||||
|
{
|
||||||
|
protected:
|
||||||
|
virtual void initSupported() {
|
||||||
|
- TQValueList<DataType *> list = fromCppString(dataStream(), dataSize());
|
||||||
|
+ TQValueList<DataType *> list = this->fromCppString(dataStream(), dataSize());
|
||||||
|
for (uint i=0; i<uint(list.count()); i++) addDevice(list[i]->name(), list[i], ::Group::Support::Tested);
|
||||||
|
}
|
||||||
|
virtual uint dataSize() const = 0;
|
||||||
@ -0,0 +1,334 @@
|
|||||||
|
commit 15276f365c15527fbb10d42e3f5896f540de7413
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1334351761 -0500
|
||||||
|
|
||||||
|
Updated to build with gcc 4.7.
|
||||||
|
|
||||||
|
diff --git a/src/base/Sets.h b/src/base/Sets.h
|
||||||
|
index 4fe14d1..2a59ed0 100644
|
||||||
|
--- a/src/base/Sets.h
|
||||||
|
+++ b/src/base/Sets.h
|
||||||
|
@@ -287,7 +287,7 @@ AbstractSet<Element, Container>::initialise()
|
||||||
|
m_final = m_baseIterator;
|
||||||
|
sample(m_baseIterator, true);
|
||||||
|
|
||||||
|
- if (getAsEvent(m_baseIterator)->isa(Note::EventType)) {
|
||||||
|
+ if (AbstractSet::getAsEvent(m_baseIterator)->isa(Note::EventType)) {
|
||||||
|
m_initialNote = m_baseIterator;
|
||||||
|
m_finalNote = m_baseIterator;
|
||||||
|
}
|
||||||
|
@@ -300,7 +300,7 @@ AbstractSet<Element, Container>::initialise()
|
||||||
|
for (i = j = m_baseIterator; i != getContainer().begin() && test(--j); i = j){
|
||||||
|
if (sample(j, false)) {
|
||||||
|
m_initial = j;
|
||||||
|
- if (getAsEvent(j)->isa(Note::EventType)) {
|
||||||
|
+ if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
|
||||||
|
m_initialNote = j;
|
||||||
|
if (m_finalNote == getContainer().end()) {
|
||||||
|
m_finalNote = j;
|
||||||
|
@@ -317,7 +317,7 @@ AbstractSet<Element, Container>::initialise()
|
||||||
|
for (i = j = m_baseIterator; ++j != getContainer().end() && test(j); i = j) {
|
||||||
|
if (sample(j, true)) {
|
||||||
|
m_final = j;
|
||||||
|
- if (getAsEvent(j)->isa(Note::EventType)) {
|
||||||
|
+ if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
|
||||||
|
m_finalNote = j;
|
||||||
|
if (m_initialNote == getContainer().end()) {
|
||||||
|
m_initialNote = j;
|
||||||
|
@@ -332,17 +332,17 @@ bool
|
||||||
|
AbstractSet<Element, Container>::sample(const Iterator &i, bool)
|
||||||
|
{
|
||||||
|
const Quantizer &q(getQuantizer());
|
||||||
|
- Event *e = getAsEvent(i);
|
||||||
|
+ Event *e = AbstractSet::getAsEvent(i);
|
||||||
|
timeT d(q.getQuantizedDuration(e));
|
||||||
|
|
||||||
|
if (e->isa(Note::EventType) || d > 0) {
|
||||||
|
if (m_longest == getContainer().end() ||
|
||||||
|
- d > q.getQuantizedDuration(getAsEvent(m_longest))) {
|
||||||
|
+ d > q.getQuantizedDuration(AbstractSet::getAsEvent(m_longest))) {
|
||||||
|
// std::cerr << "New longest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
|
||||||
|
m_longest = i;
|
||||||
|
}
|
||||||
|
if (m_shortest == getContainer().end() ||
|
||||||
|
- d < q.getQuantizedDuration(getAsEvent(m_shortest))) {
|
||||||
|
+ d < q.getQuantizedDuration(AbstractSet::getAsEvent(m_shortest))) {
|
||||||
|
// std::cerr << "New shortest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
|
||||||
|
m_shortest = i;
|
||||||
|
}
|
||||||
|
@@ -352,12 +352,12 @@ AbstractSet<Element, Container>::sample(const Iterator &i, bool)
|
||||||
|
long p = get__Int(e, BaseProperties::PITCH);
|
||||||
|
|
||||||
|
if (m_highest == getContainer().end() ||
|
||||||
|
- p > get__Int(getAsEvent(m_highest), BaseProperties::PITCH)) {
|
||||||
|
+ p > get__Int(AbstractSet::getAsEvent(m_highest), BaseProperties::PITCH)) {
|
||||||
|
// std::cerr << "New highest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
|
||||||
|
m_highest = i;
|
||||||
|
}
|
||||||
|
if (m_lowest == getContainer().end() ||
|
||||||
|
- p < get__Int(getAsEvent(m_lowest), BaseProperties::PITCH)) {
|
||||||
|
+ p < get__Int(AbstractSet::getAsEvent(m_lowest), BaseProperties::PITCH)) {
|
||||||
|
// std::cerr << "New lowest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
|
||||||
|
m_lowest = i;
|
||||||
|
}
|
||||||
|
@@ -376,8 +376,8 @@ GenericChord<Element, Container, singleStaff>::GenericChord(Container &c,
|
||||||
|
PropertyName stemUpProperty) :
|
||||||
|
AbstractSet<Element, Container>(c, i, q),
|
||||||
|
m_stemUpProperty(stemUpProperty),
|
||||||
|
- m_time(q->getQuantizedAbsoluteTime(getAsEvent(i))),
|
||||||
|
- m_subordering(getAsEvent(i)->getSubOrdering()),
|
||||||
|
+ m_time(q->getQuantizedAbsoluteTime(GenericChord::getAsEvent(i))),
|
||||||
|
+ m_subordering(GenericChord::getAsEvent(i)->getSubOrdering()),
|
||||||
|
m_firstReject(c.end())
|
||||||
|
{
|
||||||
|
AbstractSet<Element, Container>::initialise();
|
||||||
|
@@ -416,7 +416,7 @@ template <class Element, class Container, bool singleStaff>
|
||||||
|
bool
|
||||||
|
GenericChord<Element, Container, singleStaff>::test(const Iterator &i)
|
||||||
|
{
|
||||||
|
- Event *e = getAsEvent(i);
|
||||||
|
+ Event *e = GenericChord::getAsEvent(i);
|
||||||
|
if (AbstractSet<Element, Container>::
|
||||||
|
getQuantizer().getQuantizedAbsoluteTime(e) != m_time) {
|
||||||
|
return false;
|
||||||
|
@@ -452,7 +452,7 @@ bool
|
||||||
|
GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
|
||||||
|
bool goingForwards)
|
||||||
|
{
|
||||||
|
- Event *e1 = getAsEvent(i);
|
||||||
|
+ Event *e1 = GenericChord::getAsEvent(i);
|
||||||
|
if (!e1->isa(Note::EventType)) {
|
||||||
|
if (goingForwards && m_firstReject == AbstractSet<Element, Container>::getContainer().end()) m_firstReject = i;
|
||||||
|
return false;
|
||||||
|
@@ -472,7 +472,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
|
||||||
|
|
||||||
|
if (AbstractSet<Element, Container>::m_baseIterator != AbstractSet<Element, Container>::getContainer().end()) {
|
||||||
|
|
||||||
|
- Event *e0 = getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
|
||||||
|
+ Event *e0 = GenericChord::getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
|
||||||
|
|
||||||
|
if (!(m_stemUpProperty == PropertyName::EmptyPropertyName)) {
|
||||||
|
|
||||||
|
@@ -518,7 +518,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
|
||||||
|
}
|
||||||
|
|
||||||
|
AbstractSet<Element, Container>::sample(i, goingForwards);
|
||||||
|
- push_back(i);
|
||||||
|
+ this->push_back(i);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -560,7 +560,7 @@ GenericChord<Element, Container, singleStaff>::getMarkCountForChord() const
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
|
||||||
|
|
||||||
|
- Event *e = getAsEvent((*this)[i]);
|
||||||
|
+ Event *e = GenericChord::getAsEvent((*this)[i]);
|
||||||
|
std::vector<Mark> marks(Marks::getMarks(*e));
|
||||||
|
|
||||||
|
for (std::vector<Mark>::iterator j = marks.begin(); j != marks.end(); ++j) {
|
||||||
|
@@ -580,7 +580,7 @@ GenericChord<Element, Container, singleStaff>::getMarksForChord() const
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
|
||||||
|
|
||||||
|
- Event *e = getAsEvent((*this)[i]);
|
||||||
|
+ Event *e = GenericChord::getAsEvent((*this)[i]);
|
||||||
|
std::vector<Mark> marks(Marks::getMarks(*e));
|
||||||
|
|
||||||
|
|
||||||
|
@@ -607,9 +607,9 @@ GenericChord<Element, Container, singleStaff>::getPitches() const
|
||||||
|
|
||||||
|
for (typename std::vector<typename Container::iterator>::const_iterator
|
||||||
|
i = std::vector<typename Container::iterator>::begin(); i != std::vector<typename Container::iterator>::end(); ++i) {
|
||||||
|
- if (getAsEvent(*i)->has(BaseProperties::PITCH)) {
|
||||||
|
+ if (GenericChord::getAsEvent(*i)->has(BaseProperties::PITCH)) {
|
||||||
|
int pitch = get__Int
|
||||||
|
- (getAsEvent(*i), BaseProperties::PITCH);
|
||||||
|
+ (GenericChord::getAsEvent(*i), BaseProperties::PITCH);
|
||||||
|
if (pitches.size() > 0 && pitches[pitches.size()-1] == pitch)
|
||||||
|
continue;
|
||||||
|
pitches.push_back(pitch);
|
||||||
|
@@ -641,7 +641,7 @@ GenericChord<Element, Container, singleStaff>::getPreviousNote()
|
||||||
|
while (1) {
|
||||||
|
if (i == AbstractSet<Element, Container>::getContainer().begin()) return AbstractSet<Element, Container>::getContainer().end();
|
||||||
|
--i;
|
||||||
|
- if (getAsEvent(i)->isa(Note::EventType)) {
|
||||||
|
+ if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -655,7 +655,7 @@ GenericChord<Element, Container, singleStaff>::getNextNote()
|
||||||
|
Iterator i(AbstractSet<Element, Container>::getFinalElement());
|
||||||
|
while ( i != AbstractSet<Element, Container>::getContainer().end() &&
|
||||||
|
++i != AbstractSet<Element, Container>::getContainer().end()) {
|
||||||
|
- if (getAsEvent(i)->isa(Note::EventType)) {
|
||||||
|
+ if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -677,8 +677,8 @@ GenericChord<Element, Container, singleStaff>::PitchGreater::operator()(const It
|
||||||
|
const Iterator &b)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
- long ap = get__Int(getAsEvent(a), BaseProperties::PITCH);
|
||||||
|
- long bp = get__Int(getAsEvent(b), BaseProperties::PITCH);
|
||||||
|
+ long ap = get__Int(GenericChord::getAsEvent(a), BaseProperties::PITCH);
|
||||||
|
+ long bp = get__Int(GenericChord::getAsEvent(b), BaseProperties::PITCH);
|
||||||
|
return (ap < bp);
|
||||||
|
} catch (Event::NoData) {
|
||||||
|
std::cerr << "Bad karma: PitchGreater failed to find one or both pitches" << std::endl;
|
||||||
|
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
|
||||||
|
index 3ec8e94..fab09c3 100644
|
||||||
|
--- a/src/document/RosegardenGUIDoc.cpp
|
||||||
|
+++ b/src/document/RosegardenGUIDoc.cpp
|
||||||
|
@@ -2106,15 +2106,15 @@ RosegardenGUIDoc::stopRecordingMidi()
|
||||||
|
|
||||||
|
bool meaningless = true;
|
||||||
|
|
||||||
|
- for (Segment::iterator i = s->begin(); i != s->end(); ++i) {
|
||||||
|
+ for (Segment::iterator j = s->begin(); j != s->end(); ++j) {
|
||||||
|
|
||||||
|
- if ((*i)->isa(Clef::EventType)) continue;
|
||||||
|
+ if ((*j)->isa(Clef::EventType)) continue;
|
||||||
|
|
||||||
|
// no rests in the segment yet, so anything else is meaningful
|
||||||
|
meaningless = false;
|
||||||
|
|
||||||
|
- if (!haveMeaning || (*i)->getAbsoluteTime() < earliestMeaning) {
|
||||||
|
- earliestMeaning = (*i)->getAbsoluteTime();
|
||||||
|
+ if (!haveMeaning || (*j)->getAbsoluteTime() < earliestMeaning) {
|
||||||
|
+ earliestMeaning = (*j)->getAbsoluteTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
haveMeaning = true;
|
||||||
|
@@ -2149,13 +2149,13 @@ RosegardenGUIDoc::stopRecordingMidi()
|
||||||
|
++i) {
|
||||||
|
|
||||||
|
Segment *s = i->second;
|
||||||
|
- Segment::iterator i = s->begin();
|
||||||
|
+ Segment::iterator j = s->begin();
|
||||||
|
|
||||||
|
- if (i == s->end() || !(*i)->isa(Clef::EventType)) continue;
|
||||||
|
+ if (j == s->end() || !(*j)->isa(Clef::EventType)) continue;
|
||||||
|
|
||||||
|
- if ((*i)->getAbsoluteTime() < meaningfulBarStart) {
|
||||||
|
- Event *e = new Event(**i, meaningfulBarStart);
|
||||||
|
- s->erase(i);
|
||||||
|
+ if ((*j)->getAbsoluteTime() < meaningfulBarStart) {
|
||||||
|
+ Event *e = new Event(**j, meaningfulBarStart);
|
||||||
|
+ s->erase(j);
|
||||||
|
s->insert(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/src/gui/application/LircClient.cpp b/src/gui/application/LircClient.cpp
|
||||||
|
index 7664b9e..8b20c84 100644
|
||||||
|
--- a/src/gui/application/LircClient.cpp
|
||||||
|
+++ b/src/gui/application/LircClient.cpp
|
||||||
|
@@ -36,6 +36,7 @@
|
||||||
|
#include <tqsocketnotifier.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <cstdlib>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
namespace Rosegarden
|
||||||
|
{
|
||||||
|
diff --git a/src/gui/application/LircCommander.cpp b/src/gui/application/LircCommander.cpp
|
||||||
|
index e323539..61afaca 100644
|
||||||
|
--- a/src/gui/application/LircCommander.cpp
|
||||||
|
+++ b/src/gui/application/LircCommander.cpp
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
#include "RosegardenGUIView.h"
|
||||||
|
|
||||||
|
#include <tqobject.h>
|
||||||
|
-
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
namespace Rosegarden
|
||||||
|
{
|
||||||
|
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
|
||||||
|
index b3147de..0744afa 100644
|
||||||
|
--- a/src/gui/application/main.cpp
|
||||||
|
+++ b/src/gui/application/main.cpp
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include <tqtimer.h>
|
||||||
|
#include <kapplication.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
#include "base/RealTime.h"
|
||||||
|
|
||||||
|
#include <kcmdlineargs.h>
|
||||||
|
diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp
|
||||||
|
index 6e4560d..2417c67 100644
|
||||||
|
--- a/src/gui/seqmanager/ControlBlockMmapper.cpp
|
||||||
|
+++ b/src/gui/seqmanager/ControlBlockMmapper.cpp
|
||||||
|
@@ -42,6 +42,7 @@
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
#include <errno.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
namespace Rosegarden
|
||||||
|
{
|
||||||
|
diff --git a/src/gui/seqmanager/SegmentMmapper.cpp b/src/gui/seqmanager/SegmentMmapper.cpp
|
||||||
|
index b859aa6..29fe715 100644
|
||||||
|
--- a/src/gui/seqmanager/SegmentMmapper.cpp
|
||||||
|
+++ b/src/gui/seqmanager/SegmentMmapper.cpp
|
||||||
|
@@ -45,7 +45,7 @@
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
#include <errno.h>
|
||||||
|
-
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
namespace Rosegarden
|
||||||
|
{
|
||||||
|
diff --git a/src/gui/seqmanager/SequencerMapper.cpp b/src/gui/seqmanager/SequencerMapper.cpp
|
||||||
|
index eec66a0..3a051e3 100644
|
||||||
|
--- a/src/gui/seqmanager/SequencerMapper.cpp
|
||||||
|
+++ b/src/gui/seqmanager/SequencerMapper.cpp
|
||||||
|
@@ -40,7 +40,7 @@
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
#include <errno.h>
|
||||||
|
-
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
namespace Rosegarden
|
||||||
|
{
|
||||||
|
diff --git a/src/gui/studio/AudioPluginManager.cpp b/src/gui/studio/AudioPluginManager.cpp
|
||||||
|
index 24b49f2..4457493 100644
|
||||||
|
--- a/src/gui/studio/AudioPluginManager.cpp
|
||||||
|
+++ b/src/gui/studio/AudioPluginManager.cpp
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
#include <tqmutex.h>
|
||||||
|
#include <tqstring.h>
|
||||||
|
#include <tqthread.h>
|
||||||
|
-
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
namespace Rosegarden
|
||||||
|
{
|
||||||
|
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
|
||||||
|
index 13da726..7b8bbd3 100644
|
||||||
|
--- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
|
||||||
|
+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
#ifdef HAVE_LIBLO
|
||||||
|
|
||||||
|
#include <lo/lo.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
#include "AudioPluginOSCGUIManager.h"
|
||||||
|
|
||||||
|
diff --git a/src/sound/RingBuffer.h b/src/sound/RingBuffer.h
|
||||||
|
index 0cc5dc6..6ea0d4e 100644
|
||||||
|
--- a/src/sound/RingBuffer.h
|
||||||
|
+++ b/src/sound/RingBuffer.h
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
+#include <string.h>
|
||||||
|
|
||||||
|
#include "Scavenger.h"
|
||||||
|
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
--- rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp.ORI 2012-05-06 12:31:01.464997883 +0200
|
||||||
|
+++ rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp 2012-05-06 12:31:19.271625694 +0200
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
COPYING included with this distribution for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
#include "AudioPreviewUpdater.h"
|
||||||
|
|
||||||
|
--- rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h.ORI 2012-05-06 12:32:47.222788008 +0200
|
||||||
|
+++ rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h 2012-05-06 12:33:01.046499259 +0200
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
#ifndef _RG_AUDIOPREVIEWUPDATER_H_
|
||||||
|
#define _RG_AUDIOPREVIEWUPDATER_H_
|
||||||
|
|
||||||
|
+#include <unistd.h>
|
||||||
|
#include <tqobject.h>
|
||||||
|
#include <tqrect.h>
|
||||||
|
#include <vector>
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
commit b4c7fd481649eaa362dc426e6b5f8d23b0c9e836
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1335631847 -0500
|
||||||
|
|
||||||
|
GCC 4.7 fixes.
|
||||||
|
|
||||||
|
diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp
|
||||||
|
index 24e309a..6627b51 100644
|
||||||
|
--- a/smb4k/configdlg/smb4kshareoptions.cpp
|
||||||
|
+++ b/smb4k/configdlg/smb4kshareoptions.cpp
|
||||||
|
@@ -40,6 +40,7 @@
|
||||||
|
// system includes
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <pwd.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
// applications specific includes
|
||||||
|
#include "smb4kshareoptions.h"
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
--- tellico/src/mainwindow.cpp.ORI 2012-05-06 12:54:09.395765577 +0200
|
||||||
|
+++ tellico/src/mainwindow.cpp 2012-05-06 12:54:30.626306963 +0200
|
||||||
|
@@ -53,6 +53,7 @@
|
||||||
|
#include "core/drophandler.h"
|
||||||
|
#include "latin1literal.h"
|
||||||
|
|
||||||
|
+#include <unistd.h>
|
||||||
|
#include <kapplication.h>
|
||||||
|
#include <kcombobox.h>
|
||||||
|
#include <kiconloader.h>
|
||||||
@ -1,120 +1,119 @@
|
|||||||
dependencies/qt3
|
dependencies/qt3
|
||||||
dependencies/tqtinterface
|
dependencies/tqtinterface
|
||||||
dependencies/arts
|
|
||||||
dependencies/dbus-tqt
|
dependencies/dbus-tqt
|
||||||
dependencies/dbus-1-tqt
|
dependencies/dbus-1-tqt
|
||||||
dependencies/libcaldav
|
dependencies/libcaldav
|
||||||
dependencies/libcarddav
|
dependencies/libcarddav
|
||||||
kdelibs
|
dependencies/arts
|
||||||
kdebase
|
main/kdelibs
|
||||||
kdebindings
|
main/kdebase
|
||||||
kdeaccessibility
|
main/kdebindings
|
||||||
kdeutils
|
main/kdeaccessibility
|
||||||
kdemultimedia
|
main/kdeutils
|
||||||
kdenetwork
|
main/kdemultimedia
|
||||||
kdeadmin
|
main/kdenetwork
|
||||||
kdeartwork
|
main/kdeadmin
|
||||||
kdegames
|
main/kdeartwork
|
||||||
kdetoys
|
main/kdegames
|
||||||
kdeedu
|
main/kdetoys
|
||||||
kdegraphics
|
main/kdeedu
|
||||||
kdeaddons
|
main/kdegraphics
|
||||||
kdepim
|
main/kdeaddons
|
||||||
kdesdk
|
main/kdepim
|
||||||
kdevelop
|
main/kdesdk
|
||||||
kdewebdev
|
main/kdevelop
|
||||||
kde-i18n
|
main/kdewebdev
|
||||||
|
main/kde-i18n
|
||||||
libraries/libkdcraw
|
libraries/libkdcraw
|
||||||
libraries/libkexiv2
|
libraries/libkexiv2
|
||||||
libraries/libkipi
|
libraries/libkipi
|
||||||
libraries/libksquirrel
|
libraries/libksquirrel
|
||||||
libraries/python-trinity
|
libraries/python-trinity
|
||||||
libraries/pykdeextensions
|
libraries/pykdeextensions
|
||||||
extras/akode
|
|
||||||
extras/kasablanca
|
|
||||||
extras/ksensors
|
|
||||||
extras/libkarma
|
|
||||||
extras/kdebluetooth
|
|
||||||
extras/trinity-desktop
|
|
||||||
extras/trinity-live
|
|
||||||
applications/k3b
|
|
||||||
applications/abakus
|
applications/abakus
|
||||||
applications/dolphin
|
applications/amarok
|
||||||
applications/gwenview
|
applications/basket
|
||||||
applications/krename
|
applications/bibletime
|
||||||
applications/yakuake
|
#applications/compizconfig-backend-kconfig
|
||||||
#applications/desktop-effects-kde
|
#applications/desktop-effects-kde
|
||||||
|
applications/digikam
|
||||||
|
applications/dolphin
|
||||||
applications/filelight
|
applications/filelight
|
||||||
applications/filelight-l10n
|
applications/filelight-l10n
|
||||||
applications/kdiff3
|
applications/fusion-icon
|
||||||
#applications/kuickshow
|
applications/gtk-qt-engine
|
||||||
applications/basket
|
applications/gwenview
|
||||||
|
applications/k3b
|
||||||
|
applications/k9copy
|
||||||
|
applications/kaffeine
|
||||||
|
applications/kaffeine-mozilla
|
||||||
applications/katapult
|
applications/katapult
|
||||||
#applications/compizconfig-backend-kconfig
|
applications/kbarcode
|
||||||
|
applications/kbfx
|
||||||
applications/kbookreader
|
applications/kbookreader
|
||||||
|
applications/kchmviewer
|
||||||
|
applications/kcpuload
|
||||||
applications/kdbusnotification
|
applications/kdbusnotification
|
||||||
applications/kmymoney
|
applications/kde-guidance
|
||||||
applications/kstreamripper
|
applications/kde-systemsettings
|
||||||
applications/kdesudo
|
|
||||||
applications/digikam
|
|
||||||
applications/konversation
|
|
||||||
applications/amarok
|
|
||||||
applications/kaffeine
|
|
||||||
applications/knetworkmanager
|
|
||||||
applications/kwin-style-crystal
|
|
||||||
applications/kde-style-lipstik
|
applications/kde-style-lipstik
|
||||||
applications/kde-style-qtcurve
|
applications/kde-style-qtcurve
|
||||||
applications/kpowersave
|
applications/kdesudo
|
||||||
applications/kiosktool
|
applications/kdesvn
|
||||||
applications/k9copy
|
applications/kdiff3
|
||||||
applications/kchmviewer
|
applications/kdirstat
|
||||||
applications/kbfx
|
applications/kdmtheme
|
||||||
applications/kradio
|
|
||||||
applications/kcpuload
|
|
||||||
applications/fusion-icon
|
|
||||||
applications/ksplash-engine-moodin
|
|
||||||
applications/knights
|
|
||||||
applications/ksquirrel
|
|
||||||
applications/gtk-qt-engine
|
|
||||||
applications/koffice
|
|
||||||
applications/ktechlab
|
|
||||||
applications/piklab
|
|
||||||
applications/keep
|
applications/keep
|
||||||
applications/tellico
|
applications/kerry
|
||||||
|
applications/kgtk-qt3
|
||||||
applications/kile
|
applications/kile
|
||||||
applications/kdmtheme
|
applications/kima
|
||||||
|
applications/kio-locate
|
||||||
|
applications/kio-umountwrapper
|
||||||
|
applications/kiosktool
|
||||||
|
applications/kmplayer
|
||||||
|
applications/kmyfirewall
|
||||||
|
applications/kmymoney
|
||||||
applications/knemo
|
applications/knemo
|
||||||
applications/kerry
|
|
||||||
applications/kvirc
|
|
||||||
applications/rosegarden
|
|
||||||
applications/wlassistant
|
|
||||||
applications/ktorrent
|
|
||||||
applications/bibletime
|
|
||||||
applications/smb4k
|
|
||||||
applications/knetload
|
applications/knetload
|
||||||
applications/knetstats
|
applications/knetstats
|
||||||
|
applications/knetworkmanager
|
||||||
|
applications/knights
|
||||||
applications/knowit
|
applications/knowit
|
||||||
applications/kpilot
|
applications/knutclient
|
||||||
applications/kdirstat
|
applications/koffice
|
||||||
applications/kbarcode
|
#applications/konstruct
|
||||||
|
applications/konversation
|
||||||
|
applications/kopete-otr
|
||||||
applications/kpicosim
|
applications/kpicosim
|
||||||
applications/kgtk-qt3
|
applications/kpilot
|
||||||
applications/kima
|
applications/kpowersave
|
||||||
applications/kdesvn
|
applications/kradio
|
||||||
applications/kde-guidance
|
applications/krename
|
||||||
applications/krusader
|
applications/krusader
|
||||||
applications/smartcardauth
|
applications/ksplash-engine-moodin
|
||||||
applications/kmyfirewall
|
applications/ksquirrel
|
||||||
applications/kopete-otr
|
applications/kstreamripper
|
||||||
applications/kaffeine-mozilla
|
|
||||||
applications/ksystemlog
|
applications/ksystemlog
|
||||||
applications/kio-locate
|
applications/ktechlab
|
||||||
#applications/konstruct
|
applications/ktorrent
|
||||||
applications/kio-umountwrapper
|
applications/kuickshow
|
||||||
applications/knutclient
|
|
||||||
applications/kde-systemsettings
|
|
||||||
applications/kmplayer
|
|
||||||
applications/kvkbd
|
applications/kvkbd
|
||||||
|
applications/kvirc
|
||||||
|
applications/kwin-style-crystal
|
||||||
|
applications/piklab
|
||||||
applications/potracegui
|
applications/potracegui
|
||||||
|
applications/rosegarden
|
||||||
|
applications/smartcardauth
|
||||||
|
applications/smb4k
|
||||||
applications/soundkonverter
|
applications/soundkonverter
|
||||||
|
applications/tellico
|
||||||
|
applications/wlassistant
|
||||||
|
applications/yakuake
|
||||||
|
extras/akode
|
||||||
|
extras/kasablanca
|
||||||
|
extras/kdebluetooth
|
||||||
|
extras/ksensors
|
||||||
|
extras/libkarma
|
||||||
|
extras/trinity-desktop
|
||||||
|
extras/trinity-live
|
||||||
|
|||||||
@ -0,0 +1,67 @@
|
|||||||
|
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/libqobex/qobex/qobexbttransport.cpp.ORI 2012-05-06 16:47:30.512410613 -0400
|
||||||
|
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/libqobex/qobex/qobexbttransport.cpp 2012-05-06 16:47:33.712352364 -0400
|
||||||
|
@@ -54,8 +54,9 @@
|
||||||
|
QObexBtTransport::QObexBtTransport( QObject* parent, const char* name )
|
||||||
|
: QObexTransport( parent, name ) {
|
||||||
|
myDebug(( "QObexBtTransport::QObexBtTransport( ... )" ));
|
||||||
|
- bacpy( &mDest, BDADDR_ANY );
|
||||||
|
- bacpy( &mSrc, BDADDR_ANY );
|
||||||
|
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
|
||||||
|
+ bacpy( &mDest, &bdaddr_any );
|
||||||
|
+ bacpy( &mSrc, &bdaddr_any );
|
||||||
|
mChannel = -1;
|
||||||
|
|
||||||
|
open();
|
||||||
|
@@ -76,7 +77,9 @@
|
||||||
|
|
||||||
|
mRegisterSdp = false;
|
||||||
|
mSdpHandle = 0;
|
||||||
|
- bacpy( &mSrc, BDADDR_ANY );
|
||||||
|
+
|
||||||
|
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
|
||||||
|
+ bacpy( &mSrc, &bdaddr_any );
|
||||||
|
mChannel = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -119,7 +122,8 @@
|
||||||
|
|
||||||
|
// If the user has not specified an address
|
||||||
|
// discover devices speaking OBEX, take the first best ...
|
||||||
|
- if ( 0 == bacmp( &mDest, BDADDR_ANY ) ) {
|
||||||
|
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
|
||||||
|
+ if ( 0 == bacmp( &mDest, &bdaddr_any ) ) {
|
||||||
|
if ( !discover() ) {
|
||||||
|
myDebug(( "QObexBtTransport::connect(): Can not discover device" ));
|
||||||
|
error( ConnectionRefused );
|
||||||
|
@@ -326,7 +330,8 @@
|
||||||
|
// If this profile is not found return an error.
|
||||||
|
int channel = -1;
|
||||||
|
|
||||||
|
- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, &addr, SDP_STANDARD_CONNECT_FLAGS );
|
||||||
|
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
|
||||||
|
+ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &addr, SDP_STANDARD_CONNECT_FLAGS );
|
||||||
|
if ( sdp ) {
|
||||||
|
myDebug(( "QObexBtTransport::getRfCommChannel(): sdp session opened" ));
|
||||||
|
|
||||||
|
@@ -369,7 +374,9 @@
|
||||||
|
{
|
||||||
|
myDebug(( "QObexBtTransport::registerSdp()" ));
|
||||||
|
|
||||||
|
- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, BDADDR_LOCAL, SDP_STANDARD_CONNECT_FLAGS );
|
||||||
|
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
|
||||||
|
+ bdaddr_t bdaddr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
|
||||||
|
+ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &bdaddr_local, SDP_STANDARD_CONNECT_FLAGS );
|
||||||
|
if ( !sdp )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
@@ -479,7 +486,9 @@
|
||||||
|
{
|
||||||
|
myDebug(( "QObexBtTransport::unregisterSdp()" ));
|
||||||
|
|
||||||
|
- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, BDADDR_LOCAL, SDP_STANDARD_CONNECT_FLAGS );
|
||||||
|
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
|
||||||
|
+ bdaddr_t bdaddr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
|
||||||
|
+ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &bdaddr_local, SDP_STANDARD_CONNECT_FLAGS );
|
||||||
|
if ( !sdp )
|
||||||
|
return false;
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,13 +0,0 @@
|
|||||||
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI 2011-11-22 16:56:38.608230401 -0500
|
|
||||||
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt 2011-11-22 16:56:57.829811773 -0500
|
|
||||||
@@ -21,6 +21,10 @@
|
|
||||||
${TDE_INCLUDE_DIR}
|
|
||||||
${TQT_INCLUDE_DIRS}
|
|
||||||
${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
|
|
||||||
+ ${CMAKE_SOURCE_DIR}/kpdf/xpdf/xpdf
|
|
||||||
+ ${CMAKE_SOURCE_DIR}/kpdf/xpdf
|
|
||||||
+ ${CMAKE_SOURCE_DIR}/kpdf/xpdf/goo
|
|
||||||
+ ${CMAKE_SOURCE_DIR}/kpdf/xpdf/splash
|
|
||||||
/usr/include/poppler
|
|
||||||
)
|
|
||||||
|
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake.ORI 2012-05-06 19:23:47.668667462 +0200
|
||||||
|
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake 2012-05-06 19:21:43.311268611 +0200
|
||||||
|
@@ -1,3 +1,13 @@
|
||||||
|
+# Poppler
|
||||||
|
+if( BUILD_KPDF )
|
||||||
|
+ pkg_search_module( POPPLER poppler )
|
||||||
|
+ if( POPPLER_FOUND )
|
||||||
|
+ set( HAVE_POPPLER 1 )
|
||||||
|
+ else( )
|
||||||
|
+ tde_message_fatal( "poppler is required, but was not found on your system" )
|
||||||
|
+ endif( )
|
||||||
|
+endif( )
|
||||||
|
+
|
||||||
|
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
|
||||||
|
set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
|
||||||
|
set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} "-lpoppler" )
|
||||||
|
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI 2012-05-06 19:24:31.405752482 +0200
|
||||||
|
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt 2012-05-06 19:22:12.544657204 +0200
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
${TDE_INCLUDE_DIR}
|
||||||
|
${TQT_INCLUDE_DIRS}
|
||||||
|
${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
|
||||||
|
- /usr/include/poppler
|
||||||
|
+ ${POPPLER_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
link_directories(
|
||||||
Loading…
Reference in new issue