summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.cpp92
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp50
-rw-r--r--noncore/apps/opie-gutenbrowser/SearchDialog.cpp4
-rw-r--r--noncore/apps/opie-gutenbrowser/browserDialog.cpp5
-rw-r--r--noncore/apps/opie-gutenbrowser/fontDialog.cpp20
-rw-r--r--noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp27
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowser.cpp153
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp20
-rw-r--r--noncore/apps/opie-gutenbrowser/helpme.cpp11
-rw-r--r--noncore/apps/opie-gutenbrowser/main.cpp2
-rw-r--r--noncore/apps/opie-gutenbrowser/openetext.cpp55
-rw-r--r--noncore/apps/opie-gutenbrowser/optionsDialog.cpp36
-rw-r--r--noncore/apps/opie-reader/Aportis.cpp8
-rw-r--r--noncore/apps/opie-reader/Bkmks.cpp6
-rw-r--r--noncore/apps/opie-reader/BuffDoc.cpp18
-rw-r--r--noncore/apps/opie-reader/CDrawBuffer.cpp22
-rw-r--r--noncore/apps/opie-reader/QTReader.cpp52
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp279
-rw-r--r--noncore/apps/opie-reader/StyleConsts.cpp2
-rw-r--r--noncore/apps/opie-reader/fileBrowser.cpp8
-rw-r--r--noncore/apps/opie-reader/opie-reader.pro2
-rw-r--r--noncore/apps/opie-reader/plucker.cpp10
-rw-r--r--noncore/apps/opie-reader/plucker_base.cpp148
-rw-r--r--noncore/apps/tinykate/libkate/document/katebuffer.cpp25
-rw-r--r--noncore/apps/tinykate/libkate/document/katedocument.cpp53
-rw-r--r--noncore/apps/tinykate/libkate/document/katehighlight.cpp46
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp27
-rw-r--r--noncore/apps/tinykate/libkate/kateconfig.cpp29
-rw-r--r--noncore/apps/tinykate/tinykate.cpp31
29 files changed, 656 insertions, 585 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 5b22b00..270a4cf 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -13,17 +13,21 @@
// ***************************************************************************/
//ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL
+#include "LibraryDialog.h"
+#include "output.h"
+
+/* OPIE */
#include <qpe/applnk.h>
#include <qpe/qpeapplication.h>
#include <qpe/qpedialog.h>
+#include <opie2/odebug.h>
-#include "LibraryDialog.h"
-#include "output.h"
-
+/* QT */
#include <qpushbutton.h>
#include <qmultilineedit.h>
//#include <qlayout.h>
+/* STD */
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
@@ -64,7 +68,7 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W
config.setGroup( "FTPsite" );
ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org");
- qDebug("Library Dialog: ftp_host is "+ftp_host);
+ odebug << "Library Dialog: ftp_host is "+ftp_host << oendl;
// ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) );
// ftp_host=ftp_host.stripWhiteSpace();
ftp_base_dir= config.readEntry("base", "/pub/gutenberg");
@@ -77,7 +81,7 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W
config.setGroup("General");
downDir =config.readEntry( "DownloadDirectory",local_library);
- qDebug("downDir is "+downDir);
+ odebug << "downDir is "+downDir << oendl;
newindexLib.setName( old_index);
indexLib.setName( old_index);
@@ -99,7 +103,7 @@ LibraryDialog::~LibraryDialog()
void LibraryDialog::Newlibrary()
{
#ifndef Q_WS_QWS //sorry embedded gutenbrowser cant use zip files
- //qDebug("Opening new library index %s",newindexLib);
+ //odebug << "Opening new library index " << newindexLib << "" << oendl;
if ( newindexLib.open( IO_ReadOnly) ) {
setCaption( tr( "Library Index - using master pg index." ) );// file opened successfully
QTextStream indexStream( &newindexLib );
@@ -121,7 +125,7 @@ void LibraryDialog::Newlibrary()
getAuthor(); // groks author
author = author.stripWhiteSpace();
if (authBox->isChecked()) { // this reverses the first name and last name of the author
- // qDebug("Sorting last name first");
+ // odebug << "Sorting last name first" << oendl;
QString lastName, firstName="";
int finder=author.findRev( ' ', -1, TRUE);
lastName=author.right( author.length()-finder);
@@ -180,7 +184,7 @@ void LibraryDialog::Library()
ListView4->clear();
ListView5->clear();
- qDebug("opening GUTINDEX.ALL file");
+ odebug << "opening GUTINDEX.ALL file" << oendl;
IDontKnowWhy = "";
if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully
QTextStream indexStream( &indexLib );
@@ -200,17 +204,17 @@ void LibraryDialog::Library()
file.remove(1,1);
if( file.find("]",0,TRUE) != -1)
file = file.left( file.find("]",0,TRUE));
- //qDebug("file is "+file);
+ //odebug << "file is "+file << oendl;
/// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
number = indexLine.mid(55,5);
number = number.stripWhiteSpace();
// title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
title = indexLine.mid( 9, 50 );
title = title.stripWhiteSpace();
- //qDebug("title is "+title);
+ //odebug << "title is "+title << oendl;
getAuthor(); // grok author
author = author.stripWhiteSpace();
- //qDebug("author is "+author);
+ //odebug << "author is "+author << oendl;
if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
QString lastName, firstName="";
int finder=author.findRev( ' ', -1, TRUE);
@@ -397,14 +401,14 @@ void LibraryDialog::select_title( QListViewItem * item)
if(DlglistItemTitle.length()>2) {
// DlglistItemNumber = item->text(0);
item = 0;
- qDebug( "string from librarydialog is:%s %s %s", DlglistItemYear.latin1(),DlglistItemFile.latin1(),DlglistItemNumber.latin1());
- qDebug("Title is "+DlglistItemTitle);
+ odebug << "string from librarydialog is:" << DlglistItemYear << " " << DlglistItemFile << " " << DlglistItemNumber << "" << oendl;
+ odebug << "Title is "+DlglistItemTitle << oendl;
// check for connection here
// if( get_extext())
if(download_Etext()) {
- // qDebug("get here 2");
+ // odebug << "get here 2" << oendl;
if(i_binary == 1) {
}
@@ -423,7 +427,7 @@ bool LibraryDialog::download_Etext()
ftp_host=cfg.readEntry("SiteName", "sailor.gutenberg.org");
ftp_base_dir= cfg.readEntry("base", "/pub/gutenberg");
- qDebug("about to network dialog");
+ odebug << "about to network dialog" << oendl;
QString NewlistItemNumber, NewlistItemYear, ls_result, result_line, s, dir, networkUrl, outputFile;
//////////////////// FIXME- if 'x' is part of real name....
@@ -431,11 +435,11 @@ bool LibraryDialog::download_Etext()
if( NewlistItemFile.find( DlglistItemFile.left(4) ,0,TRUE) ==-1 ) {
NewlistItemFile.replace( 0,4, DlglistItemFile.left(4));
- qDebug("NewlistItemFile is now "+NewlistItemFile);
+ odebug << "NewlistItemFile is now "+NewlistItemFile << oendl;
}
NewlistItemYear = DlglistItemYear.right(2);
int NewlistItemYear_Int = NewlistItemYear.toInt(0, 10);
- qDebug(NewlistItemYear);
+ odebug << NewlistItemYear << oendl;
if (NewlistItemYear_Int < 91 && NewlistItemYear_Int > 70) {
NewlistItemYear = "90";
}
@@ -447,8 +451,8 @@ bool LibraryDialog::download_Etext()
networkUrl= "ftp://"+ftp_host+dir;
outputFile=local_library+".guten_temp";
- //qDebug("Download file:%s",NewlistItemFile.latin1() );
- qDebug("Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile);
+ //odebug << "Download file:" << NewlistItemFile << "" << oendl;
+ odebug << "Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile << oendl;
QStringList networkList;
networkList.append((const char *)ftp_host);
networkList.append((const char *)dir);
@@ -462,18 +466,18 @@ bool LibraryDialog::download_Etext()
if( NetworkDlg->exec() != 0 ) { // use new, improved, *INSTANT* network-dialog-file-getterer
File_Name= NetworkDlg->localFileName;
- qDebug("back to Library from Network Dialog");
- qDebug("Just downloaded "+NetworkDlg->localFileName);
+ odebug << "back to Library from Network Dialog" << oendl;
+ odebug << "Just downloaded "+NetworkDlg->localFileName << oendl;
// if (File_Name.find( local_library, 0, TRUE) != -1 ) { //could not be found
// QString oldName=File_Name;
// File_Name.replace(0,local_library.length(),downDir);
- // qDebug("File_Name now is "+File_Name);
+ // odebug << "File_Name now is "+File_Name << oendl;
// }
// rename .txt to .etx
if(NetworkDlg->successDownload) {
- qDebug("Filename is "+File_Name);
+ odebug << "Filename is "+File_Name << oendl;
if(File_Name.right(4)==".txt") {
QString s_fileName=File_Name;
s_fileName.replace( s_fileName.length()-3,3,"gtn");
@@ -481,7 +485,7 @@ bool LibraryDialog::download_Etext()
rename(File_Name.latin1(),s_fileName.latin1());
File_Name=s_fileName;
- qDebug("Filename is now "+File_Name);
+ odebug << "Filename is now "+File_Name << oendl;
}
if(File_Name.length() > 5 ) {
@@ -490,20 +494,20 @@ bool LibraryDialog::download_Etext()
QString name_file=fi.fileName();
name_file=name_file.left(name_file.length()-4);
- qDebug("Setting doclink");
+ odebug << "Setting doclink" << oendl;
DocLnk lnk;
- qDebug("name is "+name_file);
+ odebug << "name is "+name_file << oendl;
lnk.setName(name_file); //sets file name
- qDebug("Title is "+DlglistItemTitle);
+ odebug << "Title is "+DlglistItemTitle << oendl;
lnk.setComment(DlglistItemTitle);
- qDebug("Filename is "+File_Name);
+ odebug << "Filename is "+File_Name << oendl;
lnk.setFile(File_Name); //sets File property
lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
lnk.setExec(File_Name);
lnk.setIcon("gutenbrowser/Gutenbrowser");
if(!lnk.writeLink()) {
- qDebug("Writing doclink did not work");
+ odebug << "Writing doclink did not work" << oendl;
} else {
}
} else
@@ -570,14 +574,14 @@ void LibraryDialog::cancelIt()
bool LibraryDialog::setTitle()
{
Config config("Gutenbrowser");
- qDebug("setting title");
- qDebug(DlglistItemTitle);
+ odebug << "setting title" << oendl;
+ odebug << DlglistItemTitle << oendl;
if( DlglistItemTitle.find("[",0,TRUE) != -1)
DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
if( DlglistItemTitle.find("]",0,TRUE) !=-1)
DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
- qDebug("Title being set is "+DlglistItemTitle);
+ odebug << "Title being set is "+DlglistItemTitle << oendl;
int test = 0;
QString ramble, temp;
config.setGroup("Files");
@@ -738,7 +742,7 @@ void LibraryDialog::onButtonSearch()
SearchResultsDialog->showMaximized();
if( SearchResultsDialog->exec() != 0) {
texter = SearchResultsDialog->selText;
- // qDebug(texter);
+ // odebug << texter << oendl;
resultLs= SearchResultsDialog->resultsList;
i_berger = 1;
}
@@ -749,7 +753,7 @@ void LibraryDialog::onButtonSearch()
QString tester;
for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
texter.sprintf("%s \n",(*it).latin1());
- // qDebug(texter);
+ // odebug << texter << oendl;
if( tester!=texter)
parseSearchResults( texter);
tester = texter;
@@ -806,7 +810,7 @@ void LibraryDialog::parseSearchResults( QString resultStr)
// int exit=QMessageBox::information(this, "Unzip?", "Ok to unzip "+ zipFile+" ?", QMessageBox::Yes, QMessageBox::No);
// if (exit==QMessageBox::Yes) {
- // qDebug("Issuing the command "+cmd);
+ // odebug << "Issuing the command "+cmd << oendl;
// #if defined(_WS_WIN_)
// WinExec( cmd, SW_HIDE );
// #endif
@@ -840,7 +844,7 @@ void LibraryDialog::sort()
Downloads the current selected listitem*/
bool LibraryDialog::getItem(QListViewItem *it)
{
- // qDebug("selected getItem");
+ // odebug << "selected getItem" << oendl;
// DlglistItemNumber = it->text(0);
DlglistItemTitle = it->text(0);
@@ -858,7 +862,7 @@ bool LibraryDialog::getItem(QListViewItem *it)
download button is pushed so we get the current items to download*/
bool LibraryDialog::onButtonDownload()
{
- // qDebug("selected onButtonDownloadz");
+ // odebug << "selected onButtonDownloadz" << oendl;
QListViewItemIterator it1( ListView1 );
QListViewItemIterator it2( ListView2 );
@@ -900,7 +904,7 @@ bool LibraryDialog::onButtonDownload()
handles the sorting combo box */
void LibraryDialog::comboSelect(int index)
{
- // qDebug("we are sorting");
+ // odebug << "we are sorting" << oendl;
ListView1->setSorting( index, TRUE);
ListView2->setSorting( index, TRUE);
ListView3->setSorting( index, TRUE);
@@ -930,7 +934,7 @@ void LibraryDialog::newList()
QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser");
if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true);
if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) {
- qDebug("changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser");
+ odebug << "changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser" << oendl;
QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1";
@@ -951,7 +955,7 @@ void LibraryDialog::newList()
fp = popen( (const char *) cmd, "r");
if ( !fp ) {
} else {
- qDebug("Issuing the command\n"+cmd);
+ odebug << "Issuing the command\n"+cmd << oendl;
// system(cmd);
while ( fgets( line, sizeof line, fp)) {
outDlg->OutputEdit->append(line);
@@ -965,7 +969,7 @@ void LibraryDialog::newList()
// if( QFile(gutenindex1).exists() ) {
// QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
// if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0)
- // qDebug("renaming error");
+ // odebug << "renaming error" << oendl;
// }
}
@@ -1024,7 +1028,7 @@ bool LibraryDialog::moreInfo()
}
item=0;
if(titleString.length()>2) {
- qDebug( "Title is "+titleString );
+ odebug << "Title is "+titleString << oendl;
titleString.replace( QRegExp("\\s"), "%20");
titleString.replace( QRegExp("'"), "%20");
titleString.replace( QRegExp("\""), "%20");
@@ -1048,12 +1052,12 @@ void LibraryDialog::FindLibrary()
if( QFile( new_index).exists() /* && this->isHidden() */) {
newindexLib.setName( new_index);
indexLib.setName( new_index);
- qDebug("index file is "+ new_index);
+ odebug << "index file is "+ new_index << oendl;
Newlibrary();
} else {
newindexLib.setName( old_index);
indexLib.setName( old_index);
- qDebug("new index nameis "+ old_index);
+ odebug << "new index nameis "+ old_index << oendl;
Library();
}
indexLoaded=true;
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index aed53c6..6e6b707 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -10,15 +10,15 @@
// ***************************************************************************/
// // half-assed attempt at providing a network dialog.
// /* Created: Sun Aug 27 15:24:52 2000*/
-#include <unistd.h>
-extern "C" {
-#include <ftplib.h>
-}
#include "NetworkDialog.h"
#include "gutenbrowser.h"
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
#include <qprogressbar.h>
#include <qstringlist.h>
#include <qpe/config.h>
@@ -30,6 +30,12 @@ extern "C" {
#include <qpushbutton.h>
#include <qlayout.h>
+/* STD */
+#include <unistd.h>
+extern "C" {
+#include <ftplib.h>
+}
+
QProgressBar* ProgressBar1;
QPushButton* buttonCancel;
static netbuf *conn = NULL;
@@ -119,7 +125,7 @@ void NetworkDialog::initDialog() {
// connect( timer, SIGNAL(timeout()), this , SLOT(timeSlot()));
// connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot()));
if(autoOk) {
- qWarning("XXXXXXXXXXXXXXXXXXXXXXXX");
+ owarn << "XXXXXXXXXXXXXXXXXXXXXXXX" << oendl;
buttonOk->setDown(true);
doOk();
}
@@ -143,13 +149,13 @@ void NetworkDialog::timeSlot() {
// timerProgess--;
// posTimer=TRUE;
// }
-// // qDebug("timer event");
+// // odebug << "timer event" << oendl;
// qApp->processEvents();
// repaint();
}
void NetworkDialog::connectionTimeSlot() {
-// qDebug("Connections timed out");
+// odebug << "Connections timed out" << oendl;
// ftpQuit();
// qApp->processEvents();
// repaint();
@@ -167,21 +173,21 @@ bool NetworkDialog::downloadFile( QString networkUrl )
// connectionTimer->start( 600 , FALSE);
warnLabel ->setText( "");
qApp->processEvents();
- qDebug("Downloading: %s",networkUrl.latin1());
- qDebug("Into: %s",localFileName.latin1());
+ odebug << "Downloading: " << networkUrl << "" << oendl;
+ odebug << "Into: " << localFileName << "" << oendl;
if( networkUrl.length() > 5) {
QString ftp_user = "anonymous";
QString ftp_pass = "zaurus@gutenbrowser.com";
// ftp_host= networkUrl.mid(networkUrl.find("ftp://",0, TRUE),
if(ftp_host.length() < 2) {
- qDebug("Please select an ftp host" );
+ odebug << "Please select an ftp host" << oendl;
successDownload=false;
QMessageBox::message("Note","You need to select an ftp host");
return false;
}
QString msg;
- qDebug(ftp_host);
- qDebug("Opening ftp connection.");
+ odebug << ftp_host << oendl;
+ odebug << "Opening ftp connection." << oendl;
warnLabel->setText("connecting to: "+ftp_host );
qApp->processEvents();
/////////// Open FTP connection
@@ -200,7 +206,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
QMessageBox::message("Note",msg);
return false;
}
- qDebug("Changing directories.");
+ odebug << "Changing directories." << oendl;
TextLabel3->setText("Changing directories.");
qApp->processEvents();
if (!FtpChdir( dir.latin1(), conn )) {
@@ -217,7 +223,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
// FtpQuit(conn);
// return false;
// }
- qDebug("Requesting directory list.");
+ odebug << "Requesting directory list." << oendl;
TextLabel3->setText("Getting directory list.");
qApp->processEvents();
if (!FtpDir( "./.guten_temp", dir.latin1(), conn) ) {
@@ -232,7 +238,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
if (tmp.open(IO_ReadOnly)) {
QTextStream t( &tmp ); // use a text stream
- qDebug("Finding partial filename "+s_partialFileName);
+ odebug << "Finding partial filename "+s_partialFileName << oendl;
while ( !t.eof()) {
s = t.readLine();
@@ -241,12 +247,12 @@ bool NetworkDialog::downloadFile( QString networkUrl )
if (str.contains(".txt")) {
File_Name = str;
- qDebug("Found file_name "+ File_Name);
+ odebug << "Found file_name "+ File_Name << oendl;
break;
}
// if (str.contains(".zip")) {
// File_Name = str;
-// qDebug("Found file_name "+ File_Name);
+// odebug << "Found file_name "+ File_Name << oendl;
// break;
// }
@@ -256,15 +262,15 @@ bool NetworkDialog::downloadFile( QString networkUrl )
// tmp.remove(); ///TODO this is for release version Zaurus
}
else
- qDebug("Error opening temp file.");
+ odebug << "Error opening temp file." << oendl;
Config cfg("Gutenbrowser");
cfg.setGroup("General");
QString temp=cfg.readEntry("DownloadDirectory",local_library);
localFileName = temp+File_Name;
- qDebug("Requesting file "+ File_Name);
- qDebug( "Saving as "+localFileName);
+ odebug << "Requesting file "+ File_Name << oendl;
+ odebug << "Saving as "+localFileName << oendl;
msg="Requesting file "+ File_Name;
TextLabel3->setText(msg);
qApp->processEvents();
@@ -293,7 +299,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
FtpQuit(conn);
return false;
}
- qDebug("Ftp session successful");
+ odebug << "Ftp session successful" << oendl;
successDownload=TRUE;
FtpQuit(conn);
return true;
@@ -302,7 +308,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
}
void NetworkDialog::doOk() {
- qWarning("Do OK");
+ owarn << "Do OK" << oendl;
QString loginStr;
loginStr = "gutenbrowser";
if ( !ftp_host.isEmpty() ) {
diff --git a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
index 4ddb3f0..d989304 100644
--- a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
@@ -98,7 +98,7 @@ void SearchDialog::byeBye()
{
searchString = get_text();
-// qDebug("Search string is "+searchString);
+// odebug << "Search string is "+searchString << oendl;
Config cfg("Gutenbrowser");
cfg.setGroup("General");
cfg.writeEntry("LastSearch",searchString);
@@ -119,7 +119,7 @@ void SearchDialog::byeBye()
void SearchDialog::closed()
{
searchString = get_text();
-// qDebug("Search string is "+searchString);
+// odebug << "Search string is "+searchString << oendl;
Config cfg("Gutenbrowser");
cfg.setGroup("General");
cfg.writeEntry("LastSearch",searchString);
diff --git a/noncore/apps/opie-gutenbrowser/browserDialog.cpp b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
index 81dd516..cc05d04 100644
--- a/noncore/apps/opie-gutenbrowser/browserDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
@@ -10,6 +10,7 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
/* OPIE */
#include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
using namespace Opie::Ui;
/* QT */
@@ -52,7 +53,7 @@ void optionsDialog::BrowseSelected() {
if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() ) {
fileName = str;
// QStringList fileList=browseForFiles->fileList;
-// qDebug(selFile);
+// odebug << selFile << oendl;
// QStringList::ConstIterator f;
// QString fileTemp,filer;
// for ( f = fileList.begin(); f != fileList.end(); f++ ) {
@@ -76,7 +77,7 @@ void optionsDialog::BrowseSelected() {
void optionsDialog::setHttp(int index) {
Config config("Gutenbrowser");
config.setGroup( "HttpServer" );
- qDebug("writing http server");
+ odebug << "writing http server" << oendl;
if( index== 0) {
config.writeEntry("Preferred", "http://sailor.gutenberg.org");
} else {
diff --git a/noncore/apps/opie-gutenbrowser/fontDialog.cpp b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
index a17b1d3..fa964a6 100644
--- a/noncore/apps/opie-gutenbrowser/fontDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
@@ -90,7 +90,7 @@ void FontDialog::familyListBoxSlot(const QString & text)
styleListBox->clear();
// clearListBoxes();
family = text;
-// qDebug(family);
+// odebug << family << oendl;
QStringList styles = fdb.styles( family ); // string list of styles of our current font family
styleListBox->insertStringList( styles);
QString dstyle;// = "\t" + style + " (";
@@ -100,7 +100,7 @@ void FontDialog::familyListBoxSlot(const QString & text)
QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) {
dstyle = QString::number( *points );
- qDebug(dstyle);
+ odebug << dstyle << oendl;
sizeComboBox->insertItem( dstyle.left( dstyle.length() - 1 ));
}
#else
@@ -151,7 +151,7 @@ void FontDialog::populateLists()
for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) {
QString family = *f;
// if(family == defaultFont.family())
-// qDebug(family);
+// odebug << family << oendl;
familyListBox->insertItem( family);
if( familyListBox->text(0) == family) {
@@ -209,13 +209,13 @@ void FontDialog::changeText()
else {
family = familyListBox->currentText();
}
-// qDebug("Font family is "+family);
+// odebug << "Font family is "+family << oendl;
if( styleListBox->currentItem() == -1)
style=styleListBox->text(0);
else {
style = styleListBox->currentText();
}
-// qDebug("font style is "+style);
+// odebug << "font style is "+style << oendl;
if( sizeComboBox->currentItem() == -1 )
size = sizeComboBox->text(0);
@@ -223,7 +223,7 @@ void FontDialog::changeText()
size = sizeComboBox->currentText();
}
-// qDebug("Font size is "+size);
+// odebug << "Font size is "+size << oendl;
bool ok;
int i_size = size.toInt(&ok,10);
QStringList charSetList = fdb.charSets(family);
@@ -231,13 +231,13 @@ void FontDialog::changeText()
QString charSet;
for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style
charSet = *s;
-// qDebug(charSet);
+// odebug << charSet << oendl;
}
selectedFont = fdb.font(family,style,i_size,charSet);
QFontInfo fontInfo( selectedFont);
-// if(fontInfo.italic() ) qDebug("italic");
+// if(fontInfo.italic() ) odebug << "italic" << oendl;
selectedFont.setWeight(fontInfo.weight() );
-// qDebug("Style are "+style+" %d ",fontInfo.weight());
+// odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl;
Config cfg("Gutenbrowser");
cfg.setGroup("Font");
cfg.writeEntry("Family",family);
@@ -249,7 +249,7 @@ void FontDialog::changeText()
selectedFont = fdb.font(family,"Regular",i_size,charSet);
selectedFont.setItalic(TRUE); //ya right
cfg.writeEntry("Italic","TRUE");
-// qDebug("Style is "+styleListBox->currentText());
+// odebug << "Style is "+styleListBox->currentText() << oendl;
} else
cfg.writeEntry("Italic","FALSE");
diff --git a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
index ad770b5..a9c7346 100644
--- a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
+++ b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
@@ -11,20 +11,25 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
+
#include "optionsDialog.h"
#include "gutenbrowser.h"
//#include "NetworkDialog.h"
#include "output.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
#include <qprogressbar.h>
-#include <stdlib.h>
#include <qurloperator.h>
-#include <qpe/config.h>
#include <qlistbox.h>
+/* STD */
+#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
-#include <stdlib.h>
// :)~
void optionsDialog::ftpSiteDlg( )
@@ -38,7 +43,7 @@ void optionsDialog::ftpSiteDlg( )
if( !dir.exists())
dir.mkdir(ListFile,true);
ListFile+="/ftpList";
- qDebug("opening "+ListFile);
+ odebug << "opening "+ListFile << oendl;
if ( QFile(ListFile).exists() ) {
openSiteList();
} else {
@@ -76,7 +81,7 @@ void optionsDialog::getSite()
// NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog",TRUE,0,networkUrl,outputFile);
// if( NetworkDlg->exec() != 0 )
// { // use new, improved, *INSTANT* network-dialog-file-getterer
-// qDebug("gitcha!");
+// odebug << "gitcha!" << oendl;
// }
// delete NetworkDlg;
//#ifdef Q_WS_QWS
@@ -84,7 +89,7 @@ void optionsDialog::getSite()
// TODO qprocess here
QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl + " 2>&1" ;
- qDebug("Issuing the command "+cmd);
+ odebug << "Issuing the command "+cmd << oendl;
Output *outDlg;
outDlg = new Output( 0, tr("Downloading ftp sites...."),TRUE);
outDlg->showMaximized();
@@ -113,7 +118,7 @@ bool optionsDialog::parseFtpList( QString outputFile)
{
// parse ftplist html and extract just the machine names/directories
// TODO: add locations!!
- qDebug("parse ftplist "+outputFile);
+ odebug << "parse ftplist "+outputFile << oendl;
QString ftpList, s_location;
QFile f( outputFile );
@@ -152,11 +157,11 @@ bool optionsDialog::parseFtpList( QString outputFile)
s = t.readLine();
s = t.readLine();
if(( start=s.find("<BR>(", 0, TRUE) ) != -1) {
-// qDebug("%s",s.latin1());
+// odebug << "" << s << "" << oendl;
end = s.find( ")", 0, TRUE)+1;
s_location= s.mid( start+4, (end - start) );
-// qDebug("%s", s_location.latin1());
+// odebug << "" << s_location << "" << oendl;
// ftpList += ftpSite + "\n";
// ftp_QListBox_1->sort( TRUE );
ftpList += s_location+ " "+ftpSite+"\n";
@@ -190,7 +195,7 @@ bool optionsDialog::parseFtpList( QString outputFile)
void optionsDialog::openSiteList() {
- qDebug(" just opens the ftp site list");
+ odebug << " just opens the ftp site list" << oendl;
// ListFile = ( QDir::homeDirPath ()) +"/.gutenbrowser/ftpList";
QFile f( ListFile);
if(!f.open( IO_ReadWrite )) {
@@ -230,7 +235,7 @@ void optionsDialog::select_site( const char *index )
QString s_site2;
// if(s_site.find("(",0,TRUE))
s_site2=s_site.right( s_site.length()-(s_site.find(" ",0,TRUE)+4) );
-qDebug("Selected ftp site is "+ s_site2);
+odebug << "Selected ftp site is "+ s_site2 << oendl;
int i_ftp = s_site2.find("/", 0, FALSE);
ftp_host = s_site2.left(i_ftp );
ftp_base_dir = s_site2.right( s_site2.length() - i_ftp);
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 2a9a71e..be2b897 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -14,13 +14,7 @@
// http://digital.library.upenn.edu/books/titles.html
// ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL
// donate@gutenberg.net
-#include <qpe/qpeapplication.h>
-#include <qpe/fontdatabase.h>
-#include <qpe/config.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/mimetype.h>
-#include <qpe/resource.h>
-#include <qpe/applnk.h>
+
#include "editTitle.h"
#include "gutenbrowser.h"
@@ -33,7 +27,17 @@
#include "openetext.h"
#include "output.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/fontdatabase.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/mimetype.h>
+#include <qpe/resource.h>
+#include <qpe/applnk.h>
+/* QT */
#include <qregexp.h>
#include <qregion.h>
#include <qpaintdevicemetrics.h>
@@ -51,6 +55,7 @@
#include <qscrollview.h>
#include <qpoint.h>
+/* STD */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -131,7 +136,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
config.setGroup( tempTitle);
int index=config.readNumEntry( "LineNumber", -1 );
if( index != -1) {
- // qDebug( tempTitle);
+ // odebug << tempTitle << oendl;
bookmarksMenu->insertItem( tempTitle);
}
}
@@ -154,7 +159,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
// if(firstTime)
// Bookmark();
for (int i=1;i< qApp->argc();i++) {
- qDebug("Suppose we open somethin");
+ odebug << "Suppose we open somethin" << oendl;
load(qApp->argv()[i]);
}
} else {
@@ -169,7 +174,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
Gutenbrowser::~Gutenbrowser() {
// QPEApplication::grabKeyboard();
// QPEApplication::ungrabKeyboard();
- qDebug("Exit");
+ odebug << "Exit" << oendl;
}
/*
@@ -199,7 +204,7 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
filename+="/etc/gutenbrowser/";
else
filename+="etc/gutenbrowser/";
- qDebug("filename "+filename);
+ odebug << "filename "+filename << oendl;
// QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
@@ -207,11 +212,11 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
Config config("Gutenbrowser");
config.setGroup( "Browser" );
QString brow = config.readEntry("Preferred", "Opera");
- qDebug("Preferred browser is "+brow);
+ odebug << "Preferred browser is "+brow << oendl;
if(!showMsg) { //if we just get the gutenindex.all
cmd="wget -O " + filename +" " + url+" 2>&1" ;
chdir(local_library);
- qDebug("Issuing the system command: %s", cmd.latin1());
+ odebug << "Issuing the system command: " << cmd << "" << oendl;
Output *outDlg;
outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
@@ -223,7 +228,7 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
outDlg->OutputEdit->append( tr("Running wget") );
sleep(1);
fp = popen( (const char *) cmd, "r");
- // qDebug("Issuing the command\n"+cmd);
+ // odebug << "Issuing the command\n"+cmd << oendl;
// system(cmd);
while ( fgets( line, sizeof line, fp)) {
outDlg->OutputEdit->append(line);
@@ -256,7 +261,7 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
}
chdir(local_library);
- qDebug("Issuing the sys command: %s", cmd.latin1());
+ odebug << "Issuing the sys command: " << cmd << "" << oendl;
system(cmd);
}
}
@@ -266,7 +271,7 @@ void Gutenbrowser::toggleButtonIcons( bool useEm) {
if(useEm)
useEm=TRUE;
pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser";
- qDebug("Docdir is "+QPEApplication::documentDir());
+ odebug << "Docdir is "+QPEApplication::documentDir() << oendl;
if( useIcons && QDir( pixDir).exists() ) {
LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline
@@ -381,7 +386,7 @@ void Gutenbrowser::PrintBtn() {
void Gutenbrowser::SearchBtn() {
if( loadCheck) {
- qDebug("loadCheck: we have a loaded doc");
+ odebug << "loadCheck: we have a loaded doc" << oendl;
Search();
}
// else
@@ -404,7 +409,7 @@ void Gutenbrowser::ForwardBtn() {
s.replace(QRegExp("\n"),"");
insertString+=s;
Lview->insertLine( s, -1);
- // qDebug(s);
+ // odebug << s << oendl;
currentLine++;
}
// Lview->insertAt( insertString,0,0, FALSE);
@@ -423,7 +428,7 @@ void Gutenbrowser::ForwardBtn() {
// }
} else {
- // qDebug("bal");
+ // odebug << "bal" << oendl;
// if( i_pageNum != pages) {
// // int newTop = Lview->Top();
@@ -438,7 +443,7 @@ void Gutenbrowser::ForwardBtn() {
}
Lview->setFocus();
- // qDebug("page number %d line number %d", i_pageNum, currentLine);
+ // odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
}
@@ -457,7 +462,7 @@ void Gutenbrowser::BackBtn() {
f.at( 0);
} else {
if(!f.at( pageStopArray[i_pageNum - 1] ))
- qDebug("File positioned backward did not work");
+ odebug << "File positioned backward did not work" << oendl;
}
QString s;
// int sizeLine=0;
@@ -513,7 +518,7 @@ void Gutenbrowser::TopBtn() {
if(loadCheck) {
if( i_pageNum != 0) {
- qDebug("top");
+ odebug << "top" << oendl;
qApp->processEvents();
currentLine = 0;
i_pageNum = 1;
@@ -571,11 +576,11 @@ void Gutenbrowser::BeginBtn() {
if(lastPage < i_pageNum) {
pageStopArray.resize(i_pageNum + 1);
pageStopArray[i_pageNum ] = currentFilePos;
- // qDebug("new page number %d, found at %d", i_pageNum, currentFilePos);
+ // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
}
// lastPage = i_pageNum;
if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) {
- qDebug("<<<<<< FOUND IT!! new page number %d, found at %d", i_pageNum, currentFilePos);
+ odebug << "<<<<<< FOUND IT!! new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
break;
}
}
@@ -621,11 +626,11 @@ void Gutenbrowser::setBookmark() {
cfg.setGroup("General");
file_name=cfg.readEntry("Current","");
qApp->processEvents();
- qDebug("Settingbook mark "+file_name);
+ odebug << "Settingbook mark "+file_name << oendl;
cfg.setGroup("Titles");
title=cfg.readEntry(file_name,"");
- qDebug("title is "+ title);
+ odebug << "title is "+ title << oendl;
cfg.setGroup( "Bookmarks" );
@@ -654,11 +659,11 @@ void Gutenbrowser::Bookmark( int itemId) {
Config config("Gutenbrowser");
config.setGroup( "Bookmarks" );
- // qDebug("<<<<<< %d, %d", Lview->PageSize(), Lview->lastRow() - Lview->topRow() );
+ // odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
QString itemString;
- qDebug("menu item %d", itemId);
+ odebug << "menu item " << itemId << "" << oendl;
QString tempTitle;
QString s_Bmrkrow;
QString s_pageNum;
@@ -700,7 +705,7 @@ void Gutenbrowser::Bookmark( int itemId) {
if(lastPage < i_pageNum) {
pageStopArray.resize(i_pageNum + 1);
pageStopArray[i_pageNum ] = currentFilePos;
- // qDebug("new page number %d, found at %d", i_pageNum, currentFilePos);
+ // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
}
if(currentFilePos == bookmarkPosition)
break;
@@ -729,7 +734,7 @@ void Gutenbrowser::Bookmark( int itemId) {
// qApp->processEvents();
}
- qDebug("bookmark loaded");
+ odebug << "bookmark loaded" << oendl;
setCaption(title);
}
@@ -737,14 +742,14 @@ void Gutenbrowser::Bookmark( int itemId) {
bool Gutenbrowser::load( const char *fileName) {
// QCopEnvelope ( "QPE/System", "busy()" );
- // qDebug("Title is already set as "+title);
- qDebug("sizeHint %d pageSize %d", sizeHint().height(),Lview->PageSize() );
+ // odebug << "Title is already set as "+title << oendl;
+ odebug << "sizeHint " << sizeHint().height() << " pageSize " << Lview->PageSize() << "" << oendl;
if( Lview->PageSize() < 4) {
Lview->setMaximumHeight( sizeHint().height() );
Lview->setMinimumHeight( sizeHint().height() );
pointSize = Lview->fontInfo().pointSize();
- qDebug("sizeHint %d point size %d", sizeHint().height(), pointSize);
+ odebug << "sizeHint " << sizeHint().height() << " point size " << pointSize << "" << oendl;
if(pointSize < 10)
Lview->setFixedVisibleLines(19);
else
@@ -762,7 +767,7 @@ bool Gutenbrowser::load( const char *fileName) {
// if (i_pageNum < 1) {
i_pageNum = 1;
// }
- qDebug("ready to open "+o_file);
+ odebug << "ready to open "+o_file << oendl;
if(f.isOpen()) f.close();
f.setName( o_file);
@@ -798,14 +803,14 @@ bool Gutenbrowser::load( const char *fileName) {
currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() );
Lview->setMaxLines(Lview->PageSize()*2);
- qDebug("Gulped %d", currentLine);
+ odebug << "Gulped " << currentLine << "" << oendl;
setCaption(title);
Lview->setAutoUpdate( TRUE);
Lview->setCursorPosition(0,0,FALSE);
// pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1;
- //qDebug("number of pages %d", pages);
+ //odebug << "number of pages " << pages << "" << oendl;
loadCheck = true;
enableButtons(true);
@@ -822,7 +827,7 @@ void Gutenbrowser::Search() {
// if( searchDlg->isHidden())
{
- qDebug("Starting search dialog");
+ odebug << "Starting search dialog" << oendl;
searchDlg = new SearchDialog( this, "Etext Search", true);
searchDlg->setCaption( tr( "Etext Search" ));
// searchDlg->setLabel( "- searches etext");
@@ -958,9 +963,9 @@ void Gutenbrowser::LibraryBtn() {
QString newestLibraryFile ="pgwhole.zip";
QString zipFile;
- // qDebug("Local Library is %s ", local_library.latin1());
+ // odebug << "Local Library is " << local_library << " " << oendl;
zipFile="/usr/bin/unzip";
- // qDebug("newestLibraryFile is %s ", newestLibraryFile.latin1());
+ // odebug << "newestLibraryFile is " << newestLibraryFile << " " << oendl;
if( QFile::exists( local_library+newestLibraryFile)) {
if( QFile::exists(zipFile) ) {
UnZipIt(newestLibraryFile);
@@ -989,7 +994,7 @@ void Gutenbrowser::LibraryBtn() {
listItemYear = LibraryDlg->DlglistItemYear;
listItemTitle = LibraryDlg->DlglistItemTitle;
file_name = LibraryDlg->File_Name;
- // qDebug("title is being set as "+title);
+ // odebug << "title is being set as "+title << oendl;
title = listItemTitle;
// config.setGroup( "Proxy" );
@@ -1011,7 +1016,7 @@ void Gutenbrowser::LibraryBtn() {
//
if( file_name.find(".zip"))
{
- qDebug("Found zip file\n");
+ odebug << "Found zip file\n" << oendl;
// QStringList args;
// args="unzip";
// args+="-o";
@@ -1019,7 +1024,7 @@ void Gutenbrowser::LibraryBtn() {
// args+="-d";
// args+=local_library;
QString cmd = "/usr/bin/unzip -o " + local_library+file_name + " -d " + local_library;
- qDebug("Issuing the command "+ cmd);
+ odebug << "Issuing the command "+ cmd << oendl;
// unzipProc=new QProcess( this, "unzipProc" ); /// fark that idea!
// unzipProc->start();
system(cmd);
@@ -1062,14 +1067,14 @@ void Gutenbrowser::OpenBtn() {
if( OpenDlg->exec() != 0) {
title = OpenDlg->openFileTitle;
- qDebug("title open as "+title);
+ odebug << "title open as "+title << oendl;
file_name = OpenDlg->file;
i_pageNum = 1;
if( !file_name.isEmpty() || file_name.length() > 2 ) {
if(showMainList) {
showMainList=FALSE;
- qDebug("ShowMainList is now false");
+ odebug << "ShowMainList is now false" << oendl;
mainList->hide();
Lview->show();
qApp->processEvents();
@@ -1078,7 +1083,7 @@ void Gutenbrowser::OpenBtn() {
// QCopEnvelope ( "QPE/System", "busy()" );
load(file_name);
} else {
- qDebug("file_name is empty!");
+ odebug << "file_name is empty!" << oendl;
if(showMainList) {
if(!Lview->isHidden())
Lview->hide();
@@ -1244,7 +1249,7 @@ bool Gutenbrowser::getTitle( const char *file ) {
if( strcmp(ramble, s_file) == 0) {
config.setGroup( "Titles" );
title = config.readEntry(ramble, "");
- // qDebug("(getTitle)title is being set as "+title);
+ // odebug << "(getTitle)title is being set as "+title << oendl;
}
}
return true;
@@ -1446,7 +1451,7 @@ void Gutenbrowser::keyPressEvent( QKeyEvent *e) {
}
void Gutenbrowser::resizeEvent( QResizeEvent *ev) {
- // qDebug("resize: %d,%d\n",ev->size().width(),ev->size().height());
+ // odebug << "resize: " << ev->size().width() << "," << ev->size().height() << "\n" << oendl;
if( !LibraryDlg->isHidden())
LibraryDlg->resize(ev->size().width(),ev->size().height() );
@@ -1476,7 +1481,7 @@ void Gutenbrowser::doOptions() {
brow=optDlg->browserName;
Ddir=optDlg->downloadDirEdit->text();
- qDebug("writing library config");
+ odebug << "writing library config" << oendl;
Config config("Gutenbrowser");
config.setGroup("General");
@@ -1493,7 +1498,7 @@ void Gutenbrowser::doOptions() {
QString cmd="mkdir -p ";
cmd+=Ddir.latin1();
system(cmd);
- qDebug("Making new dir "+cmd);
+ odebug << "Making new dir "+cmd << oendl;
if(Ddir.right(1)!="/") {
Ddir+="/";
}
@@ -1509,17 +1514,17 @@ void Gutenbrowser::doOptions() {
b_queryExit=FALSE;
if(optDlg->fontDlg-> changedFonts) {
- qDebug("Setting font");
+ odebug << "Setting font" << oendl;
myFont=optDlg->fontDlg->selectedFont;
Lview->setFont( myFont);
}
if(optDlg->useWordWrap_CheckBox->isChecked() ) {
- qDebug("WORD WRAP is set");
+ odebug << "WORD WRAP is set" << oendl;
Lview->setWordWrap(QMultiLineEdit::WidgetWidth);
useWrap=true;
} else {
- qDebug("Word wrap is NOT set");
+ odebug << "Word wrap is NOT set" << oendl;
Lview->setWordWrap(QMultiLineEdit::NoWrap);
useWrap=false;
}
@@ -1578,8 +1583,8 @@ bool Gutenbrowser::setTitle() {
/*Calls new fangled network dialog */
void Gutenbrowser::OnNetworkDialog( const QString &/*networkUrl*/, const QString &/*output*/)
{
- // qDebug(networkUrl);
- // qDebug(output);
+ // odebug << networkUrl << oendl;
+ // odebug << output << oendl;
// #ifndef Q_WS_QWS
// NetworkDialog *NetworkDlg;
// if( networkUrl.length() < 4 ) networkUrl= "http://sailor.gutenberg.org/mirror.sites.html";
@@ -1712,13 +1717,13 @@ void Gutenbrowser::cleanUp( )
QPEApplication::grabKeyboard();
QPEApplication::ungrabKeyboard();
- // qDebug("Cleanup");
+ // odebug << "Cleanup" << oendl;
if(f.isOpen()) f.close();
}
void Gutenbrowser::fixKeys()
{
- qDebug("Attempting to fix keys");
+ odebug << "Attempting to fix keys" << oendl;
}
@@ -1772,7 +1777,7 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
Config config("Gutenbrowser");
config.setGroup( "Files" );
QString file = config.readEntry(temp, "");
- qDebug("About to load");
+ odebug << "About to load" << oendl;
if( Lview->isVisible())
load(file);
@@ -1813,11 +1818,11 @@ void Gutenbrowser::setDocument(const QString & frozenBoogers) {
}
DocLnk lnk;
lnk = DocLnk(frozenBoogers);
- // qDebug(lnk.file() );
+ // odebug << lnk.file() << oendl;
title=lnk.comment();
load( lnk.file());
this->show();
- // qDebug(title);
+ // odebug << title << oendl;
// qApp->processEvents();
// repaint();
}
@@ -1873,7 +1878,7 @@ void Gutenbrowser::menuEditTitle()
{
int currentItem = mainList->currentItem();
QString title_text = mainList->text( currentItem);
- //qDebug("Selected "+title_text);
+ //odebug << "Selected "+title_text << oendl;
Config config("Gutenbrowser");
config.setGroup( "Files" );
@@ -1887,15 +1892,15 @@ void Gutenbrowser::menuEditTitle()
QString s_filename = config.readEntry(fileNum, "" );
config.setGroup( "Titles" );
QString file_title = config.readEntry( s_filename, "");
- //qDebug("file_title is "+file_title);
+ //odebug << "file_title is "+file_title << oendl;
if(title_text == file_title ) {
// selFile = s_filename;
- //qDebug("Edit: "+ file_title );
+ //odebug << "Edit: "+ file_title << oendl;
i=i_numofFiles+1;
Edit_Title *titleEdit;
titleEdit = new Edit_Title(this,file_title ,TRUE);
if(titleEdit->exec() !=0) {
- //qDebug(titleEdit->newTitle);
+ //odebug << titleEdit->newTitle << oendl;
config.writeEntry( s_filename, titleEdit->newTitle);
mainList->removeItem(currentItem);
mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem);
@@ -1911,7 +1916,7 @@ void Gutenbrowser::menuEditTitle()
bool Gutenbrowser::UnZipIt(const QString &zipFile) {
- qDebug(zipFile);
+ odebug << zipFile << oendl;
#ifndef Q_WS_QWS
if( QFile::exists( zipFile)) { // TODO findsome other way of dealingwithzip files.
bool isPgWhole=false;
@@ -1923,17 +1928,17 @@ bool Gutenbrowser::UnZipIt(const QString &zipFile) {
// else {
// thatFile=zipFile.left(4);
// }
- // qDebug((const char*)local_library.latin1());
+ // odebug << (const char*)local_library.latin1() << oendl;
QString cmd;
#if defined(_WS_X11_)
if( chdir((const char*)local_library.latin1())!=0)
- qDebug("chdir failed.");
+ odebug << "chdir failed." << oendl;
cmd = "gunzip -S .zip " + local_library+zipFile;
//cmd = "gunzip -d " + zipFile /*newestLibraryFile */+" -d " + local_library;
#endif
#ifdef Q_WS_QWS
if( chdir((const char*)local_library.latin1())!=0)
- qDebug("chdir failed.");
+ odebug << "chdir failed." << oendl;
cmd = "unzip " + local_library+zipFile;
// cmd = "/usr/bin/unzip -o " + local_library+zipFile +" -d /usr/share/doc/gutenbrowser" ;//+ local_library;
#endif
@@ -1942,36 +1947,36 @@ bool Gutenbrowser::UnZipIt(const QString &zipFile) {
QMessageBox::Yes, QMessageBox::No);
if (exit==QMessageBox::Yes) {
#if defined(_WS_X11_)//
- qDebug("Issuing the command "+cmd);
+ odebug << "Issuing the command "+cmd << oendl;
system( cmd);
if( QFile::exists(thatFile))
remove (thatFile);
if(isPgWhole) {
if( rename("pgwhole","PGWHOLE.TXT") !=0)
- qDebug("rename failed");
+ odebug << "rename failed" << oendl;
} else {
if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
- qDebug("rename failed");
+ odebug << "rename failed" << oendl;
}
#endif
#ifdef Q_WS_QWS
- qDebug("Issuing the command "+cmd);
+ odebug << "Issuing the command "+cmd << oendl;
system( cmd);
if( QFile::exists(thatFile))
remove(thatFile);
if(isPgWhole) {
if( rename("pgwhole","PGWHOLE.TXT") !=0)
- qDebug("rename failed");
+ odebug << "rename failed" << oendl;
} else {
if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
- qDebug("rename failed");
+ odebug << "rename failed" << oendl;
}
#endif
// remove( zipFile);
return true;
}
else if(exit==QMessageBox::No) {
- // qDebug("unzip");
+ // odebug << "unzip" << oendl;
return false;
}
}
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
index c9149ac..a226258 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
@@ -11,15 +11,19 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
+
//#include "gutenbrowserData.h"
#include "gutenbrowser.h"
+/* OPIE */
+#include <opie2/odebug.h>
#include <qpe/config.h>
#include <qpe/fontdatabase.h>
#include <qpe/menubutton.h>
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
+/* QT */
#include <qfontinfo.h>
#include <qtoolbutton.h>
@@ -39,7 +43,7 @@ void Gutenbrowser::initSlots() {
}
void Gutenbrowser::initConfig() {
-//qDebug("Starting configuration.");
+//odebug << "Starting configuration." << oendl;
QDir library(local_library);
if ( !library.exists()) {
library.mkdir(local_library, TRUE);
@@ -57,7 +61,7 @@ void Gutenbrowser::initConfig() {
// #endif
}
- // qDebug( "init file is %s",iniFile.latin1());
+ // odebug << "init file is " << iniFile << "" << oendl;
#ifdef Q_WS_QWS
useSplitter=FALSE;
@@ -147,9 +151,9 @@ void Gutenbrowser::initConfig() {
qExit=config.readEntry("queryExit","TRUE");
if(qExit=="TRUE") {
b_queryExit=TRUE;
-// qDebug("Please query before leaving the library.");
+// odebug << "Please query before leaving the library." << oendl;
} else {
-// qDebug("Please DO NOT query before leaving the library.");
+// odebug << "Please DO NOT query before leaving the library." << oendl;
b_queryExit=FALSE;
}
// bookmarks
@@ -161,7 +165,7 @@ void Gutenbrowser::initConfig() {
void Gutenbrowser::initMenuBar()
{
-// qDebug("Starting menu init.");
+// odebug << "Starting menu init." << oendl;
// menuBar entry fileMenu
menubar = new QPEMenuBar(this);
@@ -207,7 +211,7 @@ void Gutenbrowser::initMenuBar()
void Gutenbrowser::initButtonBar()
{
-//qDebug("Starting buttonbar init.");
+//odebug << "Starting buttonbar init." << oendl;
OpenButton = new QPushButton( this, "OpenButton" );
OpenButton->setFocusPolicy( QWidget::TabFocus );
@@ -241,7 +245,7 @@ void Gutenbrowser::initButtonBar()
dictionaryButton->setFocusPolicy( QWidget::TabFocus );
InfoBar = new QPushButton( this, "Info_Bar" );
-// qDebug("Infobar");
+// odebug << "Infobar" << oendl;
// if(!useSplitter) {
buttonsHidden=FALSE;
@@ -293,7 +297,7 @@ void Gutenbrowser::initView()
QString italic=cfg.readEntry("Italic","FALSE");
if(italic=="TRUE") {
- qDebug("Set Italic font");
+ odebug << "Set Italic font" << oendl;
defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround
defaultFont.setItalic(TRUE);
}
diff --git a/noncore/apps/opie-gutenbrowser/helpme.cpp b/noncore/apps/opie-gutenbrowser/helpme.cpp
index 6a9b8c0..53e0236 100644
--- a/noncore/apps/opie-gutenbrowser/helpme.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpme.cpp
@@ -14,15 +14,20 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
#include "helpme.h"
#include "helpwindow.h"
+/* OPIE */
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+
+/* QT */
#include <qprogressdialog.h>
#include <qlayout.h>
+/* STD */
#include <sys/stat.h>
#include <unistd.h>
@@ -111,7 +116,7 @@ void HelpMe::help()
{
QString msg ;
msg=QPEApplication::qpeDir()+"help/html/gutenbrowser-index.html"; // or where ever this ends up to be
-qDebug(msg);
+odebug << msg << oendl;
QString url = "file://"+msg;
goGetit( url);
diff --git a/noncore/apps/opie-gutenbrowser/main.cpp b/noncore/apps/opie-gutenbrowser/main.cpp
index 5c3348c..71c836d 100644
--- a/noncore/apps/opie-gutenbrowser/main.cpp
+++ b/noncore/apps/opie-gutenbrowser/main.cpp
@@ -37,7 +37,7 @@ OPIE_EXPORT_APP( OApplicationFactory<Gutenbrowser> )
// // {
// // case 'v': // help
// // printf("Gutenbrowser: "VERSION"\n");
-// // // qDebug("Gutenbrowser: "VERSION);
+// // // odebug << "Gutenbrowser: "VERSION << oendl;
// // // return 0;
// // break;
// // case 't': // current time 19:34:20 04/03/00
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index bd44ce6..0267416 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -18,20 +18,23 @@
/* OPIE */
#include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
#include <qpe/applnk.h>
#include <qpe/config.h>
#include <qpe/qpeapplication.h>
using namespace Opie::Ui;
-#include <stdlib.h>
+/* QT */
#include <qtextstream.h>
#include <qfileinfo.h>
+/* STD */
#if defined(_WS_WIN_)
#include <windows.h>
#else
#include <unistd.h>
-#include "sys/stat.h"
+#include <stdlib.h>
+#include <sys/stat.h>
#endif
OpenEtext::OpenEtext(QWidget *parent, QString name) : QDialog(parent,name,true)
@@ -134,7 +137,7 @@ OpenFileButton->setDown(TRUE);
if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() ) {
filer = str;
- qDebug("Open file: "+str);
+ odebug << "Open file: "+str << oendl;
// QStringList::ConstIterator f;
// QString fileTemp;
@@ -164,19 +167,19 @@ OpenFileButton->setDown(TRUE);
if( s_fileName.right(4) == ".zip") { // unzip that sucker....
s_fileName = s_fileName.left( s_fileName.length() - 4);
if( chdir((const char*)local_library.latin1())!=0)
- qDebug("chdir failed.");// QString cmd = "gunzip -d " + filer + " -d " + local_library;
+ odebug << "chdir failed." << oendl; // QString cmd = "gunzip -d " + filer + " -d " + local_library;
cmd = "gunzip -S .zip " + filer;
fileName = local_library + s_fileName + ".txt";
system( cmd);
}
// this renames the .txt to .etx!!
else /*if( s_fileName.right(4) == ".txt" || if( s_fileName.right(4) == ".TXT"))*/ {
-// qDebug("Filename is "+fileName);
+// odebug << "Filename is "+fileName << oendl;
s_fileName = fileName;
s_fileName.replace( s_fileName.length()-3,3,"gtn");// s_fileName.replace( s_fileName.length()-3,3,"etx");
rename(fileName.latin1(),s_fileName.latin1());
fileName = s_fileName;
-// qDebug("Filename is now "+fileName);
+// odebug << "Filename is now "+fileName << oendl;
}
} else
fileName = str;
@@ -187,22 +190,22 @@ OpenFileButton->setDown(TRUE);
name_file = fi.fileName();
name_file = name_file.left(name_file.length() - 4);
- qDebug("Setting doclink");
+ odebug << "Setting doclink" << oendl;
DocLnk lnk;
- qDebug("name is " + name_file);
+ odebug << "name is " + name_file << oendl;
lnk.setName(name_file); //sets file name
- qDebug("Title is "+title);
+ odebug << "Title is "+title << oendl;
lnk.setComment(title);
QListBox_1->clear();
getTitles();
- qDebug("Filename is "+fileName);
+ odebug << "Filename is "+fileName << oendl;
lnk.setFile(fileName); //sets File property
lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
lnk.setExec(fileName);
lnk.setIcon("gutenbrowser/Gutenbrowser");
if(!lnk.writeLink())
- qDebug("Writing doclink did not work");
+ odebug << "Writing doclink did not work" << oendl;
} // end of for each file name....
OpenFileButton->setDown(FALSE);
@@ -219,13 +222,13 @@ bool OpenEtext::FindTitle( QString filename)
QFileInfo fi(filename);
name = fi.fileName();
- qDebug("filename to open is " + name);
+ odebug << "filename to open is " + name << oendl;
QFile indexLib( filename);
bool findCheck = FALSE;
// int Titlenumber=0;
if ( indexLib.open( IO_ReadOnly) ) {
- qDebug("file opened successfully");
+ odebug << "file opened successfully" << oendl;
QTextStream indexStream( &indexLib );
QString target = "Project Gutenberg Etext of";
QString target2 = "Project Gutenberg Etext";
@@ -239,7 +242,7 @@ bool OpenEtext::FindTitle( QString filename)
title = indexLine.mid( indexLine.find(target, 0, TRUE) + (target.length()) , indexLine.find("\r", 0, TRUE));
title = title.left( title.find( "*",0, TRUE));
title = title.stripWhiteSpace ();
-// qDebug("Found the title 1 and it is %s", title.latin1());
+// odebug << "Found the title 1 and it is " << title << "" << oendl;
// QListBox_1->insertItem ( title);
}
if( indexLine.find( target2, 0, TRUE) > -1 && !findCheck) {
@@ -247,7 +250,7 @@ bool OpenEtext::FindTitle( QString filename)
title = indexLine.mid( indexLine.find( target2, 0, TRUE ) + ( target2.length()) , indexLine.find("\r", 0, TRUE) );
title = title.left( title.find( "*",0, TRUE));
title = title.stripWhiteSpace ();
-// qDebug("Found the title 2 and it is %s", title.latin1());
+// odebug << "Found the title 2 and it is " << title << "" << oendl;
// QListBox_1->insertItem ( title);
}
if( indexLine.find( target3, 0, TRUE) > -1 && !findCheck) {
@@ -255,20 +258,20 @@ bool OpenEtext::FindTitle( QString filename)
title = indexLine.mid( indexLine.find( target3, 0, TRUE) + ( target3.length()) , indexLine.find("\r", 0, TRUE));
title = title.left( title.find( "*",0, TRUE));
title = title.stripWhiteSpace ();
-// qDebug("Found the title 3 and it is %s", title.latin1());
+// odebug << "Found the title 3 and it is " << title << "" << oendl;
}
if( indexLine.find( target4, 0, TRUE) > -1 && !findCheck) {
findCheck = TRUE;
title = indexLine.mid( indexLine.find( target4, 0, TRUE) + ( target4.length()) , indexLine.find("\r", 0, TRUE));
title = title.left( title.find( "*",0, TRUE));
title = title.stripWhiteSpace ();
-// qDebug("Found the title 4 and it is %s", title.latin1());
+// odebug << "Found the title 4 and it is " << title << "" << oendl;
}
} //endof file
indexLib.close();
if( !findCheck || title.length() < 2) {
- qDebug("Trying hard to find title from GUTINDEX.ALL");
+ odebug << "Trying hard to find title from GUTINDEX.ALL" << oendl;
title = titleFromLibrary( filename);
findCheck = TRUE;
}
@@ -293,7 +296,7 @@ bool OpenEtext::FindTitle( QString filename)
i= i_numofFiles+1;
}
if(title.length()<3) {
-// qDebug("title is empty");
+// odebug << "title is empty" << oendl;
title="Unknown";
}
config.writeEntry( filename,title);
@@ -343,13 +346,13 @@ QString OpenEtext::titleFromLibrary( QString fileName)
title = indexLine.mid( 9, 50);
// title = indexLine.mid( 26, indexLine.length() );
title = title.stripWhiteSpace ();
-// qDebug("Finally Found the title and it is\n %s", title.latin1());
+// odebug << "Finally Found the title and it is\n " << title << "" << oendl;
// QListBox_1->insertItem ( title);
}
} //end while loop
}
else
- qDebug("Error opening library index "+ local_index);
+ odebug << "Error opening library index "+ local_index << oendl;
return title;
}
@@ -414,7 +417,7 @@ void OpenEtext::removeSelection()
QString file_title = config.readEntry( s_filename, "");
if(title_text == file_title) {
rem=i;
-//qDebug("file title to remove is "+file_title);
+//odebug << "file title to remove is "+file_title << oendl;
selFile = s_filename;
config.removeEntry( s_filename); //removes file=title
}
@@ -482,7 +485,7 @@ void OpenEtext::editTitle() {
int currentItem=QListBox_1->currentItem();
QString title_text = QListBox_1->text( currentItem);
-//qDebug("Selected "+title_text);
+//odebug << "Selected "+title_text << oendl;
Config config("Gutenbrowser");
config.setGroup( "Files" );
@@ -496,15 +499,15 @@ void OpenEtext::editTitle() {
QString s_filename = config.readEntry(fileNum, "" );
config.setGroup( "Titles" );
QString file_title = config.readEntry( s_filename, "");
-//qDebug("file_title is "+file_title);
+//odebug << "file_title is "+file_title << oendl;
if(title_text == file_title ) {
selFile = s_filename;
-//qDebug("Edit: "+ file_title );
+//odebug << "Edit: "+ file_title << oendl;
i=i_numofFiles+1;
Edit_Title *titleEdit;
titleEdit = new Edit_Title(this,file_title ,TRUE);
if(titleEdit->exec() !=0) {
-//qDebug(titleEdit->newTitle);
+//odebug << titleEdit->newTitle << oendl;
config.writeEntry( s_filename, titleEdit->newTitle);
QListBox_1->removeItem(currentItem);
QListBox_1->insertItem ( QPixmap( QPEApplication::qpeDir()+"pics/gutenbrowser/gutenbrowser_sm.png"), titleEdit->newTitle, currentItem);
diff --git a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
index bfd9c26..8cc83da 100644
--- a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
@@ -13,17 +13,19 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include "optionsDialog.h"
-#include <qpe/config.h>
-#include "fontDialog.h"
-// #include <unistd.h>
-// #include <stdio.h>
-// #include <stdlib.h>
+#include "optionsDialog.h"
+#include "fontDialog.h"
//#include "ftpsitedlg.h"
//#include "browserDialog.h"
//#define Inherited QDialog
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
#include <qfont.h>
#include <qcheckbox.h>
#include <qcombobox.h>
@@ -38,6 +40,12 @@
#ifndef Q_WS_QWS
#include <qwhatsthis.h>
#endif
+
+/* STD */
+// #include <unistd.h>
+// #include <stdio.h>
+// #include <stdlib.h>
+
/*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
@@ -60,7 +68,7 @@ optionsDialog::optionsDialog( QWidget* parent, const char* name, bool modal, WF
optionsDialog::~optionsDialog()
{
-//qDebug("OnExit()");
+//odebug << "OnExit()" << oendl;
// writeConfig();
}
@@ -125,11 +133,11 @@ void optionsDialog::getConfig()
QString qExit=config.readEntry("queryExit","TRUE");
if(qExit=="TRUE") {
cb_queryExit->setChecked(TRUE);
- qDebug("Config Setting b_qExit=TRUE;");
+ odebug << "Config Setting b_qExit=TRUE;" << oendl;
b_qExit=TRUE;
} else {
cb_queryExit->setChecked(FALSE);
- qDebug("ConfigSetting b_qExit=FALSE;");
+ odebug << "ConfigSetting b_qExit=FALSE;" << oendl;
b_qExit=FALSE;
}
@@ -141,7 +149,7 @@ void optionsDialog::getConfig()
// // void optionsDialog::setStyle( int index) {
-// // qDebug("Set style%d",index);
+// // odebug << "Set style" << index << "" << oendl;
// // //int styleInt= index;
// // styleChanged=TRUE;
// // if( ComboBoxStyle->currentItem()==0) styleInt=0;//"styleMetal"));
@@ -167,15 +175,15 @@ void optionsDialog::slotQueryExit()
{
Config config("Gutenbrowser");
config.setGroup("General");
- qDebug("writing queryExit");
+ odebug << "writing queryExit" << oendl;
if(cb_queryExit->isChecked()) {
b_qExit=TRUE;
config.writeEntry("queryExit","TRUE");
- qDebug("WritingConfig queryExit=TRUE");
+ odebug << "WritingConfig queryExit=TRUE" << oendl;
} else {
b_qExit=FALSE;
config.writeEntry("queryExit","FALSE");
- qDebug("WritingConfig queryExit=FALSE");
+ odebug << "WritingConfig queryExit=FALSE" << oendl;
}
config.write();
}
@@ -187,7 +195,7 @@ void optionsDialog::slotQueryExit()
// }
// void optionsDialog::lineEditChanged(const QString &editText) {
-// qDebug(editText);
+// odebug << editText << oendl;
// }
void optionsDialog::changeFonts()
diff --git a/noncore/apps/opie-reader/Aportis.cpp b/noncore/apps/opie-reader/Aportis.cpp
index 2f8cdc3..06f44a4 100644
--- a/noncore/apps/opie-reader/Aportis.cpp
+++ b/noncore/apps/opie-reader/Aportis.cpp
@@ -28,14 +28,14 @@ CList<Bkmk>* Aportis::getbkmklist()
{
char name[17];
name[16] = '\0';
-// qDebug("Record:%d, Length:%u",i,recordlength(i));
+// odebug << "Record:" << i << ", Length:" << recordlength(i) << "" << oendl;
gotorecordnumber(i);
fread(name,1,16,fin);
unsigned long lcn;
fread(&lcn,sizeof(lcn),1,fin);
lcn ^= 0xa5a5a5a5;
lcn = SwapLong(lcn);
-// qDebug("Bookmark:%s:%u", name,lcn);
+// odebug << "Bookmark:" << name << ":" << lcn << "" << oendl;
tchar tname[17];
memset(tname, 0, sizeof(tname));
for (int i = 0; name[i] != 0; i++)
@@ -121,7 +121,7 @@ int Aportis::OpenFile(const char *src)
PeanutHeader hdr0;
gotorecordnumber(0);
fread(&hdr0, sizeof(hdr0), 1, fin);
-// qDebug("Version:%x", ntohs(hdr0.Version));
+// odebug << "Version:" << ntohs(hdr0.Version) << "" << oendl;
if (hdr0.Version && 0x0200)
{
bCompressed = 2;
@@ -182,7 +182,7 @@ int Aportis::OpenFile(const char *src)
cbptr = 0;
outptr = 0;
refreshbuffer();
-// qDebug("Number of records:[%u,%u]", nRecs, nRecs2);
+// odebug << "Number of records:[" << nRecs << "," << nRecs2 << "]" << oendl;
return ret;
}
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 16bc1f1..480c240 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -217,15 +217,15 @@ CList<Bkmk>* BkmkFile::readall()
case 6:
isUpgraded = false;
bl = readall00(read06);
-// qDebug("Correct version!");
+// odebug << "Correct version!" << oendl;
break;
case 5:
isUpgraded = true;
bl = readall00(read05);
-// qDebug("Known version!");
+// odebug << "Known version!" << oendl;
break;
default:
-// qDebug("Unknown version!");
+// odebug << "Unknown version!" << oendl;
isUpgraded = true;
bl = readall00(read05);
}
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index 4fbab93..68391b8 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -32,7 +32,7 @@ linkType BuffDoc::hyperlink(unsigned int n, QString& wrd)
void BuffDoc::locate(unsigned int n)
{
- // //qDebug("BuffDoc:locating:%u",n);
+ // //odebug << "BuffDoc:locating:" << n << "" << oendl;
lastword.empty();
lastsizes[0] = laststartline = n;
#ifdef NEWLINEBREAK
@@ -42,7 +42,7 @@ void BuffDoc::locate(unsigned int n)
#endif
// tchar linebuf[1024];
if (exp != NULL) exp->locate(n);
- // //qDebug("BuffDoc:Located");
+ // //odebug << "BuffDoc:Located" << oendl;
}
#ifdef NEWLINEBREAK
@@ -188,7 +188,7 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border)
margindone = true;
}
else buff->empty();
-// //qDebug("Buff:%s Lastword:%s", (const char*)toQString(buff->data()), (const char*)toQString(lastword.data()));
+// //odebug << "Buff:" << toQString(buff->data()) << " Lastword:" << toQString(lastword.data()) << "" << oendl;
lastcheck = len = buff->length();
unsigned int slen = buff->width(len);
if (slen > w)
@@ -322,8 +322,8 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, int cw, unsigned char _border)
int BuffDoc::openfile(QWidget* _parent, const char *src)
{
- // //qDebug("BuffDoc:Openfile:%s", src);
- // //qDebug("Trying aportis %x",exp);
+ // //odebug << "BuffDoc:Openfile:" << src << "" << oendl;
+ // //odebug << "Trying aportis " << exp << "" << oendl;
if (exp != NULL) delete exp;
lastword.empty();
lastsizes[0] = laststartline = 0;
@@ -378,7 +378,7 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
if (ret != 0)
{
delete exp;
- //qDebug("Trying ppms");
+ //odebug << "Trying ppms" << oendl;
exp = new ppm_expander;
ret = exp->openfile(src);
}
@@ -386,7 +386,7 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
{
delete exp;
exp = new Text;
-// //qDebug("Trying text");
+// //odebug << "Trying text" << oendl;
ret = exp->openfile(src);
}
@@ -396,7 +396,7 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
QMessageBox::information(_parent, PROGNAME, "Unknown file compression type","Try another file");
return ret;
}
- // //qDebug("Doing final open:%x:%x",exp,filt);
+ // //odebug << "Doing final open:" << exp << ":" << filt << "" << oendl;
lastword.empty();
lastsizes[0] = laststartline = 0;
@@ -407,6 +407,6 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
#endif
exp->locate(0);
filt->setsource(exp);
- // //qDebug("BuffDoc:file opened");
+ // //odebug << "BuffDoc:file opened" << oendl;
return 0;
}
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index ec36fb2..b137ac3 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -40,7 +40,7 @@ void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
{
int i;
-// //qDebug("Trying 2");
+// //odebug << "Trying 2" << oendl;
len = rhs.len;
m_maxstyle = rhs.m_maxstyle;
m_ascent = rhs.m_ascent;
@@ -58,7 +58,7 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
for (i = 0; rhs[i] != '\0'; i++) (*this)[i] = rhs[i];
(*this)[i] = '\0';
len = i;
-// //qDebug("Tried 2");
+// //odebug << "Tried 2" << oendl;
return *this;
}
@@ -208,7 +208,7 @@ int CDrawBuffer::width(int numchars, bool onscreen, int scwidth, unsigned char _
else
{
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
cx += lw;
lastspace = nsp;
@@ -317,7 +317,7 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
CStyle currentstyle = textstart->style;
QFont f((currentstyle.isMono() && fc->hasCourier()) ? fc->fixedfontname() : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
// f.setUnderline(currentstyle.isUnderline());
-// if (currentstyle.isUnderline()) qDebug("UNDERLINE");
+// if (currentstyle.isUnderline()) odebug << "UNDERLINE" << oendl;
_p->setFont(f);
QString str = text.mid(textstart->start, end-textstart->start);
#if defined(OPIE) || !defined(USEQPE)
@@ -408,7 +408,7 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
spacenumber++;
int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar;
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
_p->drawText( cx, _y+voffset, nstr);
cx += lw+nexttoadd;
@@ -418,7 +418,7 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
else
{
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
_p->drawText( cx, _y+voffset, nstr);
cx += lw;
@@ -470,14 +470,14 @@ linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
end = (textend != segs.end()) ? textend->start : len;
currentstyle = textstart->style;
/*
- if (currentstyle.isPicture()) qDebug("Passed thru picture");
- if (currentstyle.getLink()) qDebug("Passed thru link");
- //qDebug("islink:%d - %d", numchars, end);
+ if (currentstyle.isPicture()) odebug << "Passed thru picture" << oendl;
+ if (currentstyle.getLink()) odebug << "Passed thru link" << oendl;
+ //odebug << "islink:" << numchars << " - " << end << "" << oendl;
*/
textstart = textend;
}
while (textend != segs.end() && end <= numchars);
-// if (currentstyle.isPicture()) qDebug("Clicked on picture");
+// if (currentstyle.isPicture()) odebug << "Clicked on picture" << oendl;
if (currentstyle.getPictureLink())
{
tgt = currentstyle.getPictureLinkData();
@@ -539,7 +539,7 @@ void CDrawBuffer::resize()
if (m_bSop)
{
int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10;
-// qDebug("ExtraSpace:%d", xt);
+// odebug << "ExtraSpace:" << xt << "" << oendl;
m_ascent += xt;
m_lineSpacing += xt;
}
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index d64abb4..b356ba5 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -80,7 +80,7 @@ QTReader::QTReader( const QString& filename, QWidget *parent=0, const tchar *nam
m_fm(NULL)
{
init();
-// // qDebug("Load_file(1)");
+// // odebug << "Load_file(1)" << oendl;
load_file((const tchar*)filename);
}
*/
@@ -91,7 +91,7 @@ void QTReader::mouseMoveEvent(QMouseEvent* _e)
mouseUpOn = !(_e->pos().x() == -1);
- qDebug("MouseMove:[%d, %d]", _e->pos().x(), _e->pos().y());
+ odebug << "MouseMove:[" << _e->pos().x() << ", " << _e->pos().y() << "]" << oendl;
}
*/
long QTReader::real_delay()
@@ -104,7 +104,7 @@ void QTReader::mousePressEvent( QMouseEvent* _e )
buffdoc.unsuspend();
if (_e->button() == RightButton)
{
-// qDebug("MousePress");
+// odebug << "MousePress" << oendl;
mouseUpOn = false;
if (m_swapmouse)
{
@@ -317,7 +317,7 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
if (t->width(i, true, width(), m_border) > tgt)
{
wrd = toQString(t->data()+first, i - first);
-// qDebug("Got %s", (const char *)wrd);
+// odebug << "Got " << (const char *)wrd << "" << oendl;
break;
}
while (!QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
@@ -327,7 +327,7 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
}
if (!wrd.isEmpty())
{
-// qDebug("Selected:%s", (const char*)wrd);
+// odebug << "Selected:" << wrd << "" << oendl;
emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data()));
}
}
@@ -339,7 +339,7 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
{
if (mouseUpOn)
{
-// qDebug("MouseRelease");
+// odebug << "MouseRelease" << oendl;
if (_e->x() > width() - m_border)
{
locate(buffdoc.startSection()+((buffdoc.endSection()-buffdoc.startSection())*_e->y()+height()/2)/height());
@@ -394,7 +394,7 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
}
case ePicture:
{
-// qDebug("Picture:%x", tgt);
+// odebug << "Picture:" << tgt << "" << oendl;
QImage* pm = buffdoc.getPicture(tgt);
if (pm != NULL)
{
@@ -410,7 +410,7 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
case eNone:
break;
default:
-// qDebug("Unknown linktype");
+// odebug << "Unknown linktype" << oendl;
return;
}
if (m_swapmouse)
@@ -696,7 +696,7 @@ void QTReader::setautoscroll(bool _sc)
#ifdef _SCROLLPIPE
if (!m_pipetarget.isEmpty())
{
-// qDebug("Opening pipe to %s", (const char*)m_pipetarget);
+// odebug << "Opening pipe to " << m_pipetarget << "" << oendl;
m_pipeout = popen((const char*)m_pipetarget, "w");
m_isPaused = false;
}
@@ -823,24 +823,24 @@ void QTReader::drawFonts( QPainter *p )
{
if (bDoUpdates)
{
-// qDebug("How refreshing...");
+// odebug << "How refreshing..." << oendl;
if (buffdoc.empty()) return;
setfont();
if (m_lastwidth != width())
{
-// qDebug("Not Optimised %d", m_lastwidth);
+// odebug << "Not Optimised " << m_lastwidth << "" << oendl;
m_lastwidth = width();
m_lastheight = height();
buffdoc.setwidth(m_lastwidth-2*m_border);
locate(pagelocate());
-// qDebug("Not Optimised %d", m_lastwidth);
+// odebug << "Not Optimised " << m_lastwidth << "" << oendl;
}
else
{
int newht = height();
if (m_lastheight > newht)
{
-// qDebug("Optimised < %d %d %d", numlines, m_lastheight, newht);
+// odebug << "Optimised < " << numlines << " " << m_lastheight << " " << newht << "" << oendl;
int ypos = 0;
for (int i = 0; i < numlines; i++)
{
@@ -851,19 +851,19 @@ void QTReader::drawFonts( QPainter *p )
break;
}
}
-// qDebug("Optimised < %d", numlines);
+// odebug << "Optimised < " << numlines << "" << oendl;
m_lastheight = newht;
}
else if (m_lastheight < newht)
{
-// qDebug("Optimised > %d", numlines);
+// odebug << "Optimised > " << numlines << "" << oendl;
int ypos = 0;
for (int i = 0; i <= numlines; i++)
{
ypos += textarray[i]->lineSpacing();
}
fillbuffer(numlines+1, ypos, newht);
-// qDebug("Optimised > %d", numlines);
+// odebug << "Optimised > " << numlines << "" << oendl;
}
if (numlines > 0)
{
@@ -897,7 +897,7 @@ void QTReader::drawFonts( QPainter *p )
/*
else
{
- qDebug("Not so refreshing...");
+ odebug << "Not so refreshing..." << oendl;
}
*/
}
@@ -1028,7 +1028,7 @@ void QTReader::paintEvent( QPaintEvent * )
/*
void QTReader::resizeEvent( QResizeEvent * )
{
-// // qDebug("resize:(%u,%u)", width(), height());
+// // odebug << "resize:(" << width() << "," << height() << ")" << oendl;
// bgroup->move( width()-bgroup->width(), 0 );
}
*/
@@ -1053,11 +1053,11 @@ bool QTReader::locate(unsigned long n) {
//printf("Locate\n");
buffdoc.unsuspend();
buffdoc.locate(n);
-// // qDebug("&buffdoc.located");
+// // odebug << "&buffdoc.located" << oendl;
fillbuffer();
-// // qDebug("&Buffer filled");
+// // odebug << "&Buffer filled" << oendl;
update();
-// // qDebug("&Located");
+// // odebug << "&Located" << oendl;
return true;
}
@@ -1117,12 +1117,12 @@ bool QTReader::fillbuffer(int reuse, int ht, int newht)
void QTReader::dopagedn()
{
-// qDebug("HEIGHT(2):%d", m_lastheight);
+// odebug << "HEIGHT(2):" << m_lastheight << "" << oendl;
buffdoc.unsuspend();
int skip = 0, ypos = 0;
if (locate() != mylastpos)
{
-//// qDebug("Jumping to %u", mylastpos);
+//// odebug << "Jumping to " << mylastpos << "" << oendl;
jumpto(mylastpos);
}
CDrawBuffer* reusebuffer = textarray[numlines];
@@ -1313,13 +1313,13 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
buffdoc.setwidth(m_lastwidth-2*m_border);
bRC = true;
buffdoc.setContinuous(m_continuousDocument);
-// // qDebug("buffdoc.openfile done");
+// // odebug << "buffdoc.openfile done" << oendl;
locate(lcn);
-// // qDebug("buffdoc.locate done");
+// // odebug << "buffdoc.locate done" << oendl;
}
setfilter(getfilter());
update();
-// // qDebug("Updated");
+// // odebug << "Updated" << oendl;
return bRC;
}
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index b072854..f18cb59 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -17,20 +17,48 @@
** not clear to you.
**
**********************************************************************/
+
#include "useqpe.h"
-#include <qregexp.h>
-#include <qclipboard.h>
-#include <qwidgetstack.h>
+#include "QTReader.h"
+#include "GraphicWin.h"
+#include "Bkmks.h"
+#include "cbkmkselector.h"
+#include "infowin.h"
+#include "ToolbarPrefs.h"
+#include "Prefs.h"
+#include "CAnnoEdit.h"
+#include "QFloatBar.h"
+#include "FixedFont.h"
+#include "URLDialog.h"
+#include "QTReaderApp.h"
+#include "CDrawBuffer.h"
+#include "Filedata.h"
+#include "opie.h"
+#include "names.h"
+#include "CEncoding_tables.h"
+#include "CloseDialog.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#ifdef USEQPE
+#include <qpe/menubutton.h>
+#include <qpe/fontdatabase.h>
+#include <qpe/global.h>
+#include <qpe/applnk.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
+#endif
+
+/* QT */
#ifdef USEQPE
#include <qmenubar.h>
#include <qtoolbar.h>
#endif
+#include <qregexp.h>
+#include <qclipboard.h>
+#include <qwidgetstack.h>
#include <qmenubar.h>
#include <qtoolbar.h>
-#ifdef USEQPE
-#include <qpe/menubutton.h>
-#include <qpe/fontdatabase.h>
-#endif
#include <qcombobox.h>
#include <qpopupmenu.h>
#include <qaction.h>
@@ -39,33 +67,14 @@
#include <qtoolbutton.h>
#include <qspinbox.h>
#include <qobjectlist.h>
-#ifdef USEQPE
-#include <qpe/global.h>
-#include <qpe/applnk.h>
-#endif
#include <qfileinfo.h>
-#include <stdlib.h> //getenv
#include <qprogressbar.h>
-#ifdef USEQPE
-#include <qpe/config.h>
-#endif
#include <qbuttongroup.h>
#include <qradiobutton.h>
-#ifdef USEQPE
-#include <qpe/qcopenvelope_qws.h>
-#endif
-#include "QTReader.h"
-#include "GraphicWin.h"
-#include "Bkmks.h"
-#include "cbkmkselector.h"
-#include "infowin.h"
-#include "ToolbarPrefs.h"
-#include "Prefs.h"
-#include "CAnnoEdit.h"
-#include "QFloatBar.h"
-#include "FixedFont.h"
-#include "URLDialog.h"
-//#include <qpe/fontdatabase.h>
+
+/* STD */
+#include <stdlib.h> //getenv
+
#ifdef USEQPE
#include <qpe/resource.h>
@@ -75,14 +84,6 @@
#include "qfiledialog.h"
#endif
-#include "QTReaderApp.h"
-#include "CDrawBuffer.h"
-#include "Filedata.h"
-#include "opie.h"
-#include "names.h"
-#include "CEncoding_tables.h"
-#include "CloseDialog.h"
-
bool CheckVersion(int&, int&, char&);
#ifdef _WINDOWS
@@ -125,7 +126,7 @@ void QTReaderApp::listBkmkFiles()
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
@@ -146,7 +147,7 @@ void QTReaderApp::listBkmkFiles()
bkmkselector->insertItem(fi->fileName());
cnt++;
- //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+ //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
++it; // goto next list element
}
@@ -214,8 +215,8 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
m_url_localfile = false;
m_url_globalfile = false;
ftime(&m_lastkeytime);
-//// qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir());
-//// qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml"));
+//// odebug << "Application directory = " << (const tchar *)QPEApplication::documentDir() << "" << oendl;
+//// odebug << "Application directory = " << (const tchar *)Global::applicationFileName("uqtreader" << "" << oendl;
m_bcloseDisabled = true;
m_disableesckey = false;
@@ -243,7 +244,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
m_rot = 270;
}
-// qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
+// odebug << "Initial Rotation(" << m_rot << "):" << rot << "" << oendl;
*/
m_autogenstr = "^ *[A-Z].*[a-z] *$";
@@ -260,13 +261,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
#else
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
QFileInfo fi(d, INIFILE);
-// qDebug("Path:%s", (const char*)fi.absFilePath());
+// odebug << "Path:" << fi.absFilePath() << "" << oendl;
Config config(fi.absFilePath());
#endif
config.setGroup("Toolbar");
@@ -356,7 +357,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
// don't need the close visible, it is redundant...
importSelector->setCloseVisible( FALSE );
*/
-// qDebug("Reading file list");
+// odebug << "Reading file list" << oendl;
readfilelist();
reader = new QTReader( editorStack );
@@ -367,7 +368,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
#endif
-// qDebug("Reading config");
+// odebug << "Reading config" << oendl;
// Config config( APPDIR );
config.setGroup( "View" );
m_debounce = config.readNumEntry("Debounce", 0);
@@ -769,7 +770,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
m_fontBar->setHorizontalStretchable( TRUE );
-// qDebug("Font selector");
+// odebug << "Font selector" << oendl;
m_fontSelector = new QComboBox(false, m_fontBar);
m_fontBar->setStretchableWidget( m_fontSelector );
{
@@ -801,17 +802,17 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
connect(qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
this, SLOT( msgHandler(const QCString&,const QByteArray&) ) );
#endif
-// qDebug("Initing");
+// odebug << "Initing" << oendl;
reader->init();
-// qDebug("Inited");
+// odebug << "Inited" << oendl;
// m_buttonAction[m_spaceTarget]->setOn(true);
-// qDebug("fonting");
+// odebug << "fonting" << oendl;
do_setfont(reader->m_fontname);
if (!reader->m_lastfile.isEmpty())
{
-// qDebug("doclnk");
+// odebug << "doclnk" << oendl;
// doc = new DocLnk(reader->m_lastfile);
-// qDebug("doclnk done");
+// odebug << "doclnk done" << oendl;
if (pOpenlist != NULL)
{
@@ -831,24 +832,24 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
{
break;
}
-// qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));
+// odebug << "Item:" << toQString(CFiledata(p->anno()).name()) << "" << oendl;
p = NULL;
}
if (p != NULL)
{
-// qDebug("openfrombkmk");
+// odebug << "openfrombkmk" << oendl;
if (!openfrombkmk(p))
showEditTools();
}
else
{
-// qDebug("openfile");
+// odebug << "openfile" << oendl;
openFile( reader->m_lastfile );
}
}
else
{
-// qDebug("Openfile 2");
+// odebug << "Openfile 2" << oendl;
if (!reader->m_lastfile.isEmpty())
openFile( reader->m_lastfile );
}
@@ -870,7 +871,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
config.writeEntry("BkmkType", bkmktype);
config.writeEntry("Minor", (int)minor);
}
-// qDebug("finished update");
+// odebug << "finished update" << oendl;
}
void QTReaderApp::addtoolbars(Config* config)
@@ -1028,14 +1029,14 @@ QToolBar* QTReaderApp::filebar()
switch (m_tbpol)
{
case cesSingle:
-// qDebug("Setting filebar to menubar");
+// odebug << "Setting filebar to menubar" << oendl;
fileBar = menubar;
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesMenuTool:
case cesMultiple:
-// qDebug("Creating new file bar");
+// odebug << "Creating new file bar" << oendl;
fileBar = new QToolBar("File", this, m_tbposition);
break;
}
@@ -1053,7 +1054,7 @@ QToolBar* QTReaderApp::viewbar()
viewBar = new QToolBar("View", this, m_tbposition);
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesSingle:
case cesMenuTool:
viewBar = fileBar;
@@ -1069,15 +1070,15 @@ QToolBar* QTReaderApp::navbar()
switch (m_tbpol)
{
case cesMultiple:
-// qDebug("Creating new nav bar");
+// odebug << "Creating new nav bar" << oendl;
navBar = new QToolBar("Navigation", this, m_tbposition);
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesSingle:
case cesMenuTool:
navBar = fileBar;
-// qDebug("Setting navbar to filebar");
+// odebug << "Setting navbar to filebar" << oendl;
break;
}
}
@@ -1093,7 +1094,7 @@ QToolBar* QTReaderApp::markbar()
markBar = new QToolBar("Marks", this, m_tbposition);
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesSingle:
case cesMenuTool:
markBar = fileBar;
@@ -1127,7 +1128,7 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
{
QString msg = QString::fromUtf8(_msg);
-//// qDebug("Received:%s", (const char*)msg);
+//// odebug << "Received:" << msg << "" << oendl;
QDataStream stream( _data, IO_ReadOnly );
if ( msg == "info(QString)" )
@@ -1481,7 +1482,7 @@ void QTReaderApp::setfullscreen(bool sfs)
void QTReaderApp::buttonActionSelected(QAction* _a)
{
-//// qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));
+//// odebug << "es:" << _a << " : " << (const char *)(_a->text()) << " (" << ActNameToInt(_a->text()) << ")" << oendl;
m_spaceTarget = ActNameToInt(_a->text());
}
@@ -1563,7 +1564,7 @@ void QTReaderApp::updatefileinfo()
if (reader->m_lastfile.isEmpty()) return;
tchar* nm = fromQString(reader->m_string);
tchar* fl = fromQString(reader->m_lastfile);
-// qDebug("Lastfile:%x", fl);
+// odebug << "Lastfile:" << fl << "" << oendl;
bool notadded = true;
if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;
else
@@ -1577,7 +1578,7 @@ void QTReaderApp::updatefileinfo()
unsigned char* data;
CFiledata fd(iter->anno());
reader->setSaveData(data, dlen, fd.content(), fd.length());
-// qDebug("Filedata(1):%u, %u", fd.length(), dlen);
+// odebug << "Filedata(1):" << fd.length() << ", " << dlen << "" << oendl;
// getstate(data, dlen);
iter->setAnno(data, dlen);
notadded = false;
@@ -1586,7 +1587,7 @@ void QTReaderApp::updatefileinfo()
}
}
}
-// qDebug("Added?:%x", notadded);
+// odebug << "Added?:" << notadded << "" << oendl;
if (notadded)
{
struct stat fnstat;
@@ -1596,7 +1597,7 @@ void QTReaderApp::updatefileinfo()
unsigned char* data;
reader->setSaveData(data, dlen, fd.content(), fd.length());
pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate()));
-// qDebug("Filedata(2):%u, %u", fd.length(), dlen);
+// odebug << "Filedata(2):" << fd.length() << ", " << dlen << "" << oendl;
delete [] data;
}
delete [] nm;
@@ -1611,7 +1612,7 @@ void QTReaderApp::fileOpen()
if (regVisible) regBar->hide();
if (searchVisible) searchBar->hide();
*/
-// qDebug("fileOpen");
+// odebug << "fileOpen" << oendl;
// if (!reader->m_lastfile.isEmpty())
updatefileinfo();
fileOpen2();
@@ -1652,7 +1653,7 @@ void QTReaderApp::fileOpen2()
reader->setFocus();
}
// reader->refresh();
-// qDebug("HEIGHT:%d", reader->m_lastheight);
+// odebug << "HEIGHT:" << reader->m_lastheight << "" << oendl;
}
QString QTReaderApp::usefilebrowser()
@@ -1672,7 +1673,7 @@ QString QTReaderApp::usefilebrowser()
{
fn = fb->getCurrentFile();
}
-// qDebug("Selected %s", (const char*)fn);
+// odebug << "Selected " << fn << "" << oendl;
delete fb;
showEditTools();
return fn;
@@ -1803,7 +1804,7 @@ void QTReaderApp::showprefs()
reader->bpeanut = true;
break;
default:
- qDebug("Format out of range");
+ odebug << "Format out of range" << oendl;
}
reader->bdepluck = prefwin->Depluck();
reader->bdejpluck = prefwin->Dejpluck();
@@ -1863,7 +1864,7 @@ void QTReaderApp::showtoolbarprefs()
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+ owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
@@ -1900,7 +1901,7 @@ void QTReaderApp::showtoolbarprefs()
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+ owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
@@ -2175,7 +2176,7 @@ void QTReaderApp::editFind()
void QTReaderApp::findNext()
{
-// // qDebug("findNext called\n");
+// // odebug << "findNext called\n" << oendl;
#ifdef __ISEARCH
QString arg = searchEdit->text();
#else
@@ -2271,12 +2272,12 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
return false;
}
}
-// qDebug("Found it at %u:%u", pos, offset);
+// odebug << "Found it at " << pos << ":" << offset << "" << oendl;
pbar->hide();
-// qDebug("Hid");
+// odebug << "Hid" << oendl;
reader->locate(pos+offset);
-// qDebug("Loacted");
-// qDebug("page up");
+// odebug << "Loacted" << oendl;
+// odebug << "page up" << oendl;
ret = true;
}
else
@@ -2333,7 +2334,7 @@ void QTReaderApp::search()
void QTReaderApp::openFile( const QString &f )
{
-// qDebug("File:%s", (const char*)f);
+// odebug << "File:" << f << "" << oendl;
// openFile(DocLnk(f));
//}
//
@@ -2380,7 +2381,7 @@ void QTReaderApp::resizeEvent(QResizeEvent* e)
*/
void QTReaderApp::handlekey(QKeyEvent* e)
{
-// qDebug("Keypress event");
+// odebug << "Keypress event" << oendl;
timeb now;
ftime(&now);
unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;
@@ -2392,7 +2393,7 @@ void QTReaderApp::handlekey(QKeyEvent* e)
switch(e->key())
{
case Key_Escape:
-// qDebug("escape event");
+// odebug << "escape event" << oendl;
if (m_disableesckey)
{
m_disableesckey = false;
@@ -2407,7 +2408,7 @@ void QTReaderApp::handlekey(QKeyEvent* e)
}
else
{
-// qDebug("escape action");
+// odebug << "escape action" << oendl;
doAction(m_escapeTarget, e);
}
}
@@ -2506,11 +2507,11 @@ void QTReaderApp::showEditTools()
}
else
{
-// qDebug("him");
+// odebug << "him" << oendl;
#ifdef USEQPE
Global::hideInputMethod();
#endif
-// qDebug("eb");
+// odebug << "eb" << oendl;
menubar->show();
if (fileBar != NULL) fileBar->show();
if (viewBar != NULL) viewBar->show();
@@ -2532,20 +2533,20 @@ void QTReaderApp::showEditTools()
regBar->show();
}
if (m_fontVisible) m_fontBar->show();
-// qDebug("sn");
+// odebug << "sn" << oendl;
showNormal();
-// qDebug("sm");
+// odebug << "sm" << oendl;
#ifdef USEQPE
showMaximized();
#endif
// setCentralWidget(reader);
}
-// qDebug("uc");
+// odebug << "uc" << oendl;
updateCaption();
-// qDebug("rw");
+// odebug << "rw" << oendl;
editorStack->raiseWidget( reader );
-// qDebug("sf");
+// odebug << "sf" << oendl;
reader->setFocus();
reader->refresh();
}
@@ -2614,7 +2615,7 @@ void QTReaderApp::setDocument(const QString& fileref)
void QTReaderApp::closeEvent( QCloseEvent *e )
{
-// qDebug("Close event");
+// odebug << "Close event" << oendl;
if (m_fullscreen)
{
m_fullscreen = false;
@@ -2631,7 +2632,7 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
{
if ((m_escapeTarget != cesNone) && m_bcloseDisabled)
{
-// qDebug("Close disabled");
+// odebug << "Close disabled" << oendl;
m_bcloseDisabled = false;
e->ignore();
}
@@ -2709,7 +2710,7 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
{
#ifdef _UNICODE
-// qDebug("Item:%s", (const char*)toQString(i->name()));
+// odebug << "Item:" << toQString(i->name()) << "" << oendl;
bkmkselector->insertItem(toQString(i->name()));
#else
bkmkselector->insertItem(i->name());
@@ -2738,9 +2739,9 @@ void QTReaderApp::do_regedit()
{
// fileBar->hide();
reader->bDoUpdates = false;
-// qDebug("Showing regbar");
+// odebug << "Showing regbar" << oendl;
regBar->show();
-// qDebug("Showing kbd");
+// odebug << "Showing kbd" << oendl;
#ifdef USEQPE
Global::showInputMethod();
#endif
@@ -2756,10 +2757,10 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
QString fn = toQString(
CFiledata(bk->anno()).name()
);
-// qDebug("fileinfo");
+// odebug << "fileinfo" << oendl;
if (!fn.isEmpty() && QFileInfo(fn).isFile())
{
-// qDebug("Opening");
+// odebug << "Opening" << oendl;
openFile(fn);
struct stat fnstat;
stat((const char *)reader->m_lastfile, &fnstat);
@@ -2781,7 +2782,7 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
{
QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
}
-// qDebug("updating");
+// odebug << "updating" << oendl;
// showEditTools();
reader->locate(bk->value());
}
@@ -2812,7 +2813,7 @@ void QTReaderApp::gotobkmk(int ind)
reader->locate((*pBkmklist)[ind]->value());
break;
case cDelBkmk:
-//// qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
+//// odebug << "Deleting:" << (*pBkmklist)[ind]->name() << "\n" << oendl;
pBkmklist->erase(ind);
m_fBkmksChanged = true;
// pBkmklist->sort();
@@ -2912,7 +2913,7 @@ void QTReaderApp::gotobkmk(int ind)
/*
CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );
int ret = f->exec();
- qDebug("Return:%d", ret);
+ odebug << "Return:" << ret << "" << oendl;
DocLnk* doc = f->getDoc();
if (doc != NULL)
{
@@ -2932,11 +2933,11 @@ void QTReaderApp::gotobkmk(int ind)
}
FileManager fm;
fm.saveFile( *doc, rt );
- qDebug("YES");
+ odebug << "YES" << oendl;
}
else
{
- qDebug("NO");
+ odebug << "NO" << oendl;
}
delete f;
*/
@@ -3009,7 +3010,7 @@ void QTReaderApp::do_regaction()
break;
#endif
case cSetConfigName:
-// qDebug("Saving config");
+// odebug << "Saving config" << oendl;
do_saveconfig(regEdit->text(), false);
break;
}
@@ -3101,7 +3102,7 @@ void QTReaderApp::setfontHelper(const QString& lcn, int size)
void QTReaderApp::do_setencoding(int i)
{
-// qDebug("setencoding:%d", i);
+// odebug << "setencoding:" << i << "" << oendl;
if (m_fontAction == cChooseEncoding)
{
reader->setencoding(i);
@@ -3109,9 +3110,9 @@ void QTReaderApp::do_setencoding(int i)
reader->refresh();
m_fontBar->hide();
m_fontVisible = false;
-// qDebug("showedit");
+// odebug << "showedit" << oendl;
if (reader->isVisible()) showEditTools();
-// qDebug("showeditdone");
+// odebug << "showeditdone" << oendl;
}
void QTReaderApp::do_setfont(const QString& lcn)
@@ -3123,17 +3124,17 @@ void QTReaderApp::do_setfont(const QString& lcn)
reader->refresh();
m_fontBar->hide();
m_fontVisible = false;
-// qDebug("showedit");
+// odebug << "showedit" << oendl;
//if (reader->isVisible())
showEditTools();
-// qDebug("showeditdone");
+// odebug << "showeditdone" << oendl;
}
void QTReaderApp::do_autogen(const QString& regText)
{
unsigned long fs, ts;
reader->sizes(fs,ts);
-// // qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));
+// // odebug << "Reg:" << (const tchar*)(regEdit->text()) << "\n" << oendl;
m_autogenstr = regText;
QRegExp re(regText);
CBuffer buff;
@@ -3180,7 +3181,7 @@ void QTReaderApp::do_autogen(const QString& regText)
void QTReaderApp::saveprefs()
{
-// qDebug("saveprefs");
+// odebug << "saveprefs" << oendl;
// reader->saveprefs("uqtreader");
// if (!m_loadedconfig)
do_saveconfig( APPDIR, true );
@@ -3261,11 +3262,11 @@ void QTReaderApp::saveprefs()
/*
void QTReaderApp::oldFile()
{
-// qDebug("oldFile called");
+// odebug << "oldFile called" << oendl;
reader->setText(true);
-// qDebug("settext called");
+// odebug << "settext called" << oendl;
showEditTools();
-// qDebug("showedit called");
+// odebug << "showedit called" << oendl;
}
*/
@@ -3341,10 +3342,10 @@ void QTReaderApp::readfilelist()
#else /* USEQPE */
BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"));
#endif /* USEQPE */
-// qDebug("Reading open files");
+// odebug << "Reading open files" << oendl;
pOpenlist = bf.readall();
-// if (pOpenlist != NULL) qDebug("...with success");
-// else qDebug("...without success!");
+// if (pOpenlist != NULL) odebug << "...with success" << oendl;
+// else odebug << "...without success!" << oendl;
}
void QTReaderApp::savefilelist()
@@ -3359,7 +3360,7 @@ void QTReaderApp::savefilelist()
#else /* USEQPE */
BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true);
#endif /* USEQPE */
-// qDebug("Writing open files");
+// odebug << "Writing open files" << oendl;
bf.write(*pOpenlist);
}
}
@@ -3469,7 +3470,7 @@ void QTReaderApp::showAnnotation()
void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& line)
{
-//// qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
+//// odebug << "OnWordSelected(" << posn << "):" << wrd << "" << oendl;
if (m_doClipboard)
{
@@ -3519,7 +3520,7 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
else
{
e->accept();
-// qDebug("Accepted");
+// odebug << "Accepted" << oendl;
switch (a)
{
case cesOpenFile:
@@ -3582,7 +3583,7 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
gotoEnd();
break;
default:
- qDebug("Unknown ActionType:%u", a);
+ odebug << "Unknown ActionType:" << a << "" << oendl;
break;
}
}
@@ -3600,7 +3601,7 @@ void QTReaderApp::SaveConfig()
void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
{
-// qDebug("do_saveconfig:%s", (const char*)_txt);
+// odebug << "do_saveconfig:" << _txt << "" << oendl;
#ifdef USEQPE
QString configname;
Config::Domain dom;
@@ -3623,11 +3624,11 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
QFileInfo fi;
if (full)
{
-// qDebug("full:%s", (const char*)_txt);
+// odebug << "full:" << _txt << "" << oendl;
QDir d = QDir::home(); // "/"
if ( !d.cd(_txt) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+ owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
d = QDir::home();
d.mkdir(_txt);
d.cd(_txt);
@@ -3639,14 +3640,14 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd("configs") )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
d = QDir::home();
d.cd(APPDIR);
d.mkdir("configs");
@@ -3654,7 +3655,7 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
}
fi.setFile(d, _txt);
}
-// qDebug("Path:%s", (const char*)fi.absFilePath());
+// odebug << "Path:" << fi.absFilePath() << "" << oendl;
Config config(fi.absFilePath());
#endif
@@ -3934,7 +3935,7 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
QDir d = QDir::home(); // "/"
if ( !d.cd(_txt) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+ owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
d = QDir::home();
d.mkdir(_txt);
d.cd(_txt);
@@ -3946,14 +3947,14 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd("configs") )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
d = QDir::home();
d.mkdir("configs");
d.cd("configs");
@@ -4061,13 +4062,13 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd(tgtdir) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );
+ owarn << "Cannot find the \"~/" APPDIR "/" << tgtdir << "\" directory" << oendl;
d = QDir::home();
d.mkdir(tgtdir);
d.cd(tgtdir);
@@ -4084,7 +4085,7 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
bkmkselector->insertItem(fi->fileName());
cnt++;
- //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+ //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
++it; // goto next list element
}
@@ -4168,7 +4169,7 @@ void QTReaderApp::OnURLSelected(const QString& href)
{
QClipboard* cb = QApplication::clipboard();
cb->setText(href);
- qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href);
+ odebug << "<a href=\"" << href << "\">" << href << "</a>" << oendl;
}
if (m_url_localfile)
{
@@ -4192,14 +4193,14 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd("urls") )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "/urls\" directory" << oendl;
d = QDir::home();
d.cd(APPDIR);
d.mkdir("urls");
diff --git a/noncore/apps/opie-reader/StyleConsts.cpp b/noncore/apps/opie-reader/StyleConsts.cpp
index 9fb56b7..f47acee 100644
--- a/noncore/apps/opie-reader/StyleConsts.cpp
+++ b/noncore/apps/opie-reader/StyleConsts.cpp
@@ -6,7 +6,7 @@ GraphicLink::~GraphicLink() { delete graphic; }
pmstore::~pmstore()
{
-//// qDebug("Deleting image");
+//// odebug << "Deleting image" << oendl;
delete graphic;
}
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index e1cde6c..72a1222 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -132,7 +132,7 @@ fileBrowser::~fileBrowser()
void fileBrowser::populateList()
{
ListView->clear();
-////qDebug(currentDir.canonicalPath());
+////odebug << currentDir.canonicalPath() << oendl;
// currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks );
currentDir.setFilter( filterspec );
currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
@@ -156,7 +156,7 @@ void fileBrowser::populateList()
}
else
{
-//// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+//// odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl;
}
new QListViewItem( ListView,fileL,fileS );
}
@@ -169,7 +169,7 @@ void fileBrowser::populateList()
void fileBrowser::upDir()
{
-//// qDebug(currentDir.canonicalPath());
+//// odebug << currentDir.canonicalPath() << oendl;
}
void fileBrowser::listClicked(QListViewItem *selectedItem)
@@ -177,7 +177,7 @@ void fileBrowser::listClicked(QListViewItem *selectedItem)
if (selectedItem == NULL) return;
QString strItem=selectedItem->text(0);
-//// qDebug("%s", (const char*)strItem);
+//// odebug << "" << strItem << "" << oendl;
QString strSize=selectedItem->text(1);
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index e42204a..dbf6964 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -85,7 +85,7 @@ TARGET = reader
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp
index e52fd6a..a8e688f 100644
--- a/noncore/apps/opie-reader/plucker.cpp
+++ b/noncore/apps/opie-reader/plucker.cpp
@@ -57,19 +57,19 @@ int CPlucker::bgetch()
{
if (!m_continuous) return EOF;
if (bufferrec >= ntohs(head.recordList.numRecords) - 1) return EOF;
-//// qDebug("Passing through %u", currentpos);
+//// odebug << "Passing through " << currentpos << "" << oendl;
if (!expand(bufferrec+1)) return EOF;
mystyle.unset();
if (m_ParaOffsets[m_nextParaIndex] == 0)
{
while (m_ParaOffsets[m_nextParaIndex+1] == 0)
{
-// qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
m_nextParaIndex++;
}
}
mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-// qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
ch = 10;
EOPPhase = 4;
}
@@ -79,7 +79,7 @@ int CPlucker::bgetch()
{
UInt16 attr = m_ParaAttrs[m_nextParaIndex];
m_nextParaIndex++;
-// qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
if (m_nextParaIndex == m_nParas)
{
m_nextPara = -1;
@@ -91,7 +91,7 @@ int CPlucker::bgetch()
}
mystyle.unset();
mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-// qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
if (m_lastBreak == locate())
{
currentpos++;
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index caa945d..b523a54 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,24 +1,32 @@
+
+
#include "useqpe.h"
-#include <stdio.h>
-#include <string.h>
+#include "plucker_base.h"
+#include "Aportis.h"
+#include "Palm2QImage.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
#ifdef USEQPE
#include <qpe/qcopenvelope_qws.h>
-#endif /* USEQPE */
-#ifdef LOCALPICTURES
-#include <qscrollview.h>
-#endif
-#ifdef USEQPE
#include <qpe/global.h>
#endif /* USEQPE */
+
#ifndef USEQPE
#include <qapplication.h>
#else /* USEQPE */
#include <qpe/qpeapplication.h>
#endif /* USEQPE */
-#include "plucker_base.h"
-#include "Aportis.h"
-#include "Palm2QImage.h"
+/* QT */
+#ifdef LOCALPICTURES
+#include <qscrollview.h>
+#endif
+
+/* STD */
+#include <stdio.h>
+#include <string.h>
+
CPlucker_base::CPlucker_base() :
#ifdef LOCALPICTURES
@@ -93,7 +101,7 @@ char* CPlucker_base::geturl(UInt16 tgt)
gotorecordnumber(0);
fread(&hdr0, 1, 6, fin);
unsigned int nrecs = ntohs(hdr0.nRecords);
- //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+ //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
UInt16 urlid = 0;
bool urlsfound = false;
char* urls = NULL;
@@ -103,14 +111,14 @@ char* CPlucker_base::geturl(UInt16 tgt)
UInt16 id, name;
fread(&name, 1, sizeof(name), fin);
fread(&id, 1, sizeof(id), fin);
- //qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
+ //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
if (ntohs(name) == 2)
{
urlsfound = true;
urlid = id;
- //qDebug("Found url index:%d", ntohs(urlid));
+ //odebug << "Found url index:" << ntohs(urlid) << "" << oendl;
}
-// //qDebug("%x", id);
+// //odebug << "" << id << "" << oendl;
}
if (urlsfound)
{
@@ -129,21 +137,21 @@ char* CPlucker_base::geturl(UInt16 tgt)
fread(&tctr, 1, sizeof(tctr), fin);
fread(&urlid, 1, sizeof(urlid), fin);
tctr = ntohs(tctr);
- //qDebug("tgt:%u urlctr:%u tctr:%u", tgt, urlctr, tctr);
+ //odebug << "tgt:" << tgt << " urlctr:" << urlctr << " tctr:" << tctr << "" << oendl;
if (tctr >= tgt)
{
break;
}
urlctr = tctr;
}
- //qDebug("urls are in %d", ntohs(urlid));
+ //odebug << "urls are in " << ntohs(urlid) << "" << oendl;
recptr = finduid(ntohs(urlid));
if (recptr != 0)
{
UInt32 reclen = recordlength(recptr) - HeaderSize();
gotorecordnumber(recptr);
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- //qDebug("Found urls:%x",thishdr_type);
+ //odebug << "Found urls:" << thishdr_type << "" << oendl;
urlsize = thishdr_size;
urls = new char[urlsize];
Expand(reclen, thishdr_type, (UInt8*)urls, urlsize);
@@ -153,7 +161,7 @@ char* CPlucker_base::geturl(UInt16 tgt)
{
if (rn == tgt)
{
- //qDebug("URL:%s", ptr);
+ //odebug << "URL:" << ptr << "" << oendl;
int len = strlen(ptr)+1;
pRet = new char[len];
memcpy(pRet, ptr, len);
@@ -250,7 +258,7 @@ void CPlucker_base::locate(unsigned int n)
{
recptr--;
gotorecordnumber(recptr);
- //qDebug("recptr:%u", recptr);
+ //odebug << "recptr:" << recptr << "" << oendl;
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
if (thishdr_type < 2)
{
@@ -275,7 +283,7 @@ void CPlucker_base::locate(unsigned int n)
}
}
}
-// qDebug("Time(1): %u", clock()-start);
+// odebug << "Time(1): " << clock()-start << "" << oendl;
/*
expand(recptr);
mystyle.unset();
@@ -321,10 +329,10 @@ void CPlucker_base::locate(unsigned int n)
}
} while (locpos + bs <= n);
-// qDebug("Time(2): %u", clock()-start);
+// odebug << "Time(2): " << clock()-start << "" << oendl;
if (recptr != thisrec)
{
- qDebug("Disaster:recptr:%u thisrec:%u", recptr, thisrec);
+ odebug << "Disaster:recptr:" << recptr << " thisrec:" << thisrec << "" << oendl;
UInt16 thishdr_uid, thishdr_nParagraphs;
UInt32 thishdr_size = buffercontent;
UInt8 thishdr_type, thishdr_reserved;
@@ -332,7 +340,7 @@ void CPlucker_base::locate(unsigned int n)
{
gotorecordnumber(recptr);
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
-// qDebug("UID:%u Paras:%u Size:%u Type:%u Reserved:%u", thishdr_uid, thishdr_nParagraphs, thishdr_size, (unsigned int)thishdr_type, (unsigned int)thishdr_reserved);
+// odebug << "UID:" << thishdr_uid << " Paras:" << thishdr_nParagraphs << " Size:" << thishdr_size << " Type:" << (unsigned int)thishdr_type << " Reserved:" << (unsigned int)thishdr_reserved << "" << oendl;
}
// QApplication::exit ( 100 );
}
@@ -371,16 +379,16 @@ bool CPlucker_base::expand(int thisrec)
while (1)
{
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- //qDebug("This (%d) type is %d, uid is %u", thisrec, thishdr_type, thishdr_uid);
+ //odebug << "This (" << thisrec << ") type is " << thishdr_type << ", uid is " << thishdr_uid << "" << oendl;
if (thishdr_type < 2) break;
- //qDebug("Skipping paragraph of type %d", thishdr_type);
+ //odebug << "Skipping paragraph of type " << thishdr_type << "" << oendl;
if (++thisrec >= ntohs(head.recordList.numRecords) - 1) return false;
reclen = recordlength(thisrec);
gotorecordnumber(thisrec);
}
m_nParas = thishdr_nParagraphs;
m_bufferisreserved = (thishdr_reserved != 0);
- //qDebug("It has %u paragraphs and is %u bytes", thishdr_nParagraphs, thishdr_size);
+ //odebug << "It has " << thishdr_nParagraphs << " paragraphs and is " << thishdr_size << " bytes" << oendl;
uid = thishdr_uid;
// gotorecordnumber(thisrec);
// fread(expandedtextbuffer,1,10,fin);
@@ -391,12 +399,12 @@ bool CPlucker_base::expand(int thisrec)
fread(&attrs, 1, sizeof(attrs), fin);
m_ParaOffsets[i] = ntohs(ubytes);
m_ParaAttrs[i] = ntohs(attrs);
-// //qDebug("Bytes %u, Attr %x", ntohs(ubytes), ntohs(attrs));
+// //odebug << "Bytes " << ntohs(ubytes) << ", Attr " << ntohs(attrs) << "" << oendl;
}
if (m_nParas > 0)
{
m_nextPara = m_ParaOffsets[0];
- //qDebug("First offset = %u", m_nextPara);
+ //odebug << "First offset = " << m_nextPara << "" << oendl;
m_nextParaIndex = 0;
}
else
@@ -418,7 +426,7 @@ bool CPlucker_base::expand(int thisrec)
Expand(reclen, thishdr_type, expandedtextbuffer, buffercontent);
bufferpos = 0;
bufferrec = thisrec;
- //qDebug("BC:%u, HS:%u", buffercontent, thishdr_size);
+ //odebug << "BC:" << buffercontent << ", HS:" << thishdr_size << "" << oendl;
return true;
}
@@ -452,7 +460,7 @@ void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuff
err = inflate( &zstream, Z_SYNC_FLUSH );
-// //qDebug("err:%d - %u", err, zstream.avail_in);
+// //odebug << "err:" << err << " - " << zstream.avail_in << "" << oendl;
} while ( err == Z_OK );
@@ -534,9 +542,9 @@ CList<Bkmk>* CPlucker_base::getbkmklist()
UInt16 n;
fread(&n, 1, sizeof(n), fin);
n = ntohs(n);
- //qDebug("Found %u bookmarks", n);
+ //odebug << "Found " << n << " bookmarks" << oendl;
}
- //qDebug("Found:%d, %u", i , thishdr_type);
+ //odebug << "Found:" << i << ", " << thishdr_type << "" << oendl;
}
*/
return NULL;
@@ -592,7 +600,7 @@ QImage* CPlucker_base::getPicture(unsigned long tgt)
#include <qpe/global.h>
void CPlucker_base::showimg(UInt16 tgt)
{
- //qDebug("Crassssssh!");
+ //odebug << "Crassssssh!" << oendl;
QPixmap* qimage = expandimg(tgt);
m_picture->setFixedSize(qimage->size());
m_picture->setBackgroundPixmap(*qimage);
@@ -603,14 +611,14 @@ void CPlucker_base::showimg(UInt16 tgt)
char tmp[] = "uqtreader.XXXXXX";
QImage* qimage = getimg(tgt);
QPixmap* image = new QPixmap(0,0);
-// //qDebug("New image");
+// //odebug << "New image" << oendl;
image->convertFromImage(*qimage);
delete qimage;
char tmpfile[sizeof(tmp)+1];
strcpy(tmpfile,tmp);
int f = mkstemp(tmpfile);
close(f);
- //qDebug("TMPFILE:%s", tmpfile);
+ //odebug << "TMPFILE:" << tmpfile << "" << oendl;
if (image->save(tmpfile,"PNG"))
{
QCopEnvelope e("QPE/Application/showimg", "setDocument(QString)");
@@ -627,7 +635,7 @@ void CPlucker_base::showimg(UInt16 tgt)
unsigned short CPlucker_base::finduid(unsigned short urlid)
{
-// //qDebug("Finding %u", urlid);
+// //odebug << "Finding " << urlid << "" << oendl;
unsigned short jmin = 1, jmax = ntohs(head.recordList.numRecords);
unsigned short jmid = (jmin+jmax) >> 1;
while (jmax - jmin > 1)
@@ -638,7 +646,7 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
UInt8 thishdr_type, thishdr_reserved;
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
unsigned short luid = thishdr_uid;
-// //qDebug("%u %u %u : %u", jmin, jmid, jmax, urlid);
+// //odebug << "" << jmin << " " << jmid << " " << jmax << " : " << urlid << "" << oendl;
if (luid == urlid)
{
return jmid;
@@ -659,7 +667,7 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
UInt8 thishdr_type, thishdr_reserved;
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
unsigned short luid = thishdr_uid;
- //qDebug("jmin at end:%u,%u", jmin, luid);
+ //odebug << "jmin at end:" << jmin << "," << luid << "" << oendl;
if (luid == urlid)
{
return jmin;
@@ -667,12 +675,12 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
gotorecordnumber(jmax);
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
luid = thishdr_uid;
- //qDebug("jmax at end:%u,%u", jmax, luid);
+ //odebug << "jmax at end:" << jmax << "," << luid << "" << oendl;
if (luid == urlid)
{
return jmax;
}
- //qDebug("Couldn't find %u", urlid);
+ //odebug << "Couldn't find " << urlid << "" << oendl;
return 0; // Not found!
}
@@ -698,7 +706,7 @@ void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsig
#endif
{
unsigned long t = *it;
-// qDebug("[%u]", t);
+// odebug << "[" << t << "]" << oendl;
memcpy(newdata, &t, sizeof(t));
newdata += sizeof(t);
}
@@ -721,7 +729,7 @@ void CPlucker_base::putSaveData(unsigned char*& src, unsigned short& srclen)
if (srclen >= sizeof(t))
{
memcpy(&t, src, sizeof(t));
-// qDebug("[%u]", t);
+// odebug << "[" << t << "]" << oendl;
visited.push_front(t);
src += sizeof(t);
srclen -= sizeof(t);
@@ -751,17 +759,17 @@ int CPlucker_base::OpenFile(const char *src)
compressedtextbuffer = new UInt8[compressedbuffersize];
expandedtextbuffer = new UInt8[buffersize];
- //qDebug("Total number of records:%u", ntohs(head.recordList.numRecords));
+ //odebug << "Total number of records:" << ntohs(head.recordList.numRecords) << "" << oendl;
unsigned int nrecs = ntohs(hdr0.nRecords);
- //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+ //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
UInt16 homerecid = 1;
for (unsigned int i = 0; i < nrecs; i++)
{
UInt16 id, name;
fread(&name, 1, sizeof(name), fin);
fread(&id, 1, sizeof(id), fin);
- //qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
+ //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
if (ntohs(name) == 0) homerecid = ntohs(id);
}
@@ -819,7 +827,7 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
visited.push_front(n);
UInt16 tuid = (n >> 16);
n &= 0xffff;
-// //qDebug("Hyper:<%u,%u>", tuid, n);
+// //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
UInt16 thisrec = 1;
currentpos = 0;
gotorecordnumber(thisrec);
@@ -831,7 +839,7 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
if (tuid == thishdr_uid) break;
if (thishdr_type < 2) currentpos += thishdr_size;
-// //qDebug("hyper-cp:%u", currentpos);
+// //odebug << "hyper-cp:" << currentpos << "" << oendl;
thisrec++;
if (thisrec >= ntohs(head.recordList.numRecords))
{
@@ -857,7 +865,7 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
}
#else
#endif /* USEQPE */
- //qDebug("Link:%s", (const char*)wrd);
+ //odebug << "Link:" << wrd << "" << oendl;
// setlink(fn, wrd);
delete [] turl;
}
@@ -926,7 +934,7 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
);
return eNone;
}
- //qDebug("Hyper:<%u,%u>", tuid, n);
+ //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
while (bufferpos < n && bufferpos < buffercontent) getch_base(true);
/* // This is faster but the alignment doesn't get set
mystyle.unset();
@@ -956,11 +964,11 @@ tchar CPlucker_base::getch_base(bool fast)
while (ch == 0)
{
ch = bgetch();
-// //qDebug("Function:%x", ch);
+// //odebug << "Function:" << ch << "" << oendl;
switch (ch)
{
case 0x38:
-// //qDebug("Break:%u", locate());
+// //odebug << "Break:" << locate() << "" << oendl;
if (m_lastBreak == locate())
{
ch = bgetch();
@@ -980,7 +988,7 @@ tchar CPlucker_base::getch_base(bool fast)
{
int ch = bgetch();
ln = (ln << 8) + ch;
-// //qDebug("ch:%d, ln:%u", ch, ln);
+// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
}
if (skip == 2)
{
@@ -992,10 +1000,10 @@ tchar CPlucker_base::getch_base(bool fast)
{
int ch = bgetch();
ln = (ln << 8) + ch;
-// //qDebug("ch:%d, ln:%u", ch, ln);
+// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
}
}
-// //qDebug("ln:%u", ln);
+// //odebug << "ln:" << ln << "" << oendl;
mystyle.setLink(true);
mystyle.setData(ln);
// mystyle.setColour(255, 0, 0);
@@ -1038,7 +1046,7 @@ tchar CPlucker_base::getch_base(bool fast)
case 0x11:
{
ch = bgetch();
-// //qDebug("Font:%d",ch);
+// //odebug << "Font:" << ch << "" << oendl;
mystyle.setVOffset(0);
mystyle.unsetMono();
mystyle.unsetBold();
@@ -1072,7 +1080,7 @@ tchar CPlucker_base::getch_base(bool fast)
mystyle.setBold();
break;
case 8: // should be fixed width
- //qDebug("Trying fixed width");
+ //odebug << "Trying fixed width" << oendl;
mystyle.setMono();
break;
case 9:
@@ -1087,7 +1095,7 @@ tchar CPlucker_base::getch_base(bool fast)
mystyle.setVOffset(-1);
break;
default:
- qDebug("Unrecognised font");
+ odebug << "Unrecognised font" << oendl;
break;
}
ch = bgetch();
@@ -1099,19 +1107,19 @@ tchar CPlucker_base::getch_base(bool fast)
{
case 0:
mystyle.setLeftJustify();
-// //qDebug("left");
+// //odebug << "left" << oendl;
break;
case 1:
mystyle.setRightJustify();
-// //qDebug("right");
+// //odebug << "right" << oendl;
break;
case 2:
mystyle.setCentreJustify();
-// //qDebug("centre");
+// //odebug << "centre" << oendl;
break;
case 3:
mystyle.setFullJustify();
-// //qDebug("full");
+// //odebug << "full" << oendl;
break;
}
@@ -1134,7 +1142,7 @@ tchar CPlucker_base::getch_base(bool fast)
ir = (ir << 8) + bgetch();
if (hasalternate)
{
- //qDebug("Alternate image:%x", ir);
+ //odebug << "Alternate image:" << ir << "" << oendl;
UInt16 ir2 = bgetch();
ir2 = (ir2 << 8) + bgetch();
if (!fast) mystyle.setPicture(true, expandimg(ir2, true), true, ir << 16);
@@ -1149,7 +1157,7 @@ tchar CPlucker_base::getch_base(bool fast)
{
if (!fast) mystyle.setPicture(true, expandimg(ir));
}
-// if (mystyle.getLink()) qDebug("Picture link!");
+// if (mystyle.getLink()) odebug << "Picture link!" << oendl;
ch = '#';
}
// ch = bgetch();
@@ -1160,14 +1168,14 @@ tchar CPlucker_base::getch_base(bool fast)
UInt8 wc = bgetch();
UInt8 pc = bgetch();
UInt16 w = wc;
-// //qDebug("h,w,pc [%u, %u, %u]", h, w, pc);
+// //odebug << "h,w,pc [" << h << ", " << w << ", " << pc << "]" << oendl;
if (w == 0)
{
w = (m_scrWidth*(unsigned long)pc)/100;
}
if (w == 0) w = m_scrWidth;
mystyle.setPicture(false, hRule(w,h,mystyle.Red(),mystyle.Green(),mystyle.Blue()));
-// if (mystyle.getLink()) //qDebug("hRule link!");
+// if (mystyle.getLink()) //odebug << "hRule link!" << oendl;
ch = '#';
}
break;
@@ -1182,10 +1190,10 @@ tchar CPlucker_base::getch_base(bool fast)
case 0x22:
ch = bgetch();
mystyle.setLeftMargin(ch);
-// //qDebug("Left margin:%d", ch);
+// //odebug << "Left margin:" << ch << "" << oendl;
ch = bgetch();
mystyle.setRightMargin(ch);
-// //qDebug("Right margin:%d", ch);
+// //odebug << "Right margin:" << ch << "" << oendl;
ch = bgetch();
break;
case 0x70:
@@ -1203,18 +1211,18 @@ tchar CPlucker_base::getch_base(bool fast)
ch <<= 8;
ch |= (tchar)bgetch();
for (int i = 0; i < tlen; i++) bgetch();
- //qDebug("Function 83");
+ //odebug << "Function 83" << oendl;
}
break;
case 0x85:
default:
- qDebug("Function:%x NOT IMPLEMENTED", ch);
+ odebug << "Function:" << ch << " NOT IMPLEMENTED" << oendl;
{
int skip = ch & 7;
for (int i = 0; i < skip; i++)
{
ch = bgetch();
- //qDebug("Arg %d, %d", i, ch);
+ //odebug << "Arg " << i << ", " << ch << "" << oendl;
}
ch = bgetch();
}
diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
index 22a4917..4c15fd0 100644
--- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp
+++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
@@ -22,24 +22,25 @@
#include "katebuffer.h"
+#include "kdebug.h"
-// Includes for reading file
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
+/* OPIE */
+#include <opie2/odebug.h>
+/* QT */
#include <qfile.h>
#include <qtextstream.h>
-
#include <qtimer.h>
#include <qtextcodec.h>
-//
-
+/* STD */
+// Includes for reading file
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
#include <assert.h>
-#include <kdebug.h>
/**
* Create an empty buffer.
@@ -66,7 +67,7 @@ void
KWBuffer::insertFile(int line, const QString &file, QTextCodec *codec)
{
if (line) {
- qDebug("insert File only supports insertion at line 0 == file opening");
+ odebug << "insert File only supports insertion at line 0 == file opening" << oendl;
return;
}
clear();
@@ -121,7 +122,7 @@ KWBuffer::slotLoadFile()
int
KWBuffer::count()
{
- qDebug("m_stringList.count %d",m_stringList.count());
+ odebug << "m_stringList.count " << m_stringList.count() << "" << oendl;
return m_lineCount;
// return m_stringList.count();
// return m_totalLines;
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 0c742d7..6dc4fd2 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -39,20 +39,31 @@
*/
#include "katedocument.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
+//#include "kcharsets.h"
+#include "kdebug.h"
+//#include "kinstance.h"
-#include <qfileinfo.h>
-#include <qdatetime.h>
+#include "kglobalsettings.h"
+//#include "kaction.h"
+//#include "kstdaction.h"
-#include <kmessagebox.h>
-#include <qpe/config.h>
-#include <qstring.h>
+#include "../view/kateview.h"
+#include "katebuffer.h"
+#include "katetextline.h"
-#include <sys/time.h>
-#include <unistd.h>
+#include "katecmd.h"
-#include <stdio.h>
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+/* QT */
+#include <qfileinfo.h>
+#include <qdatetime.h>
+#include <qstring.h>
#include <qtimer.h>
#include <qobject.h>
#include <qapplication.h>
@@ -62,21 +73,11 @@
#include <qfile.h>
#include <qtextstream.h>
#include <qtextcodec.h>
-#include <kglobal.h>
-
-//#include <kcharsets.h>
-#include <kdebug.h>
-//#include <kinstance.h>
-
-#include <kglobalsettings.h>
-//#include <kaction.h>
-//#include <kstdaction.h>
-
-#include "../view/kateview.h"
-#include "katebuffer.h"
-#include "katetextline.h"
-#include "katecmd.h"
+/* STD */
+#include <sys/time.h>
+#include <unistd.h>
+#include <stdio.h>
KateAction::KateAction(Action a, PointStruc &cursor, int len, const QString &text)
: action(a), cursor(cursor), len(len), text(text) {
@@ -298,14 +299,14 @@ void KateDocument::openURL(const QString &filename)
if (!fileInfo->exists() || !fileInfo->isReadable())
{
- qDebug("File doesn't exit or couldn't be read");
+ odebug << "File doesn't exit or couldn't be read" << oendl;
return ;
}
buffer->clear();
#warning fixme
// buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding));
- qDebug("Telling buffer to open file");
+ odebug << "Telling buffer to open file" << oendl;
buffer->insertFile(0, m_file, QTextCodec::codecForLocale());
setMTime();
@@ -683,7 +684,7 @@ void KateDocument::setHighlight(int n) {
}
void KateDocument::makeAttribs() {
- qDebug("KateDocument::makeAttribs()");
+ odebug << "KateDocument::makeAttribs()" << oendl;
m_numAttribs = hlManager->makeAttribs(m_highlight, m_attribs, maxAttribs);
updateFontData();
updateLines();
@@ -1923,7 +1924,7 @@ void KateDocument::updateLines(int startLine, int endLine, int flags, int cursor
updateMaxLength(textLine);
}
endCtx = textLine->getContext();
-// qDebug("DOHIGHLIGHT");
+// odebug << "DOHIGHLIGHT" << oendl;
ctxNum = m_highlight->doHighlight(ctxNum,textLine);
textLine->setContext(ctxNum);
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.cpp b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
index 0d2c283..539d356 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.cpp
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
@@ -19,26 +19,30 @@
Boston, MA 02111-1307, USA.
*/
-#include <string.h>
-
-#include <qtextstream.h>
-#include <qpe/config.h>
-#include <kglobal.h>
-//#include <kinstance.h>
-//#include <kmimemagic.h>
-#include <klocale.h>
-//#include <kregexp.h>
-#include <kglobalsettings.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-
#include "katehighlight.h"
-
-
#include "katetextline.h"
#include "katedocument.h"
#include "katesyntaxdocument.h"
+#include "kglobal.h"
+//#include "kinstance.h"
+//#include "kmimemagic.h"
+#include "klocale.h"
+//#include "kregexp.h"
+#include "kglobalsettings.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
+#include <qtextstream.h>
+
+/* STD */
+#include <string.h>
+
HlManager *HlManager::s_pSelf = 0;
@@ -621,7 +625,7 @@ int Highlight::doHighlight(int ctxNum, TextLine *textLine)
s2 = item->checkHgl(s1, len-z, z==0);
if (s2 > s1)
{
- qDebug("An item has been detected");
+ odebug << "An item has been detected" << oendl;
textLine->setAttribs(item->attr,s1 - str,s2 - str);
ctxNum = item->ctx;
context = contextList[ctxNum];
@@ -853,7 +857,7 @@ void Highlight::done()
void Highlight::createItemData(ItemDataList &list)
{
- qDebug("Highlight::createItemData");
+ odebug << "Highlight::createItemData" << oendl;
// If no highlighting is selected we need only one default.
if (noHl)
@@ -874,7 +878,7 @@ void Highlight::createItemData(ItemDataList &list)
internalIDList.setAutoDelete(true);
syntaxContextData *data;
- qDebug("Trying to read itemData section");
+ odebug << "Trying to read itemData section" << oendl;
//Tell the syntax document class which file we want to parse and which data group
HlManager::self()->syntax->setIdentifier(identifier);
@@ -882,7 +886,7 @@ void Highlight::createItemData(ItemDataList &list)
//begin with the real parsing
while (HlManager::self()->syntax->nextGroup(data))
{
- qDebug("Setting up one itemData element");
+ odebug << "Setting up one itemData element" << oendl;
// read all attributes
color=HlManager::self()->syntax->groupData(data,QString("color"));
selColor=HlManager::self()->syntax->groupData(data,QString("selColor"));
@@ -1312,7 +1316,7 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
ItemData *itemData;
int nAttribs, z;
- qDebug("HlManager::makeAttribs");
+ odebug << "HlManager::makeAttribs" << oendl;
defaultStyleList.setAutoDelete(true);
getDefaults(defaultStyleList);
@@ -1321,7 +1325,7 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
highlight->getItemDataList(itemDataList);
nAttribs = itemDataList.count();
for (z = 0; z < nAttribs; z++) {
- qDebug("HlManager::makeAttribs: createing one attribute definition");
+ odebug << "HlManager::makeAttribs: createing one attribute definition" << oendl;
itemData = itemDataList.at(z);
if (itemData->defStyle) {
// default style
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 6059e9b..9fa4452 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -16,15 +16,20 @@
***************************************************************************/
#include "katesyntaxdocument.h"
-#include <kateconfig.h>
+#include "kateconfig.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+#include "klocale.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qfile.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
#include <qstringlist.h>
-#include <kglobal.h>
-#include <qpe/qpeapplication.h>
#include <qdir.h>
SyntaxDocument::SyntaxDocument()
@@ -76,13 +81,13 @@ void SyntaxDocument::setupModeList(bool force)
}
else
{
- qDebug("Found a description file:"+path+(*it));
+ odebug << "Found a description file:"+path+(*it) << oendl;
setIdentifier(path+(*it));
Opie::Core::XMLElement *e=m_root;
if (e)
{
e=e->firstChild();
- qDebug(e->tagName());
+ odebug << e->tagName() << oendl;
if (e->tagName()=="language")
{
syntaxModeListItem *mli=new syntaxModeListItem;
@@ -90,7 +95,7 @@ void SyntaxDocument::setupModeList(bool force)
mli->section = e->attribute("section");
mli->mimetype = e->attribute("mimetype");
mli->extension = e->attribute("extensions");
- qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name));
+ odebug << QString("valid description for: %1/%2").arg(mli->section).arg(mli->name) << oendl;
if (mli->section.isEmpty())
mli->section=i18n("Other");
@@ -292,7 +297,7 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
{
for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
{
- qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value());
+ odebug << "FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value() << oendl;
m_data+=e2->firstChild()->value().stripWhiteSpace();
}
break;
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 96f91fb..782b629 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -18,6 +18,14 @@
**
**********************************************************************/
+#define QTOPIA_INTERNAL_LANGLIST
+#include "kateconfig.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/global.h>
+
+/* QT */
#include <qdir.h>
#include <qmessagebox.h>
#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
@@ -25,16 +33,13 @@
#endif
#include <qtextstream.h>
+/* STD */
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
-#define QTOPIA_INTERNAL_LANGLIST
-#include "kateconfig.h"
-#include <qpe/global.h>
-
/*!
\internal
@@ -93,7 +98,7 @@ QString KateConfig::configFilename(const QString& name, Domain d)
KateConfig::KateConfig( const QString &name, Domain domain )
: filename( configFilename(name,domain) )
{
- qWarning("KateConfig constructor\n");
+ owarn << "KateConfig constructor\n" << oendl;
git = groups.end();
read();
QStringList l = Global::languageList();
@@ -118,7 +123,7 @@ KateConfig::KateConfig ( const QString &name, bool what )
*/
KateConfig::~KateConfig()
{
- qWarning("KateConfig destructor\n");
+ owarn << "KateConfig destructor\n" << oendl;
if ( changed )
write();
}
@@ -172,7 +177,7 @@ void KateConfig::writeEntry( const QString &key, const char* value )
void KateConfig::writeEntry( const QString &key, const QString &value )
{
if ( git == groups.end() ) {
- qWarning( "no group set" );
+ owarn << "no group set" << oendl;
return;
}
if ( (*git)[key] != value ) {
@@ -232,7 +237,7 @@ static QString decipher(const QString& cipher)
void KateConfig::writeEntryCrypt( const QString &key, const QString &value )
{
if ( git == groups.end() ) {
- qWarning( "no group set" );
+ owarn << "no group set" << oendl;
return;
}
QString evalue = encipher(value);
@@ -321,7 +326,7 @@ void KateConfig::writeEntry( const QString &key, const QFont &val )
void KateConfig::removeEntry( const QString &key )
{
if ( git == groups.end() ) {
- qWarning( "no group set" );
+ owarn << "no group set" << oendl;
return;
}
( *git ).remove( key );
@@ -397,7 +402,7 @@ QString KateConfig::readEntryCrypt( const QString &key, const QString &deflt )
QString KateConfig::readEntryDirect( const QString &key, const QString &deflt )
{
if ( git == groups.end() ) {
- //qWarning( "no group set" );
+ //owarn << "no group set" << oendl;
return deflt;
}
KateConfigGroup::ConstIterator it = ( *git ).find( key );
@@ -500,7 +505,7 @@ QValueList<int> KateConfig::readIntListEntry( const QString &key ) const
void KateConfig::clearGroup()
{
if ( git == groups.end() ) {
- qWarning( "no group set" );
+ owarn << "no group set" << oendl;
return;
}
if ( !(*git).isEmpty() ) {
@@ -521,7 +526,7 @@ void KateConfig::write( const QString &fn )
QFile f( strNewFile );
if ( !f.open( IO_WriteOnly|IO_Raw ) ) {
- qWarning( "could not open for writing `%s'", strNewFile.latin1() );
+ owarn << "could not open for writing `" << strNewFile << "'" << oendl;
git = groups.end();
return;
}
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 3c9a637..9865c35 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -14,18 +14,23 @@
* ONLY VERSION 2 OF THE LICENSE IS APPLICABLE *
* *
***************************************************************************/
-#include <qaction.h>
-#include <qtoolbutton.h>
-#include <qmenubar.h>
-#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
+#include "tinykate.h"
+
+#include "katedocument.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
#include <opie2/ofiledialog.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
-#include "tinykate.h"
+/* QT */
+#include <qaction.h>
+#include <qtoolbutton.h>
+#include <qmenubar.h>
-#include <katedocument.h>
-#include <kglobal.h>
using namespace Opie::Ui;
TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
@@ -152,7 +157,7 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
TinyKate::~TinyKate( )
{
- qWarning("TinyKate destructor\n");
+ owarn << "TinyKate destructor\n" << oendl;
shutDown=true;
while (currentView!=0) {
@@ -160,7 +165,7 @@ TinyKate::~TinyKate( )
}
if( KGlobal::config() != 0 ) {
- qWarning("deleting KateConfig object..\n");
+ owarn << "deleting KateConfig object..\n" << oendl;
delete KGlobal::config();
}
}
@@ -181,7 +186,7 @@ void TinyKate::open(const QString & filename)
QFileInfo fi(filename);
QString filenamed = fi.fileName();
tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed );
- qDebug(filename);
+ odebug << filename << oendl;
kd->setDocName( filenamed);
kd->open( filename );
@@ -249,7 +254,7 @@ void TinyKate::slotSave() {
// KateView *kv = (KateView*) currentView;
KateDocument *kd = (KateDocument*) currentView->document();
- // qDebug("saving file "+kd->docName());
+ // odebug << "saving file "+kd->docName() << oendl;
if( kd->docName().isEmpty())
slotSaveAs();
else
@@ -265,7 +270,7 @@ void TinyKate::slotSaveAs() {
QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
QString::null);
if (!filename.isEmpty()) {
- qDebug("saving file "+filename);
+ odebug << "saving file "+filename << oendl;
QFileInfo fi(filename);
QString filenamed = fi.fileName();
kd->setDocFile( filename);