diff options
| author |  Robert Förster | 2014-11-21 14:34:32 +0000 |
|---|---|---|
| committer | Robert Förster | 2014-11-21 14:34:32 +0000 |
| commit | 43e0468a233a49b1010f34c5ce888204fa4e9416 (patch) | |
| tree | b1f97b1b9fdfc72677b935d34e26c70fa7030feb /src/modules | |
| parent | Trivial typo (diff) | |
| download | KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.gz KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.bz2 KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.zip | |
- massive trailing whitespace cleanup (yes, one of these "you can hate me for that" commits)
- apply patch by d00p: show the correct protocol version instead of just "SSLv3/TLSv1", thanks!
- fix compilation on qt 5.4 on windows
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6398 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
99 files changed, 763 insertions, 763 deletions
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp index 460cb4560..6fee6e827 100644 --- a/src/modules/actioneditor/ActionEditor.cpp +++ b/src/modules/actioneditor/ActionEditor.cpp @@ -342,7 +342,7 @@ void SingleActionEditor::displaySmallIcon(const QString &szIconId) m_pSmallIconEdit->setText(QString()); m_pSmallIconButton->setIcon(QIcon()); } - + } void SingleActionEditor::displayBigIcon(const QString &szIconId) diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp index 597a98cb1..f2c0bafcc 100644 --- a/src/modules/addon/PackAddonDialog.cpp +++ b/src/modules/addon/PackAddonDialog.cpp @@ -99,9 +99,9 @@ PackAddonDialog::PackAddonDialog(QWidget * pParent) szText += __tr2qs_ctx("Hit the \"Next\" button to begin.","addon"); pLabel->setText(szText); pLayout->addWidget(pLabel); - + pPage->setMinimumWidth(350); - + addPage(pPage); // Packager information @@ -273,7 +273,7 @@ bool PackAddonDialog::packAddon() // Check the addon tree QString szError; - + if(!checkDirTree(&szError)) { QMessageBox::critical(this, @@ -282,7 +282,7 @@ bool PackAddonDialog::packAddon() ); return false; } - + // Raise the files summary dialog m_pPackAddonSummaryFilesWidget = new PackAddonSummaryFilesWidget(this); m_pPackAddonSummaryFilesWidget->setPath(m_szDirPath); @@ -405,7 +405,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent QLabel * pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package &Author:","addon")); pLayout->addWidget(pLabel,0,0); - + m_pPackageAuthorEdit = new QLineEdit(this); m_pPackageAuthorEdit->setText(__tr2qs_ctx("Your name here","addon")); pLabel->setBuddy(m_pPackageAuthorEdit); @@ -414,7 +414,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package &Name:","addon")); pLayout->addWidget(pLabel,1,0); - + m_pPackageNameEdit = new QLineEdit(this); m_pPackageNameEdit->setText(__tr2qs_ctx("No spaces allowed, like MyAddon","addon")); pLabel->setBuddy(m_pPackageNameEdit); @@ -423,7 +423,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package &Version:","addon")); pLayout->addWidget(pLabel,2,0); - + m_pPackageVersionEdit = new QLineEdit(this); m_pPackageVersionEdit->setText(__tr2qs_ctx("Version in the form x.y[.z], like 1.0 or 2.0.3","addon")); pLabel->setBuddy(m_pPackageVersionEdit); diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp index 69a0ecf76..e6efb44a9 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.cpp +++ b/src/modules/aliaseditor/AliasEditorWindow.cpp @@ -333,7 +333,7 @@ void AliasEditorWidget::aliasRefresh(const QString &szName) void AliasEditorWidget::itemRenamed(QTreeWidgetItem *it,int col) { if(it!=m_pLastEditedItem) return; - + ((AliasEditorTreeWidgetItem *)it)->setName(it->text(col)); QString szNam = buildFullItemName((AliasEditorTreeWidgetItem *)it); QString szLabelText; @@ -1183,7 +1183,7 @@ AliasEditorWindow::AliasEditorWindow() m_pEditor = new AliasEditorWidget(this); g->addWidget(m_pEditor,0,0,1,4); - + QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(okClicked())); btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h index e44db6675..c4eaed493 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.h +++ b/src/modules/aliaseditor/AliasEditorWindow.h @@ -150,7 +150,7 @@ protected: QString askForAliasName(const QString &szAction,const QString &szText,const QString &szInitialText); QString askForNamespaceName(const QString &szAction,const QString &szText,const QString &szInitialText); -// +// bool itemExists(QTreeWidgetItem *pSearchFor); bool namespaceExists(QString &szFullItemName); bool aliasExists(QString &szFullItemName); diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 65d137d34..51207644a 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -270,9 +270,9 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c) is a channel at all). If the current window is not a channel, a warning is printed and an empty string is returned.[br] The second form returns the number of users on the channel specified by <window_id>.[br] - The number of users returned depends on the state of KVIrc's data on the channel, which will be - out-of-synch with the server just after the channel is joined. If the function is used prior to - the channel's OnChannelSync event, a smaller user count than there really is will be returned. + The number of users returned depends on the state of KVIrc's data on the channel, which will be + out-of-synch with the server just after the channel is joined. If the function is used prior to + the channel's OnChannelSync event, a smaller user count than there really is will be returned. */ static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c) { @@ -1390,7 +1390,7 @@ static bool chan_kvs_fnc_masklist(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_END(c) char cMode = szMode.at(0).unicode(); - + KviKvsArray * pArray = new KviKvsArray(); c->returnValue()->setArray(pArray); @@ -1818,7 +1818,7 @@ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c) { QString szNick, szChans; kvs_uint_t iContextId; - + KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick) KVSM_PARAMETER("context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,iContextId) \ @@ -1835,7 +1835,7 @@ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c) pConsole->connection()->getCommonChannels(szNick,szChans,false); c->returnValue()->setString(szChans); } - + return true; } diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index 8484b267c..cc7c71818 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -102,7 +102,7 @@ ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, m_bInternal = false; m_bClassModified = false; QPixmap * pIcon = 0; - + if(eType == ClassEditorTreeWidgetItem::Namespace) pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else @@ -121,14 +121,14 @@ ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(ClassEditorTreeWidgetItem * m_iPos = 0; m_bClassModified = false; QPixmap * pIcon = 0; - + if(eType == ClassEditorTreeWidgetItem::Namespace) pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else if(eType == ClassEditorTreeWidgetItem::Class) pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); else pIcon = g_pIconManager->getSmallIcon(KviIconManager::Function); - + setIcon(0,QIcon(*pIcon)); } @@ -136,12 +136,12 @@ void ClassEditorTreeWidgetItem::setClassNotBuilt(bool bModified) { m_bClassModified = bModified; QPixmap * pIcon = 0; - + if(bModified) pIcon = g_pIconManager->getSmallIcon(KviIconManager::ClassNotBuilt); else pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); - + setIcon(0,QIcon(*pIcon)); } @@ -155,14 +155,14 @@ void ClassEditorTreeWidgetItem::setType(Type eType) { m_eType = eType; QPixmap * pIcon = 0; - + if(eType == ClassEditorTreeWidgetItem::Namespace) pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else if(eType == ClassEditorTreeWidgetItem::Class) pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); else pIcon = g_pIconManager->getSmallIcon(KviIconManager::Function); - + setIcon(0,QIcon(*pIcon)); } @@ -290,7 +290,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::findItem(const QString & szFullNa ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0)); if(!pItem) return 0; - + for(int i=1; i < lNamespaces.count(); i++) { bFound = false; @@ -313,7 +313,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::createFullItem(const QString & sz { bool bFound; int i; - + QStringList lNamespaces = szFullName.split("::"); if(lNamespaces.count() == 0) return 0; @@ -350,7 +350,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::createFullNamespace(const QString { bool bFound; int i; - + QStringList lNamespaces = szFullName.split("::"); if(lNamespaces.count() == 0) return 0; @@ -385,13 +385,13 @@ void ClassEditorWidget::oneTimeSetup() QString szPath; g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes); QDir d(szPath); - + QString szExtension = QString("*%1").arg(KVI_FILEEXTENSION_SCRIPT); // *.kvs sl = d.entryList(QStringList(szExtension), QDir::Files | QDir::NoDotAndDotDot); - + g_pModuleManager->getModule("objects"); KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict()); - + KviKvsObjectClass * pClass = 0; ClassEditorTreeWidgetItem * pClassItem = 0; while(KviKvsObjectClass * pClass = it.current()) @@ -546,13 +546,13 @@ void ClassEditorWidget::renameFunction() return; } } - + pFunction->setName(szNewFunctionName); pFunction->setReminder(szNewReminder); currentItemChanged(pFunction,pFunction); pFunction->setInternalFunction(bInternal); pParentClass->setClassNotBuilt(true); - + KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses; lInheritedClasses.setAutoDelete(false); searchInheritedClasses(szClassName,lInheritedClasses); @@ -633,7 +633,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem) m_pClasses->insert(szNewClassName,pClassItem); pClassItem->setInheritsClass(szNewInheritsClassName); pClassItem->setClassNotBuilt(true); - + KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses; lInheritedClasses.setAutoDelete(false); searchInheritedClasses(szClassName,lInheritedClasses); @@ -643,7 +643,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem) lInheritedClasses.at(i)->setExpanded(true); lInheritedClasses.at(i)->setInheritsClass(szNewClassName); } - + if(pNewItem) { activateItem(pNewItem); @@ -652,7 +652,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem) activateItem(pClassItem); pClassItem->setExpanded(true); } - + qDebug("delete class %s caused by rename",szClassName.toUtf8().data()); KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName); if(pClass) @@ -773,15 +773,15 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI m_pEditor->setEnabled(false); return; } - + ClassEditorTreeWidgetItem * pClassItem = 0; if(m_pLastEditedItem->isMethod()) pClassItem = (ClassEditorTreeWidgetItem *)m_pLastEditedItem->parent(); else pClassItem = m_pLastEditedItem; - + QString szClassName = buildFullClassName(pClassItem); - + if(m_pLastEditedItem->isNamespace()) { QString szLabelText = __tr2qs_ctx("Namespace","editor"); @@ -798,7 +798,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI m_pTreeWidget->setFocus(); return; } - + QString szLabelText = __tr2qs_ctx("Class","editor"); szLabelText += ": <b>"; szLabelText += szClassName; @@ -826,7 +826,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI m_pReminderLabel->setText(szReminderText); m_pReminderLabel->show(); } - + m_pFunctionNameLabel->setText(szLabelText); m_pFunctionNameLabel->show(); m_pFunctionNameRenameButton->show(); @@ -846,7 +846,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI QStringList szFunctionsList; KviPointerHashTable<QString,ClassEditorTreeWidgetItem> lFunctions; lFunctions.setAutoDelete(false); - + ClassEditorTreeWidgetItem * pItem = 0; for(int i=0; i < pTree->childCount(); i++) { @@ -1103,7 +1103,7 @@ void ClassEditorWidget::exportSelected() void ClassEditorWidget::exportSelectionInSinglesFiles(KviPointerList<ClassEditorTreeWidgetItem> * pList) { bool bReplaceAll = false; - + if(!m_szDir.endsWith(QString(KVI_PATH_SEPARATOR))) m_szDir += KVI_PATH_SEPARATOR; if(!pList->first()) @@ -1155,7 +1155,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) QString szNameFile; QString szFile; int iCount = 0; - + saveLastEditedItem(); KviPointerList<ClassEditorTreeWidgetItem> list; @@ -1165,13 +1165,13 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) appendSelectedClassItems(&list); else appendAllClassItems(&list); - + if(bSingleFiles) { exportSelectionInSinglesFiles(&list); return; } - + ClassEditorTreeWidgetItem * pTempItem = 0; KviPointerList<ClassEditorTreeWidgetItem> skiplist; skiplist.setAutoDelete(false); @@ -1200,7 +1200,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) szOut += "\n"; } } - + if(szOut.isEmpty()) { g_pClassEditorModule->lock(); @@ -1213,7 +1213,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) if(!szName.endsWith(QString(KVI_PATH_SEPARATOR))) szName += KVI_PATH_SEPARATOR; - + g_pClassEditorModule->lock(); if(iCount != 1) @@ -1222,7 +1222,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) QString szTmp = buildFullClassName(pTempItem); szNameFile = szTmp.replace("::","_"); } - + szName += szNameFile; szName += ".kvs"; if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,false,true,true)) @@ -1321,7 +1321,7 @@ void ClassEditorWidget::removeItemChildren(ClassEditorTreeWidgetItem * pItem, Kv lInheritedClasses.at(u)->setInheritsClass("object"); } } - + while(pItem->childCount() > 0) { ClassEditorTreeWidgetItem * pChild = (ClassEditorTreeWidgetItem *)(pItem->child(0)); @@ -1363,7 +1363,7 @@ bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointer { szMsg = QString(__tr2qs_ctx("Do you really want to remove the function \"%1\"?","editor")).arg(szName); } - + g_pClassEditorModule->lock(); int iRet = QMessageBox::question(this,__tr2qs_ctx("Remove item","editor"),szMsg,__tr2qs_ctx("Yes","editor"),__tr2qs_ctx("Yes to All","editor"),__tr2qs_ctx("No","editor")); g_pClassEditorModule->unlock(); @@ -1577,7 +1577,7 @@ void ClassEditorWidget::newClass() if(szClassName.isEmpty()) return; ClassEditorTreeWidgetItem * pItem = newItem(szClassName,ClassEditorTreeWidgetItem::Class); - + KviQString::escapeKvs(&szClassName, KviQString::EscapeSpace); KviQString::escapeKvs(&szinheritsClassName, KviQString::EscapeSpace); @@ -1606,7 +1606,7 @@ void ClassEditorWidget::newMemberFunction() QString szFunctionName; QString szClassName; QString szReminder; - + if(m_pLastClickedItem->isMethod()) m_pLastClickedItem = (ClassEditorTreeWidgetItem*)m_pLastClickedItem->parent(); szClassName = buildFullClassName(m_pLastClickedItem); @@ -1615,7 +1615,7 @@ void ClassEditorWidget::newMemberFunction() return; if(szFunctionName.isEmpty()) return; - + ClassEditorTreeWidgetItem * pItem = newItem(szFunctionName,ClassEditorTreeWidgetItem::Method); pItem->setInternalFunction(bInternal); if(!szReminder.isEmpty()) @@ -1628,11 +1628,11 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::newItem(QString & szName, ClassEd { if(m_pLastClickedItem) buildFullItemPath(m_pLastClickedItem,szName); - + QString szTmp; if(findItem(szName)) szName.append("1"); - + int iIdx = 2; while(findItem(szName)) { @@ -1940,7 +1940,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz QRegExpValidator * pValidator = new QRegExpValidator(re,this); m_pClassNameLineEdit->setValidator(pValidator); m_pClassNameLineEdit->setObjectName("functionameineedit"); - + pHBox = new KviTalHBox(this); pHBox->setSpacing(0); pHBox->setMargin(0); @@ -1969,7 +1969,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz szClasses.append(pBuiltinClasses.currentKey()); ++pBuiltinClasses; } - + int iCurrentIdx; szClasses.sort(); for(int i=0; i < szClasses.count(); i++) @@ -2004,7 +2004,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz pCancelButton->setObjectName("cancelButton"); pCancelButton->setText(__tr2qs_ctx("&Cancel","editor")); connect(pCancelButton, SIGNAL(clicked()), this, SLOT(reject())); - + setLayout(pLayout); } @@ -2081,7 +2081,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co m_pFunctionNameLineEdit->setFocus(); pLabel->setBuddy(m_pInternalCheckBox); connect(m_pFunctionNameLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); - + pHBox->setAlignment(m_pInternalCheckBox,Qt::AlignLeft); pHBox->setStretchFactor(m_pInternalCheckBox,70); pHBox->setStretchFactor(pLabel,30); @@ -2097,7 +2097,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co m_pNewFunctionButton->setText(__tr2qs_ctx("&Add","editor")); else m_pNewFunctionButton->setText(__tr2qs_ctx("&Rename","editor")); - + if(szFunctionName.isEmpty()) m_pNewFunctionButton->setEnabled(false); connect(m_pNewFunctionButton, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h index d9eca0cb9..3982fe7f1 100644 --- a/src/modules/classeditor/ClassEditorWindow.h +++ b/src/modules/classeditor/ClassEditorWindow.h @@ -66,7 +66,7 @@ public: * \return ClassEditorTreeWidget */ ClassEditorTreeWidget(QWidget * pParent); - + /** * \brief Destroys the tree widget */ @@ -109,7 +109,7 @@ public: * \return ClassEditorTreeWidgetItem */ ClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName); - + /** * \brief Constructs the class editor tree widget item * \param pParentItem The parent tree widget item @@ -118,7 +118,7 @@ public: * \return ClassEditorTreeWidgetItem */ ClassEditorTreeWidgetItem(ClassEditorTreeWidgetItem * pParentItem, Type eType, const QString & szName); - + /** * \brief Destroys the class editor tree widget item */ @@ -139,33 +139,33 @@ public: * \return void */ void setInheritsClass(QString szInheritsClassName){ m_szInheritsClassName = szInheritsClassName; }; - + /** * \brief Returns the class name of the classes we inherit from * \return QString */ QString inheritsClass(){ return m_szInheritsClassName; }; - + /** * \brief Returns the name of the item * \return const QString & */ const QString & name(){ return m_szName; }; - + /** * \brief Sets the name of the item * \param szName The name of the item :P * \return void */ void setName(const QString & szName); - + /** * \brief Sets the list of parameters the function accept * \param szRem The parameters' list * \return void */ void setReminder(const QString & szRem){ m_szReminder = szRem; }; - + /** * \brief Returns the parameters list * \return QString @@ -178,70 +178,70 @@ public: * \return void */ void setClassNotBuilt(bool bModified); - + /** * \brief Returns true if we class is not built yet, false otherwise * \return bool */ bool classNotBuilt(){ return m_bClassModified; }; - + /** * \brief Sets the function as internal * \param bInternal Whether the function is internal or not * \return void */ void setInternalFunction(bool bInternal){ m_bInternal = bInternal; }; - + /** * \brief Returns true if the function is set as internal, false otherwise * \return bool */ bool isInternalFunction(){ return m_bInternal; }; - + /** * \brief Returns the type of the item * \return Type */ Type type(){ return m_eType; }; - + /** * \brief Sets the type of the item * \param eType The type! * \return void */ void setType(Type eType); - + /** * \brief Returns true if the item is a class, false otherwise * \return bool */ bool isClass(){ return m_eType == Class; }; - + /** * \brief Returns true if the item is a namespace, false otherwise * \return bool */ bool isNamespace(){ return m_eType == Namespace; }; - + /** * \brief Returns true if the item is a member function, false otherwise * \return bool */ bool isMethod(){ return m_eType == Method; }; - + /** * \brief Saves the code of the item in a buffer * \param szBuffer The buffer ;) * \return void */ void setBuffer(const QString & szBuffer){ m_szBuffer = szBuffer; }; - + /** * \brief Returns the buffer containing the code of the item * \return const QString & */ const QString & buffer(){ return m_szBuffer; }; - + /** * \brief Returns the cursor's position * \return const int & @@ -270,7 +270,7 @@ public: * \return ClassEditorWidget */ ClassEditorWidget(QWidget * pParent); - + /** * \brief Destroys the class editor object */ @@ -299,32 +299,32 @@ public: * \return void */ virtual void saveProperties(KviConfigurationFile * pCfg); - + /** * \brief Called to load the window properties * \param pCfg The configuration file * \return void */ virtual void loadProperties(KviConfigurationFile * pCfg); - + /** * \brief Builds the class! * \return void */ void build(); - + /** * \brief Saves non-built classes to a file * \return void */ void saveNotBuiltClasses(); - + /** * \brief Loads non-built classes to a file * \return void */ void loadNotBuiltClasses(); - + /** * \brief Searches a function * \param szFunctionName The name of the function @@ -340,14 +340,14 @@ public: * \return void */ void exportClasses(bool bSelectedOnly, bool bSingleFiles = false); - + /** * \brief Exports the current selection to single files * \param pList The list of file to export * \return void */ void exportSelectionInSinglesFiles(KviPointerList<ClassEditorTreeWidgetItem> * pList); - + /** * \brief Removes the item from the tree * \param pItem The item to remove @@ -376,21 +376,21 @@ protected: bool askForNamespaceName(const QString & szAction, const QString & szText, const QString & szInitialText, QString & szNameBuffer); bool askForFunction(QString & szFunctionName, QString & szReminder, bool * pbInternal, const QString & szClassName, bool bRenameMode); void searchInheritedClasses(const QString szClass, KviPointerList<ClassEditorTreeWidgetItem> & lInheritsedClasses); - + /** * \brief Returns true if the class exists, false otherwise * \param szName The name of the class * \return bool */ bool classExists(QString & szName); - + /** * \brief Renames a class * \param pClass The class to rename * \return void */ void renameClass(ClassEditorTreeWidgetItem * pClass); - + /** * \brief Renames a namespace * \param pNamespace The namespace to rename @@ -413,9 +413,9 @@ protected: * \return ClassEditorTreeWidgetItem * */ ClassEditorTreeWidgetItem * findItem(const QString & szName); - - - + + + ClassEditorTreeWidgetItem * findTopLevelItem(const QString & szName); ClassEditorTreeWidgetItem * createFullItemRecursive(QTreeWidgetItem * pCurrent, QStringList & lNameSpaces, int & iLevel, bool bCreateNameSpace = 0); protected slots: @@ -435,13 +435,13 @@ protected slots: void slotFind(); void slotFindWord(const QString &); void searchReplace(const QString & szSearch, bool bReplace = false, const QString & szReplace = "n"); - + /** * \brief Called when we collapse an item * \return void */ void slotCollapseItems(); - + /** * \brief Called when we collapse an item recursively * \param pItem The starting item to collapse @@ -454,7 +454,7 @@ protected slots: * \return void */ void removeSelectedItems(); - + /** * \brief Called when we replace text everywhere * \param szBefore The text before the replace @@ -477,7 +477,7 @@ public: * \return ClassEditorWindow */ ClassEditorWindow(); - + /** * \brief Destroys the class editor window */ @@ -490,21 +490,21 @@ protected: * \return QPixmap * */ virtual QPixmap * myIconPtr(); - + /** * \brief Sets the configuration group name as classeditor * \param szName The name of the group * \return void */ virtual void configGroupName(QString & szName); - + /** * \brief Called to save the window properties * \param pCfg The configuration file * \return void */ virtual void saveProperties(KviConfigurationFile * pCfg); - + /** * \brief Called to load the window properties * \param pCfg The configuration file @@ -517,13 +517,13 @@ protected slots: * \return void */ void cancelClicked(); - + /** * \brief Called when we want to build the class * \return void */ void buildClicked(); - + /** * \brief Called when we want to save the class * \return void @@ -550,7 +550,7 @@ public: * \return KviClassEditorDialog */ KviClassEditorDialog(QWidget * pParent, const QString & szName, KviPointerHashTable<QString,ClassEditorTreeWidgetItem> * pClasses, const QString & szClassName, const QString & szInheritsClassName, bool bRenameMode = false); - + /** * \brief Destroys the class dialog */ @@ -565,7 +565,7 @@ public: * \return QString */ QString className(){ return m_pClassNameLineEdit->text(); }; - + /** * \brief Returns the class name of the parent classes * \return QString @@ -599,7 +599,7 @@ public: * \return KviClassEditorFunctionDialog */ KviClassEditorFunctionDialog(QWidget * pParent, const QString & szName, const QString & szClassName, const QString & szFunctionName, const QString & szReminder, bool bIsInternal, bool bRenameMode = false); - + /** * \brief Destroys the function dialog */ @@ -615,7 +615,7 @@ public: * \return QString */ QString functionName(){ return m_pFunctionNameLineEdit->text(); }; - + /** * \brief Returns the parameters of the function * \return QString diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp index e9fe071d2..a55c60b94 100644 --- a/src/modules/context/libkvicontext.cpp +++ b/src/modules/context/libkvicontext.cpp @@ -732,7 +732,7 @@ static bool context_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c) c->returnValue()->setString(""); return true; } - + if(!pSocket->usingSSL()) { c->warning(__tr2qs("Unable to get SSL information: the IRC Connection is not using SSL")); diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt index 3b7d80fca..1496baaff 100644 --- a/src/modules/dcc/CMakeLists.txt +++ b/src/modules/dcc/CMakeLists.txt @@ -21,9 +21,9 @@ set(kvidcc_SRCS ) if(NOT COMPILE_DISABLE_DCC_VIDEO) - list(APPEND kvidcc_SRCS - DccVideoWindow.cpp - ) + list(APPEND kvidcc_SRCS + DccVideoWindow.cpp + ) endif() set(files diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp index 8a7b4d779..484174737 100644 --- a/src/modules/dcc/DccCanvasWindow.cpp +++ b/src/modules/dcc/DccCanvasWindow.cpp @@ -160,7 +160,7 @@ { KviCString buf(KviCString::Format,"%s\r\n",text); // m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index ac4180c6e..5f9cbc470 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -271,9 +271,9 @@ void DccChatWindow::fillCaptionBuffers() { QString tmp = QString("DCC %1 %2@%3:%4").arg( #ifdef COMPILE_SSL_SUPPORT - m_pDescriptor->bIsSSL ? "SChat" : "Chat", + m_pDescriptor->bIsSSL ? "SChat" : "Chat", #else - "Chat", + "Chat", #endif m_pDescriptor->szNick, m_pDescriptor->szIp, m_pDescriptor->szPort); @@ -351,7 +351,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback) KviCString buf(KviCString::Format,"%s\r\n",d); QString tmp = text.right(text.length() - 1); m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), @@ -363,7 +363,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback) #endif KviCString buf(KviCString::Format,"%s\r\n",d); m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), @@ -549,7 +549,7 @@ void DccChatWindow::connected() updateCaption(); m_pSlaveThread = new DccChatThread(this,m_pMarshal->releaseSocket()); - + #ifdef COMPILE_SSL_SUPPORT KviSSL * s = m_pMarshal->releaseSSL(); if(s) diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index a19a59f45..20aa5e2d7 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -656,7 +656,7 @@ void DccSendThread::run() quint64 uTotLastAck = 0; bool bAckHack = false; int iAckHackRounds = 0; - + if(m_pOpt->iPacketSize < 32)m_pOpt->iPacketSize = 32; char * buffer = (char *)KviMemory::allocate(m_pOpt->iPacketSize * sizeof(char)); @@ -761,7 +761,7 @@ void DccSendThread::run() { uTotLastAck = (iAckHackRounds*4u*1024u*1024u*1024u) + iNewAck; } else { - + uTotLastAck = iNewAck; } iBytesInAckBuffer = 0; @@ -773,7 +773,7 @@ void DccSendThread::run() // ssl error....? switch(m_pSSL->getProtocolError(readLen)) { - + case KviSSL::ZeroReturn: //if (!handleInvalidSocketRead(readLen) // break; @@ -866,7 +866,7 @@ void DccSendThread::run() // ssl error....? switch(m_pSSL->getProtocolError(readLen)) { - + case KviSSL::ZeroReturn: readLen = 0; break; @@ -907,7 +907,7 @@ void DccSendThread::run() if (!handleInvalidSocketRead(readLen)) break; #endif - + } else { KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE); e->setData(new KviCString(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc"))); @@ -2207,7 +2207,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f // port doesn't match if(!bFileNameMatches) return false; // neither filename nor port match - + if(!KVI_OPTION_BOOL(KviOption_boolAcceptMismatchedPortDccResumeRequests)) return false; @@ -2218,7 +2218,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f } // port matches - + if(!bFileNameMatches) { // bad file name @@ -2226,7 +2226,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f return false; // neither filename nor port match // port matches (this is very likely to be the right transfer) - + if(!KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests)) { if(_OUTPUT_VERBOSE) diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index b9cd95acc..559af20b1 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -46,7 +46,7 @@ #if defined(COMPILE_SSL_SUPPORT) - // Apple deprecated openssl since osx 10.7: + // Apple deprecated openssl since osx 10.7: #ifdef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER @@ -262,7 +262,7 @@ static bool file_kvs_cmd_writeBytes(KviKvsModuleCommandCall * c) { QString szFileName; KviKvsArray * pArray = NULL; - + KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName) KVSM_PARAMETER("dataArray",KVS_PT_ARRAY,0,pArray) @@ -1107,7 +1107,7 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c) bool bLocal8Bit = c->switches()->find('l',"local-8-bit"); bool bNoSeparator = c->switches()->find('n',"no-separator"); bool bAddCR = c->switches()->find('c',"crlf"); - + if(!f.open(QFile::WriteOnly | (bAppend ? QFile::Append : QFile::Truncate))) { if(!c->switches()->find('q',"quiet")) @@ -1410,7 +1410,7 @@ static bool file_kvs_fnc_diskSpace(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_END(c) if(szPath.isEmpty()) szPath = "."; - + const char * pcPath = szPath.toUtf8().data(); long long int fTotal; long long int fFree; @@ -1467,7 +1467,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c) c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szFile); return true; } - + QByteArray content = file.readAll(); if(content.isEmpty()) { diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index 09f6f021e..73294aeca 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -257,7 +257,7 @@ FileTransferWindow::FileTransferWindow( { g_pFileTransferWindow = this; setAutoFillBackground(false); - + m_pContextPopup = 0; m_pLocalFilePopup = 0; m_pOpenFilePopup = 0; @@ -560,7 +560,7 @@ void FileTransferWindow::openFilePopupActivated(QAction *pAction) QString mimetype = KMimeType::findByPath(tmp)->name(); KService::List offers = KMimeTypeTrader::self()->query(mimetype,"Application"); - + int idx = 0; for(KService::List::Iterator itOffers = offers.begin(); itOffers != offers.end(); ++itOffers) diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp index f37f71a7b..cf81340e8 100644 --- a/src/modules/fish/libkvifish.cpp +++ b/src/modules/fish/libkvifish.cpp @@ -52,7 +52,7 @@ #include "KviCryptController.h" // KviApplication.cpp extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; - + #if defined(COMPILE_SSL_SUPPORT) #include <KviSSL.h> @@ -64,7 +64,7 @@ #include <openssl/sha.h> DH * g_fish_dh = 0; - + // ### new sophie-germain 1080bit prime number ### // const char *g_fish_prime1080_bin="++ECLiPSE+is+proud+to+present+latest+FiSH+release+featuring+even+more+security+for+you+++shouts+go+out+to+TMG+for+helping+to+generate+this+cool+sophie+germain+prime+number++++/C32L"; const char *g_fish_prime1080_hex="FBE1022E23D213E8ACFA9AE8B9DFADA3EA6B7AC7A7B7E95AB5EB2DF858921FEADE95E6AC7BE7DE6ADBAB8A783E7AF7A7FA6A2B7BEB1E72EAE2B72F9FA2BFB2A2EFBEFAC868BADB3E828FA8BADFADA3E4CC1BE7E8AFE85E9698A783EB68FA07A77AB6AD7BEB618ACF9CA2897EB28A6189EFA07AB99A8A7FA9AE299EFA7BA66DEAFEFBEFBF0B7D8B"; @@ -124,7 +124,7 @@ if(!pParams->firstAsString(szNick)) return true; - + pParams->next(); pParams->next(); @@ -160,7 +160,7 @@ szTmp.data() ); } - + if(szMessage.startsWith("DH1080_FINISH ", Qt::CaseSensitive)) { // fish appends an 'A' to all base64 coded strings @@ -171,7 +171,7 @@ if(!c->window()->connection()) return false; - + KviQueryWindow * pWnd = c->window()->connection()->findQuery(szNick); if(!pWnd) { @@ -218,7 +218,7 @@ szFinalKey.bufferToBase64((char *) hashedSecret, SHA256_LEN); //strip the trailing = szFinalKey.stripRight('='); - + KviMemory::free(hashedSecret); #else c->warning(__tr2qs("FiSH has been compiled without ssl support, unable to proceed")); @@ -238,7 +238,7 @@ inf->m_szEngineName = szEngine; inf->m_bDoEncrypt = true; inf->m_bDoDecrypt = true; - + pWnd->setCryptSessionInfo(inf); } else { c->warning(__tr2qs("Failed to initialize the Mircryption engine: %Q"),&(e->lastError())); @@ -285,11 +285,11 @@ static bool fish_module_init(KviModule * m) KviSSL::globalSSLInit(); #endif m->kvsRegisterAppEventHandler(KviEvent_OnQueryNotice,fish_event_onQueryNotice); - + KVSM_REGISTER_SIMPLE_COMMAND(m,"keyx",fish_cmd_keyx); return true; -#else +#else return false; #endif } diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index b1dd47e34..95d125cfe 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -196,7 +196,7 @@ QString HelpIndex::getCharsetForDocument(QFile *file) meta = meta.toLower(); QRegExp r(QLatin1String("charset=([^\"\\s]+)")); if (r.indexIn(meta) != -1) { - encoding = r.cap(1); + encoding = r.cap(1); } } @@ -284,13 +284,13 @@ void HelpIndex::writeDocumentList() return; QDataStream s( &f ); s << docList; - + QFile f1( docListFile+".titles" ); if ( !f1.open(QFile::WriteOnly ) ) return; QDataStream s1( &f1 ); s1 << titleList; - + } void HelpIndex::readDict() diff --git a/src/modules/help/HelpIndex.h b/src/modules/help/HelpIndex.h index 6eb1cdf6c..effe15f8e 100644 --- a/src/modules/help/HelpIndex.h +++ b/src/modules/help/HelpIndex.h @@ -96,7 +96,7 @@ public: void setDictionaryFile( const QString& ); void setDocListFile( const QString& ); void setDocList( const QStringList & ); - + const QStringList& documentList() { return docList; }; const QStringList& titlesList() { return titleList; }; diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp index 44be162fe..9db49d8a9 100644 --- a/src/modules/help/HelpWidget.cpp +++ b/src/modules/help/HelpWidget.cpp @@ -76,12 +76,12 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone) m_pTextBrowser->setStyleSheet("QTextBrowser { background-color:white; color:black; }"); m_pLayout->addWidget(m_pTextBrowser); connect(m_pTextBrowser,SIGNAL(loadFinished(bool)),this,SLOT(slotLoadFinished(bool))); - + // lower toolbar m_pToolBarHighlight = new QToolBar(this); m_pLayout->addWidget(m_pToolBarHighlight); m_pToolBarHighlight->hide(); - + QLabel *pHighlightLabel = new QLabel(); pHighlightLabel->setText(__tr2qs("Highlight: ")); m_pToolBarHighlight->addWidget(pHighlightLabel); diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 563b7aa93..0ed1f86fd 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -58,7 +58,7 @@ HelpWindow::HelpWindow(const char * name) m_pHelpWidget = new HelpWidget(m_pSplitter); - m_pToolBar=new KviTalVBox(m_pSplitter); + m_pToolBar=new KviTalVBox(m_pSplitter); m_pTabWidget = new QTabWidget(m_pToolBar); m_pBottomLayout = new KviTalHBox(m_pToolBar); diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h index 29e6a3dea..c9817f008 100644 --- a/src/modules/help/HelpWindow.h +++ b/src/modules/help/HelpWindow.h @@ -92,7 +92,7 @@ public slots: void startSearch(); void searchSelected ( QListWidgetItem * ); void refreshIndex(); - + void initialSetup(); void indexingStart( int iNum ); void indexingProgress( int iNum ); diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp index 515ec96cc..b7d5aa23a 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -46,7 +46,7 @@ #ifdef COMPILE_CRYPT_SUPPORT - + #include "KviMemory.h" #include "KviPointerList.h" #include "KviCryptEngineDescription.h" @@ -102,7 +102,7 @@ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 223 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 231 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 239 : - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : + 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 }; @@ -138,11 +138,11 @@ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 223 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 231 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 239 : - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : + 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 }; - - + + KviCryptEngine::EncryptResult KviLamerizerEngine::encrypt(const char * plainText,KviCString &outBuffer) { outBuffer = plainText; @@ -167,7 +167,7 @@ aux++; } } - + if(!m_bLight) { outBuffer.replaceAll("F","Ph"); diff --git a/src/modules/language/detector/data/afrikaans-iso-8859-15.dat b/src/modules/language/detector/data/afrikaans-iso-8859-15.dat index d250221da..c90f79aca 100644 --- a/src/modules/language/detector/data/afrikaans-iso-8859-15.dat +++ b/src/modules/language/detector/data/afrikaans-iso-8859-15.dat @@ -1,6 +1,6 @@ die vorm aanneem van 'n man sonder 'n gesig en 'n rooi en wit geknoopte - + gaan word, kinders wat in konsentrasiekampe gevange gehou gaan word, bestaan nie. @@ -84,8 +84,8 @@ gediskrimineer sal word. Maar in die tyd wat die seun begin skoolgaan Skielik staan Kootjie op. "Hy's dood", s hy eenvoudig. Hy kyk na die Alles is dan so gou verby. - - + + die geleidelike ontlading van die week se spanning te wyt. die winter was al in sy doodsnikke, dan kon jy nog die herfs in sy o @@ -108,7 +108,7 @@ deur Johan Horn dat hy nie sy geslagsdeel met beide hande vasgehou het nie. "Dit was my oomblik met Vreugde," glimlag hy dan en haal sy beursie uit - + "Ek is 'n fee, nie 'n engel nie!" antwoord sy en vou haar arms uitdagend Ek het maar gesukkel hier. Baie moeite om aan te pas. Maar hier is ek diff --git a/src/modules/language/detector/data/basque-iso-8859-15.dat b/src/modules/language/detector/data/basque-iso-8859-15.dat index 70a77321a..4dda958fa 100644 --- a/src/modules/language/detector/data/basque-iso-8859-15.dat +++ b/src/modules/language/detector/data/basque-iso-8859-15.dat @@ -1,77 +1,77 @@ perifrasietara mugatzen ez bagara. Adibidez:25 - Cambridge University Press. + Cambridge University Press. + + Euskalki guztietan, ezin elementuaz osatutako perifrasiak erabil - Euskalki guztietan, ezin elementuaz osatutako perifrasiak erabil - 3.2. EZIN IZAN - (14b) ulertu + behar duzu - + (14b) ulertu + behar duzu + Brunot ezin zen baliatu gaurko kontzeptu pragmatiko eta linguistikoez. A.K.: Ofizialki ez. Aztertzaileek ohar bat idazten dute beren txosten - Badaude, alegia, 3.3.2 eta 3.3.3an aipatutako bi joerak berak. Euskara + Badaude, alegia, 3.3.2 eta 3.3.3an aipatutako bi joerak berak. Euskara + + + + zer gertatuko den derrigorrez), (2)an posibilitatea (mundu horretan zer gerta - - zer gertatuko den derrigorrez), (2)an posibilitatea (mundu horretan zer gerta - - A.K.: Asko. Mundu bat dago hor. Kontzeptu batzuk hizkuntzen irakaskuntzan - modaltasun epistemikoak hiztunaren sinesmenak adierazten ditu. Ondoko bi - + modaltasun epistemikoak hiztunaren sinesmenak adierazten ditu. Ondoko bi + ateratzen duen Euskaltzaindiko batzordeko partaide da aspaldiko partez. A.K.: Ez dakit oraindik. Ez dut astirik izan ongi aztertzeko non komeni - daitezke.10 Hizkuntza desberdin askotan formalki agerian egoten diren + daitezke.10 Hizkuntza desberdin askotan formalki agerian egoten diren (43a) *esateko beharrik azken urteotan egiten ari diren ikerketak interes haundikoak izan daitezke 3.3. BEHAR IZAN Herrian finkatu naiz, hasieran Donostian eta azken lau urteotan Zarautzen. urruti samar dago nik ulertzen dudan kontzeptutik. Bestalde, G. Leech - batetatik, geruzapena delako kontzeptuaz ere balia gaitezke.13 Frantses + batetatik, geruzapena delako kontzeptuaz ere balia gaitezke.13 Frantses + - luzatzea, denbora minimoan egiteko apostu egin nuen. Eta hala egin nuen. buruz beste bat hasita daukat. Eta berriena: miscellanea idiomatica delako - litzateke egokia eros(i) nezake (bizkaieraz neike) eta joan ninteke - -Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, + litzateke egokia eros(i) nezake (bizkaieraz neike) eta joan ninteke + +Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, *Euskal Herrian Euskaraz. Euskararen defentsarako herri mugimendua - Forma gramatikalizatuagoen esanahiak orokorragoak, zabalagoak eta + Forma gramatikalizatuagoen esanahiak orokorragoak, zabalagoak eta + +(E) Baliabide linguistikoen zerrenda ez da amaitzen hemen aditzezko -(E) Baliabide linguistikoen zerrenda ez da amaitzen hemen aditzezko + zenbait baliokide erabili ohi diren testuinguruetara larregi zabaltzea. - zenbait baliokide erabili ohi diren testuinguruetara larregi zabaltzea. - - Euskaltzaindia (1987). Euskal gramatika: lehen urratsak, 2. tomoa. Bilbo: Euskaltzaindia. + Euskaltzaindia (1987). Euskal gramatika: lehen urratsak, 2. tomoa. Bilbo: Euskaltzaindia. - epistemikoa adierazten baitu,18 adibidez: - + epistemikoa adierazten baitu,18 adibidez: + + + gramatiketan aipatu ohi diren aditz modalen ezaugarri nagusiak2 -ezaugarri +26. Wilbur-entzat (1981:172) ahal, behar eta nahi "root-modal particles" + Kategoria semantiko gisa, aldiz, modaltasun kontzeptua edozein - gramatiketan aipatu ohi diren aditz modalen ezaugarri nagusiak2 -ezaugarri -26. Wilbur-entzat (1981:172) ahal, behar eta nahi "root-modal particles" - Kategoria semantiko gisa, aldiz, modaltasun kontzeptua edozein - daukagu; hau egiazko aintzindaritzat emango nuke. Orain dela bi urte, bihar edo) beharbada modaltasun epistemikoa adieraz dezakete. eta J. Svartvik-en 1975eko A communicative grammar of English delakoa moduan erabili duzula interesatzen zaizkizun puntu batzuk aztertzeko? - - Behar bezala, nahi berez izena da, nahiz nahi-ren izenezko erabilera - derrigorrez sinonimotzat jotzen direnik, baizik eta hein batetako kidetasun + Behar bezala, nahi berez izena da, nahiz nahi-ren izenezko erabilera + + derrigorrez sinonimotzat jotzen direnik, baizik eta hein batetako kidetasun ideiari jarraituz idatzi zen lehenengo hizkuntz deskribapena; jakina, Galdera: Ematen da notarik edo bestelako kalifikapenik? @@ -80,37 +80,37 @@ Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, zaidan kaleratzea, ezta nor egongo litzatekeen argitaratzeko prest ere. acts kontzeptua dute iturri, baina kontzeptua geroztik oso landua izan - berriro--hots, (55) eta (56), (55) eta (57) erabiltzea baino hobe: + berriro--hots, (55) eta (56), (55) eta (57) erabiltzea baino hobe: + - hau da, ea gramatika deskribapen "osorik" aurkitzen den munduan. Baina haundia da, dedikazio gehiegi eskatuko luke, eta suposatzen duen ezagupen hitza dakarkidala burura, asoziazioz edo). "Epaimahai" bezala, bi kanpoko - -7. Hegoaldeko euskaran; iparraldeko hizkeretan, berriz, (2)ko egiturak + +7. Hegoaldeko euskaran; iparraldeko hizkeretan, berriz, (2)ko egiturak gogoa eduki < nahi izan < - + Lhande, P. (1926). Dictionnaire basque-franais. Paris: Gabriel Beauchesne. - + gero eta presio gehiago egiten ari da Inglaterran tesiak lehenbailehen - - kasua, non derrigorrezkoa baita ahal izan-en erabilpena (edo beste - erabilpena nahi-rena baino are murritzagoa dela dirudi. - + kasua, non derrigorrezkoa baita ahal izan-en erabilpena (edo beste + erabilpena nahi-rena baino are murritzagoa dela dirudi. + + dela inoiz egingo? - + unibertsitateko tesi doktorala denez, inglesez dago noski. Luzeraz, 400 - erabileran berean ez ezik, zuzentasunari buruzko kontzeptuetan ere. Konfusio - ditu, bereizketa zenbait arrazoi sintaktikotan oinarritzen dituelarik. + erabileran berean ez ezik, zuzentasunari buruzko kontzeptuetan ere. Konfusio + ditu, bereizketa zenbait arrazoi sintaktikotan oinarritzen dituelarik. gerundiboa bezalatsu erabilirik).24 - besteak beste, inoiz berezitzat hartu dituzte ikuspegi sintaktiko batetatik, + besteak beste, inoiz berezitzat hartu dituzte ikuspegi sintaktiko batetatik, posibilitatea edo ez-segurtasuna A.K.: Ez dut uste neronek bakarrik tamaina haundiko euskal gramatika Eta 1993ko abenduan Londresko Unibertsitatean doktoratu egin zen linguistikan, @@ -118,7 +118,7 @@ Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, 12. King (1993:110). probetxagarriak gramatika komunikatiboaren teoria lantzerakoan? - + ahozko azterketa bat da, "viva voce" deitzen dena (edo laburturik, "viva" Euskarazko Orrialdea @@ -129,8 +129,8 @@ Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, A.K.: Izugarrizkoa. Hitz gutxitan, pragmatikan aztertzen dira linguista - - - - Wilbur, T.H. (1981). Basque syntax. Euskalarien nazioarteko jardunaldiak, pp. 169-186, + + + + Wilbur, T.H. (1981). Basque syntax. Euskalarien nazioarteko jardunaldiak, pp. 169-186, diff --git a/src/modules/language/detector/data/catalan-iso-8859-15.dat b/src/modules/language/detector/data/catalan-iso-8859-15.dat index 3762f1786..94e14462a 100644 --- a/src/modules/language/detector/data/catalan-iso-8859-15.dat +++ b/src/modules/language/detector/data/catalan-iso-8859-15.dat @@ -23,7 +23,7 @@ programa de las "Nits i efecte de garantir d'ara en endavant la l'estructura del Patronat, i ms tard se y el Ayuntamiento - 46 motocicletas y ciclomotores + 46 motocicletas y ciclomotores guionistes. inserir icones d'accs directe al costat del amb seu a Seattle, no t magatzem diff --git a/src/modules/language/detector/data/chinese-big5.dat b/src/modules/language/detector/data/chinese-big5.dat index dce143083..b3fd4a0ac 100644 --- a/src/modules/language/detector/data/chinese-big5.dat +++ b/src/modules/language/detector/data/chinese-big5.dat @@ -1,7 +1,7 @@ ~ Q ` K F p ~ A M b ] _ D C - * ĥ|QE^G睊Bzsh AUUD + * ĥ|QE^G睊Bzsh AUUD j B j B u M h H h K i p ` q u X ~ q M q T @@ -37,8 +37,8 @@ O O D P M p M L T ~ M Y ~ B s ~ s ~ [ ~ T i | C M h O H D q U M q H - * ĤQ^GLͤTڼƽXӬ۾E䲣qCnF - * ĥ|QK^GMG ʵ{ݧﵽ@ĪGݡutv@ + * ĤQ^GLͤTڼƽXӬ۾E䲣qCnF + * ĥ|QK^GMG ʵ{ݧﵽ@ĪGݡutv@ ~ ~ q M u | O q ~ W M ] F i [ H C @@ -59,7 +59,7 @@ | L i N M I l U I l G J W A S A P _ H U G n @ p ~ W j w C - * ĥ|QE^G睊Bzsh AUUD + * ĥ|QE^G睊Bzsh AUUD } M k w M P y M ¾ o { q @@ -67,7 +67,7 @@ d @ i @ B d C x V j o e M C - * ĤCQT^G@CӪOETܥdغؤP + * ĤCQT^G@CӪOETܥdغؤP M ` b G Q C I E a q M F b s @ M ~ D g M C @@ -97,7 +97,7 @@ E Q C C ij O b u L i ` v p U M ~ X ij M PqqlзsDХa - * ĤQ^Gp뱽ynPaEկȤW[¦QrpH + * ĤQ^Gp뱽ynPaEկȤW[¦QrpH e ] x M M w T ~ V q H d P M B X U C ¾ u F w D p | X E K ~ [ ~ v Q diff --git a/src/modules/language/detector/data/chinese-gb2313.dat b/src/modules/language/detector/data/chinese-gb2313.dat index cb3800127..36660d7ce 100644 --- a/src/modules/language/detector/data/chinese-gb2313.dat +++ b/src/modules/language/detector/data/chinese-gb2313.dat @@ -1,158 +1,158 @@ - ̲ס -Ӣ ڽ ʵ ̸ - ʼ - Ӫ Ʊ ǻ ˮ ƽ - - Ա ֳ - ˵ ֧ Ϲ կ -ƻ Ʒ ۸ ϸ ִй - ڿ Ů - Ʒ -Ҫ ˤ ϴ - -Ŀǰ ԭ -ȫϵ С - -ؼ - ҹ ȡ Ŀ ΰɾ - չ ߷ - ȥ - - ˿ ֮ ʮ -չ ڼ -ܵ ũ ӭ - Լ չ Ҫ - ϵ Ǣ - - -Я -Ŀ - ɹ ϵͳ -绰 Ԫ - -Ϲ ⳤ - - - Ӣ ٷ ͳ - ɲ ְ Ƿ Ԫ - - - - - ˵ - -ȳ ک ս -һ Ϸ - - ȡ 彨 ش ʤ -ι ʫ - - ͬ չ ֲ Ӧ - ȫ ҩƷ - Ѯ ֵ - - - ֮ ʮ ս Լ - һ - ë һ Ů ӪҵԱ Ƽ -Ϊ ˳ -Ϻ Ϳ - ո ĥ ˵ -ְ - վ - -ί Ա -ž äĿ - һ ʽ ѵ ѵ - -̶ ٻ Ķ ɭ - ճ - Сʱ ս - ȫ ÿ λ - ȫ ˲ ʹ - ȥ - -վ 쵼 Э - - Ǽ Լ Ԫ - ʵ ƻ - Ү· о - - ʮ - ʲ ɧ κ ϵ - - ά ¯ ʱ -Сѧ ˼ Ҫ dz - - ȡ -Ϊ ά Ŭ -ṩ Ϣ - ֽ ſ - - Ӫ - - - ٿ ṩ Ϣ - ᳹ ִ ӳ - ﷸ κ ֤ -ʳ չ ʽ Ϊ ص - ũ -ʩ λ Υ Ӫ - Σ - ½ о 滮 ʵʩ - ס θ - ˷ ӵ - ũҵ о -й Ͷ ˾ ½ 쵼 - װ ͻ - Լ ɽ ʡ ũ Сѧ -ְ - Ϊ ͳ ҵ ע ѪҺ - Ⱥ - - Ͷ - ʱ -ҹ ﵽ Ƚˮ ƽ -Сѧ ˼ Ҫ dz -Щ ǰ Ȱ -ֹ ҵ ְ - - ߷ -ȫ Ϸ ʡ - ȱ - - ս -ʹ Ʒ ۸ ͬҵ ˮ ƽ - - Ӣ Ӽ - - - ҵ ʵ ˰ Ԫ - ѧ ¥ - ɱ ھ - ܳ -ί - -ȥ - ʱ ̨ ը - ҹ ũҵ ; - Ȩ - - ֽ ʱ ƪ ͷ չ Ϣ - ; - - Ѯ - - - ܳ - ˵ - - - ָ - ʱ ʱ - ߽ -ë - ǰ ֮ ȥ ֮ - - й » -ʹ ջ һ + ̲ס +Ӣ ڽ ʵ ̸ + ʼ + Ӫ Ʊ ǻ ˮ ƽ + + Ա ֳ + ˵ ֧ Ϲ կ +ƻ Ʒ ۸ ϸ ִй + ڿ Ů + Ʒ +Ҫ ˤ ϴ + +Ŀǰ ԭ +ȫϵ С + +ؼ + ҹ ȡ Ŀ ΰɾ + չ ߷ + ȥ + + ˿ ֮ ʮ +չ ڼ +ܵ ũ ӭ + Լ չ Ҫ + ϵ Ǣ + + +Я +Ŀ + ɹ ϵͳ +绰 Ԫ + +Ϲ ⳤ + + + Ӣ ٷ ͳ + ɲ ְ Ƿ Ԫ + + + + + ˵ + +ȳ ک ս +һ Ϸ + + ȡ 彨 ش ʤ +ι ʫ + + ͬ չ ֲ Ӧ + ȫ ҩƷ + Ѯ ֵ + + + ֮ ʮ ս Լ + һ + ë һ Ů ӪҵԱ Ƽ +Ϊ ˳ +Ϻ Ϳ + ո ĥ ˵ +ְ + վ + +ί Ա +ž äĿ + һ ʽ ѵ ѵ + +̶ ٻ Ķ ɭ + ճ + Сʱ ս + ȫ ÿ λ + ȫ ˲ ʹ + ȥ + +վ 쵼 Э + + Ǽ Լ Ԫ + ʵ ƻ + Ү· о + + ʮ + ʲ ɧ κ ϵ + + ά ¯ ʱ +Сѧ ˼ Ҫ dz + + ȡ +Ϊ ά Ŭ +ṩ Ϣ + ֽ ſ + + Ӫ + + + ٿ ṩ Ϣ + ᳹ ִ ӳ + ﷸ κ ֤ +ʳ չ ʽ Ϊ ص + ũ +ʩ λ Υ Ӫ + Σ + ½ о 滮 ʵʩ + ס θ + ˷ ӵ + ũҵ о +й Ͷ ˾ ½ 쵼 + װ ͻ + Լ ɽ ʡ ũ Сѧ +ְ + Ϊ ͳ ҵ ע ѪҺ + Ⱥ + + Ͷ + ʱ +ҹ ﵽ Ƚˮ ƽ +Сѧ ˼ Ҫ dz +Щ ǰ Ȱ +ֹ ҵ ְ + + ߷ +ȫ Ϸ ʡ + ȱ + + ս +ʹ Ʒ ۸ ͬҵ ˮ ƽ + + Ӣ Ӽ + + + ҵ ʵ ˰ Ԫ + ѧ ¥ + ɱ ھ + ܳ +ί + +ȥ + ʱ ̨ ը + ҹ ũҵ ; + Ȩ + + ֽ ʱ ƪ ͷ չ Ϣ + ; + + Ѯ + + + ܳ + ˵ + + + ָ + ʱ ʱ + ߽ +ë + ǰ ֮ ȥ ֮ + + й » +ʹ ջ һ diff --git a/src/modules/language/detector/data/danish-iso-8859-15.dat b/src/modules/language/detector/data/danish-iso-8859-15.dat index 93e7a75b6..2c5dd0f9d 100644 --- a/src/modules/language/detector/data/danish-iso-8859-15.dat +++ b/src/modules/language/detector/data/danish-iso-8859-15.dat @@ -4,21 +4,21 @@ beskftigelseskonsulenterne lser denne opgave. Der er mange grunde hertil, fx r tnker lige som du selv. Du br altid teste din hjemmeside p en konkrete undersgelser er en evaluering af SUM-programmets formidlingsenheder og en undersgelse af de - deltageren vre bevidst om de centrale forhold i at deltage i et projekt, + deltageren vre bevidst om de centrale forhold i at deltage i et projekt, soziokonomische Analyse von Storstrms Amt, Dnemark, und des Kreises Ostholstein, Deutschland. Im - Samlinger, som endnu ikke er ordnede, er altid utilgngelige. + Samlinger, som endnu ikke er ordnede, er altid utilgngelige. at vor indlringsevne stiger ved alfabetiske og systematiske katalog og i de srlige brevregistranter i de browsere, de foretrkker, og som kan kre p deres maskiner, og det er -ikke tilfldet under den nuvrende elforsyningslov. +ikke tilfldet under den nuvrende elforsyningslov. AKF-Nyt nr. 4 december 1994: Tema: Samfund, konomi og milj. -Milevogn til udmling af vejlngder. Et tllevrk opsummerer den krte distance. (Tjhusmuseet) +Milevogn til udmling af vejlngder. Et tllevrk opsummerer den krte distance. (Tjhusmuseet) "Grundfos Worldwide" ville have vret mere dkkende. -Bibliotek) +Bibliotek) - PLACERING -Skjold med Dannebrog- og Elefantordenens kde. (Tjhusmuseet) + PLACERING +Skjold med Dannebrog- og Elefantordenens kde. (Tjhusmuseet) stiliseret tegning. styringsinstrument i forhold til transportomfanget og energiforbruget. Dette sker ved konometriske analyser @@ -34,17 +34,17 @@ Hugo Allardt Koppenhagen. Kobberstik udfrt i Amsterdam i midten af 1600-tallet. den renssanceforskning, der finder sted i Danmark, samt knytte og udbygge forbindelser til udenlandske Det er godt, at der er en klart mrket knap for at skifte sprog for f.eks. har en ikke grafisk browser, fr kun at vide, at siden indeholder "Image" -conference European Welfare Development sharing experience June 27-29 1994 in Denmark. - henvendelse til Telefonbestillingen (33 93 01 11 man-fre 10-13). +conference European Welfare Development sharing experience June 27-29 1994 in Denmark. + henvendelse til Telefonbestillingen (33 93 01 11 man-fre 10-13). Det er veldokumenteret, at et menneske kan holde syv (plus/minus to) begreber Hndskrifter og arkivmateriale er unikt kildemateriale, der ikke -Den ny Aristoteles +Den ny Aristoteles Kopiering Der var system og teori bag de store jagtscener: kobbertavler fra Jo. Tntzer's jagtbog, eller Jagt Wissenschaft, Dannebrogsordenen. De hvide riddere af Dannebrogsordenen var frst og fremmest embedsmnd, der stod lsesalen p Amager. Der tages forbehold overfor skrbeligt og - Karen Blixens arkiv + Karen Blixens arkiv gre det klart, at det ikke er et link til Ramblls egen ledelse. energi. Christian frte dagbog over sine oplevelser under dannelsesrejsen. Flere i prinsens flge skrev ogs dagbger, @@ -55,12 +55,12 @@ Christian frte dagbog over sine oplevelser under dannelsesrejsen. Flere i prins projekt. det gr det ikke. Linket gr til en generel web-side om brskurser. Den enevldige kongemagt nskede at skabe et system, hvor det var klart, at re og -Christian 5. Kobberstik af Pieter van Haarlem fra 1686. (Det kongelige Bibliotek) -conference European Welfare Development sharing experience June 27-29 1994 in Denmark. +Christian 5. Kobberstik af Pieter van Haarlem fra 1686. (Det kongelige Bibliotek) +conference European Welfare Development sharing experience June 27-29 1994 in Denmark. Danmark end de langt mere reguleringstunge engelske og amerikanske modeller. Den store vgtning af Aristoteles, end i de foregende 1000 r. Endvidere blev de middelalderlige, latinske Aristoteles-oversttelser - Thott + Thott hndskrifter og privatarkiver, breve, manuskripter, optegnelser ses som karakteristiske for det moderne samfund. 1400 og 1500-tallets mest markante bidrag til det Jahre und die Erwartungen fr die nchsten 1-2 jahre. Im Abschnitt vier werden die langfristigen @@ -68,8 +68,8 @@ Jahre und die Erwartungen fr die nchsten 1-2 jahre. Im Abschnitt vier werden d siden overset af mange. udviklingen af renssancens epos og for teatret. Endelig kom Politikken, der i Leonardo Brunis oversttelse - Martin Andersen Nexs arkiv + Martin Andersen Nexs arkiv af kongemagten og sikringen af dens voldsmonopol var flles for flertallet af stater i I anledning af kongens frelse fra havet skrev Thomas Kingo et hyldestdigt til Christian 5. Omtalen af -prinsesser var indtgtskilde for de kbenhavnske bogtrykkere i 1700-tallet. (Det kongelige Bibliotek) +prinsesser var indtgtskilde for de kbenhavnske bogtrykkere i 1700-tallet. (Det kongelige Bibliotek) Jensen, Torben Pilegaard, Franck Andersen, Sren Arnberg, Jan Christensen: AMU og kommunerne. 152 diff --git a/src/modules/language/detector/data/english-iso-8859-15.dat b/src/modules/language/detector/data/english-iso-8859-15.dat index 696bd1679..a825a3cce 100644 --- a/src/modules/language/detector/data/english-iso-8859-15.dat +++ b/src/modules/language/detector/data/english-iso-8859-15.dat @@ -1,62 +1,62 @@ - deputies of the strongest cities awed and corrupted those of the - leaders became mercenary instruments for inveigling their countrymen. - government and her legislation. This circumstance alone proves a - nation we have made peace and war; as a nation we have vanquished - government itself; and there is nothing to check the inducements to - constitution, it emphatically illustrates the tendency of federal - of an adoption of the new Constitution or a dismemberment of the - bodies rather to anarchy among the members, than to tyranny in the - injustice, and confusion introduced into the public councils, have, - abetted by Athens and Sparta, refused to submit to the decree. The - commencing demagogues, and ending tyrants. - form the memorable Congress of 1774. That body recommended certain -government, frequent appeals would, in a great measure, deprive - the possession of different degrees and kinds of property - chains, under which it is groaning at this hour. - Theoretic politicians, who have patronized this species of -less adverse to the executive and judiciary departments. The - unfriendly passions and excite their most violent conflicts. But - of the members on the federal head. - Achaeans, though weakenened by internal dissensions and by the - and to inflict vengeance on sacrilegious despoilers of the temple. - or extensive republics are more favorable to the election of proper -Had the Greeks, says the Abbe Milot, been as wise as they were - or by other means, first obtain the suffrages, and then betray the - insuperable obstacle to a uniformity of interests. The protection - place in one national government. - as successors of Alexander, were rivals of the king of Macedon. - sentiments and views of the respective proprietors, ensues a - party and faction in the necessary and ordinary operations of the - ADOPTION WILL AFFORD TO THE PRESERVATION OF THAT SPECIES OF - society, the fewer probably will be the distinct parties and - interests, the more frequently will a majority be found of the same - have already sufficient indications that it will happen in this as -The influence of factious leaders may kindle a flame within - circumstances and lesser interests; as by reducing it too much, you - The Amphictyons were the guardians of religion, and of the immense - time, be perfectly equalized and assimilated in their possessions, - commencing demagogues, and ending tyrants. -expense of the other departments. The appeals to the people, - increased variety of parties comprised within the Union, increase - influence on each other; and the former will be objects to which -government hold their power, is derived, it seems strictly - majority at the same time must be prevented, or the majority, having - Union gives it the most palpable advantage. - she had been a member, left her in the full exercise of her - the one, by destroying the liberty which is essential to its - in what degree, by restrictions on foreign manufactures? are - nature. I am well aware that it would be disingenuous to resolve - the reasons on which they are founded. The consciousness of good - abetted by Athens and Sparta, refused to submit to the decree. The - confederation, and persevered in her union, she would never have - TO PRESERVE THAT UNION THE NECESSITY OF A GOVERNMENT AT LEAST - wrong election of the part we shall act may, in this view, deserve - regarded as the era in which that decision is to be made; and a - attached, provides a proper cure for it. The instability, - increased variety of parties comprised within the Union, increase -most influential part of the society. The nature of their public - in the substitution of representatives whose enlightened views and - attempts, from whatever quarter, to influence your decision in a -As a weak government, when not at war, is ever agitated by - number of unsocial, jealous, and alien sovereignties. -Whilst the Amphictyonic confederacy remained, that of the + deputies of the strongest cities awed and corrupted those of the + leaders became mercenary instruments for inveigling their countrymen. + government and her legislation. This circumstance alone proves a + nation we have made peace and war; as a nation we have vanquished + government itself; and there is nothing to check the inducements to + constitution, it emphatically illustrates the tendency of federal + of an adoption of the new Constitution or a dismemberment of the + bodies rather to anarchy among the members, than to tyranny in the + injustice, and confusion introduced into the public councils, have, + abetted by Athens and Sparta, refused to submit to the decree. The + commencing demagogues, and ending tyrants. + form the memorable Congress of 1774. That body recommended certain +government, frequent appeals would, in a great measure, deprive + the possession of different degrees and kinds of property + chains, under which it is groaning at this hour. + Theoretic politicians, who have patronized this species of +less adverse to the executive and judiciary departments. The + unfriendly passions and excite their most violent conflicts. But + of the members on the federal head. + Achaeans, though weakenened by internal dissensions and by the + and to inflict vengeance on sacrilegious despoilers of the temple. + or extensive republics are more favorable to the election of proper +Had the Greeks, says the Abbe Milot, been as wise as they were + or by other means, first obtain the suffrages, and then betray the + insuperable obstacle to a uniformity of interests. The protection + place in one national government. + as successors of Alexander, were rivals of the king of Macedon. + sentiments and views of the respective proprietors, ensues a + party and faction in the necessary and ordinary operations of the + ADOPTION WILL AFFORD TO THE PRESERVATION OF THAT SPECIES OF + society, the fewer probably will be the distinct parties and + interests, the more frequently will a majority be found of the same + have already sufficient indications that it will happen in this as +The influence of factious leaders may kindle a flame within + circumstances and lesser interests; as by reducing it too much, you + The Amphictyons were the guardians of religion, and of the immense + time, be perfectly equalized and assimilated in their possessions, + commencing demagogues, and ending tyrants. +expense of the other departments. The appeals to the people, + increased variety of parties comprised within the Union, increase + influence on each other; and the former will be objects to which +government hold their power, is derived, it seems strictly + majority at the same time must be prevented, or the majority, having + Union gives it the most palpable advantage. + she had been a member, left her in the full exercise of her + the one, by destroying the liberty which is essential to its + in what degree, by restrictions on foreign manufactures? are + nature. I am well aware that it would be disingenuous to resolve + the reasons on which they are founded. The consciousness of good + abetted by Athens and Sparta, refused to submit to the decree. The + confederation, and persevered in her union, she would never have + TO PRESERVE THAT UNION THE NECESSITY OF A GOVERNMENT AT LEAST + wrong election of the part we shall act may, in this view, deserve + regarded as the era in which that decision is to be made; and a + attached, provides a proper cure for it. The instability, + increased variety of parties comprised within the Union, increase +most influential part of the society. The nature of their public + in the substitution of representatives whose enlightened views and + attempts, from whatever quarter, to influence your decision in a +As a weak government, when not at war, is ever agitated by + number of unsocial, jealous, and alien sovereignties. +Whilst the Amphictyonic confederacy remained, that of the diff --git a/src/modules/language/detector/data/finnish-iso-8859-15.dat b/src/modules/language/detector/data/finnish-iso-8859-15.dat index 6220bb56e..88de67d1a 100644 --- a/src/modules/language/detector/data/finnish-iso-8859-15.dat +++ b/src/modules/language/detector/data/finnish-iso-8859-15.dat @@ -21,7 +21,7 @@ GHOSTS...of the Civil Dead -elokuvan nostattamassa keskustelussa on kiinnitetty soidinhuutojaan kirkkaina alkuiltoina ennen keskiyt, jolloin ni kantaa Viittaamme ylloleviin vastauksiin. puuhailevat kahden koulupivn ajan ympristkysymysten parissa. Pienryhmiin jakaantuneina nuoret - Muutoksenhakuelimen toimiva valtion tilintarkastuslautakunta + Muutoksenhakuelimen toimiva valtion tilintarkastuslautakunta naistoimikunnan toiminnasta useita vuosia.. Olen jrjestnyt lukemattomia @@ -49,14 +49,14 @@ Glover - Kevin Mackey Helsinki kaataa huvikseen mets Nuuksiossa! uusia ihmisi toimimaan ympristn puolesta. Koulujen pienryhmist kehkeytyy helposti pysyvi maitotlkkej, vai peltilehm, suurta maitosilit? Ent onko voi tarjolla viheliisiss napeissa vai reilun - tuovat. Olen huolestunut ja aion vaikuttaa + tuovat. Olen huolestunut ja aion vaikuttaa Mit tulee postitoiminnan kokonaisuudelle aiheutuvaan haittaan, Keskuskauppakamari toteaa, -oikeuttaa status quon silyttmiseen thtvt yhteiskunnalliset kontrollivlineet, kuten poliisivoimat." +oikeuttaa status quon silyttmiseen thtvt yhteiskunnalliset kontrollivlineet, kuten poliisivoimat." stmisjrjestyksess. - Keskuskauppakamarin mielest argumentti ei ole vakuuttava edell esitetyin perustein. + Keskuskauppakamarin mielest argumentti ei ole vakuuttava edell esitetyin perustein. yrityksen ja rahoittajan vlinen keskininen periaatteessa vapaa sopimustilanne, yhtyy - Helvetiss. + Helvetiss. Jos hakija haluaa toiminta-aluettaan nyt laajennettavan siten, ett sill olisi vaikutusta hakijan jrisyttvsti, ett niit voidaan sanoa samanlaisiksi - ja kuitenkin erilaisiksi - yht avoimiksi ja suojatuiksi: diff --git a/src/modules/language/detector/data/georgian-unknown.dat b/src/modules/language/detector/data/georgian-unknown.dat index c2604b20c..9cf45b463 100644 --- a/src/modules/language/detector/data/georgian-unknown.dat +++ b/src/modules/language/detector/data/georgian-unknown.dat @@ -16,7 +16,7 @@ , " ", " "? , - : , . - . - + @@ -29,7 +29,7 @@ " " , ", II. . , - + , , , @@ -43,7 +43,7 @@ , " ", , , - + . : - ... , . @@ -74,7 +74,7 @@ , , . " , "" "". , , "". - + . ""- ! . , , diff --git a/src/modules/language/detector/data/hebrew-iso-8859-8.dat b/src/modules/language/detector/data/hebrew-iso-8859-8.dat index b717ed68d..099821840 100644 --- a/src/modules/language/detector/data/hebrew-iso-8859-8.dat +++ b/src/modules/language/detector/data/hebrew-iso-8859-8.dat @@ -1,51 +1,51 @@ - , , + , , , . . ," , - - , . + + , . . . , , - , " " , + , " " , 67 - , . - + , . + . , - . + . , ' " . . .7 - . - , , - . , ," + . + , , + . , ," - " " : + " " : - 7 ' - - + 7 ' - - - (") " + (") " , ." , . - : . - , , - " , " - + : . + , , + " , " + . - . ," , + . ," , ) , , 4 , : : @@ -53,26 +53,26 @@ , , . - . , , + . , , " , . , . - , + , ... , - , + , - . 60 - ' - " - , , . + . 60 - ' + " + , , . . ," (1979) , . . - - . " " - (") " + - . " " + (") " , , " diff --git a/src/modules/language/detector/data/hungarian-iso-8859-2.dat b/src/modules/language/detector/data/hungarian-iso-8859-2.dat index cb88aa84f..86f4661ca 100644 --- a/src/modules/language/detector/data/hungarian-iso-8859-2.dat +++ b/src/modules/language/detector/data/hungarian-iso-8859-2.dat @@ -7,7 +7,7 @@ Az a sok vz aztn szpen tnkre is tette azt a sok szegny kori fldmrt s e S hogy lett este Utnajrt a dolgoknak s kidertette, hogy a vast kilnknt 50 frankot fizet. Ekkor tmadt az tlete, hogy - + eszseket egy kiss tlmretezte, ebbl kifolylag a Fldet egy hatalmas rvz mosta el. betegsg miatt meghisult utazs kltsgeit trti meg. Replvel trtn utazs esetn az @@ -27,14 +27,14 @@ A jtk szignlja a kvetkez kppen nzne ki: A vegyes letbiztostsoknak - az gyfelek krben rendkvl npszer - alapmdozata. Ha a mozdony egy szikrjtl meggyullad a brnd, akkor mennyit fizet krtrtsknt a vasttrsasg? A Szns-hegyeket a pannon flra blcsjnek tartjk, a kutatk szerint a nvnyek -Hrom v mlva lehet rtejnni. +Hrom v mlva lehet rtejnni. trzs: az n drga, gynevezett npem maga. Msnap reggelre, Ha divathzban akad nki dolga, - visszafizetsvel. + visszafizetsvel. Februr: levizsgzik geodzibl, s megbukik matekbl. Cseh Kztrsasg, valamint Szlovkia Budakeszi kzelben vadasparkot hoztak ltre, ahol a budai erdkben is honos @@ -42,7 +42,7 @@ Februr: levizsgzik geodzibl, s megbukik matekbl. Nvnybiztosts, rvzkrbiztosts, jgkr, tli fagykr, szlgykereztet iskolk jgkra, szl kivgja. -Nappali tagozat: 210 f (hrom vfolyam, mindkt ltez szak egytt) +Nappali tagozat: 210 f (hrom vfolyam, mindkt ltez szak egytt) A szerzds idtartama lehet tbb v, de ha kell, akr egy nap is. kedvez volt. A hordnyi borban sszelltak az eszencik, s a mi Urunk jkedvt igazoland egy eddig @@ -61,7 +61,7 @@ volna, hogy Magyarorszg fvrosa Budapest. Vagy ppen Debrecen, esetleg Pozsony Ht mg egyszer kptt. emlskn, madarakon kvl szmos egyb llattal tallkozhatnak a kirndulk. - Generali, mr Knban is + Generali, mr Knban is diff --git a/src/modules/language/detector/data/icelandic-iso-8859-1.dat b/src/modules/language/detector/data/icelandic-iso-8859-1.dat index 349dd2130..47315cc0c 100644 --- a/src/modules/language/detector/data/icelandic-iso-8859-1.dat +++ b/src/modules/language/detector/data/icelandic-iso-8859-1.dat @@ -1,7 +1,7 @@ - + verkfri um eina milljn krna. - + Brunavarna Suurnesja var kalla t. Hvtir kanar @@ -23,7 +23,7 @@ og jnustufyrirtki svinu. g hef unni a essu mli marga mnui - + gstsson astoaryfirlgreglujnn Grindavk. ar b ttast menn fyrirtki a reka starfsemi bjarflaginu, skrt s teki fram a sk. "step by step" og er ekkt tgfuafer erlendis. Einnig stendur @@ -43,24 +43,24 @@ r hfu veri fer mib Keflavkur lngu eftir a a var kominn Gti ori mikil lyftistng fyrir Suurnesin - - + + unga sem hefur veri landslii matreislumanna undanfarin r. r fiskvinnsluhsi Suurnesjum. Myndin tengist greininni ekki neinn Slmar veurhorfur voru um mija sustu viku og hfu menn stu sr ar sem hann l glfinu. Tvr tennur brotnuu og arar losnuu fyrir stt flskunnar. Kokteilar sem essir eru ekki algengir gtueirum - + undirheimunum. ar nttust eir framleislu fkniefna. llu landinu Reykjanesb a undanskildum Garab. eirri naflaskoun bkun meirihlutans vi afgreislu fjrhagstlunar kemur fram a forsendur - - + + sem lgreglan er a hafa afskipti af vegna neyslu eiturlyfja. htt. @@ -70,7 +70,7 @@ - + gerur t n heldur Bragi GK. Unni a veglegum fkniefna-bklingi Uppsgn samninga lgleg @@ -90,7 +90,7 @@ sr ar sem hann l glfinu. Tvr tennur brotnuu og arar losnuu Reykjanesb kemur ljs a bum Hfnum fkkai um 14,6% aa fkkai - + tlai eiginkonu sinni, fr Duus, a rkta matjurtir og trjplntur, eru "harari" efnum en ur ekktist. @@ -111,18 +111,18 @@ au Benedikt og Heirn eru ng me breytingarnar aptekinu og segja gerur t n heldur Bragi GK. - + vera sjnum. Happasll hefur fengi 240 tonn 16 dgum. Smu sgu ramtum og nmerapltur hafa fengi a fjka af 75 blum ar sem eigendur fara 14% en fjrmagnskostna og afborganir 9% af skatttekjum, um nutu - + hbb a verkframkvmdir vegum Mannvirkjasjs Nat yru bonar t, sem egar - + geta leita til Lgreglunnar sma 421 5500 ea slkkvilis sma - + eru tlaar ann li. eignfra fjrfestingu eru tlaar 9 millj. diff --git a/src/modules/language/detector/data/irish-iso-8859-1.dat b/src/modules/language/detector/data/irish-iso-8859-1.dat index 89107a804..7f00c5cf8 100644 --- a/src/modules/language/detector/data/irish-iso-8859-1.dat +++ b/src/modules/language/detector/data/irish-iso-8859-1.dat @@ -1,28 +1,28 @@ - + ceann = one - - - + + + it igin in irinn. Ag teacht abhaile n sipal L Fhile Pdraig di, go dt Ti-Boy. an oiread acu = as many of them - - - + + + "Is fidir, a bhean uasal," a d'freagair an portrid. - + "An-asca, is osa mac Muire." - + Freagraonn an bhean rialta eile: cloiseann s paidreacha a mhic ars: @@ -30,38 +30,38 @@ - - + + bh s ina chd probhideadh acu: "Ar mhaith leat an nochn a dhanamh?" Chonaic s foirgneamh ard, agus dhruid s leis. Tharraing s comhartha - + Forscal n Ollscoil anseo i nGaillimh: Ti-Boy: Chihuahua!?! T t ag tarraingt asam! Dheamhan seans ag mada Tann an buachaill beag a lu agus tig lena athair a phaidreacha a chloisteil: - + Bh cailn beag san fholcadn in ineacht lena dearthir beag. Tar is - + SEATAC, ait ar thuirling s sln. - + T iontas ar an mbean rialta, ceart go leor, ach s rud gurb eisean cpla oche shinn ag l cpla pinta agus d'inis s scaln dhom faoi - + T fgra faighte agat... - + ar an rothar seo. Lim s den rothar, 's bhain s di a cuid ada uilig bh s ina chd probhideadh acu: "Ar mhaith leat an nochn a dhanamh?" @@ -75,26 +75,26 @@ agus h br cn galradh a bhuail Sen t a fhios ag Dia go cheannaigh "Ach," a deir s, "nl teanga ar bith ann a bhfuil dearfach dbailte ach n fhaigheann siad ach gnsacht mar fhreagra. - + Tamall ina dhiaidh sin, d'iompaigh s chun an stra ars: L amhin bh s ag iarraidh tobac a cheannacht sa siopa. "Old Holborn" - + t ag dul?" "Ceart go leor," a deir an t-stir. dearthir = brother gcathair, agus dirt s leis an stir, - + "Nl, a chro, ach m fhaighim bs, psfaidh m'fhear ars, t m cinnte. - + An Striapach agus an Tuathnach Chonaic s foirgneamh ard, agus dhruid s leis. Tharraing s comhartha - - + + mian liom a bheith g agus lainn." Bingo! Bh s g agus lainn. Chaith ar a raibh scrofa "C bhfuil m?" agus chroch amach ar an fhuinneog - + @@ -106,28 +106,28 @@ - T m cinnte. FAIGH FIN AN PHLUID MHALLAITHE D !!! "Maith go leor. Scaoil amach iad", arsa mo dhuine. - + "Tabharfaidh m seans duit do chuid airgid a fhil ar ais. Cuirfidh m - + chuaigh s sos go dt an tr d fhin le lu ar an ngainimh. Thit s "Ceart go leor," a deir an t-stir. - Earra ar cairde. Comhtharl? "Musa", a deir Pidn, "N faitas at mo choinnal imo shu ach - + "Bhuel," a deir an pas, "an bhfuil t cinnte dearfa gur ar neamh a bheas - + isteach. Tar is cpla focal leis an mbartender, chuaigh an fear seo da bhr sin t m ag usid ainmeacha bragach sa scal. Bh m Tigh Mhirtn N sa Fhaiche Mhr anseo i nGaillimh le m'athair amhin n dirt an tAlbanach, ach thg s an chuileog as a phionta agus - + Praic Cualin - + Ti-Boy agus na Madra @@ -136,7 +136,7 @@ tada!" - + Bean rialta @@ -148,9 +148,9 @@ Dolan!" - + - T brn orm ach nl ach seomra amhin fgtha agam. Caithfidh t a - + . Chonaic na daoine san fhoirgneamh an chomhartha, agus go gasta, scrobh 1. ti (<- petit) = beag i bhFraincis Cajun cloiseann s paidreacha a mhic ars: @@ -162,31 +162,31 @@ phsta. Tann an buachaill beag a lu agus tig lena athair a phaidreacha a chloisteil: - + Bh seanbhean ina su ar bhinse i bpirc i Mosc, ag lamh "Teach Yourself - - + + Bh fear ag iarraidh gabhil ar imirce chun na hAstrile. Chuaigh s an fholctha, dirt s lena mthair, "Cn fth nach bhfuil pp agamsa - + "Nl a leithid agam", a d'feagair s, "ach t cuid ag teacht isteach - + go ndanfaidh S an Talamh a scriosadh faoi cheann tr l." - - + + agus greim a bhreith ar a shil eile. - - - + + + @@ -201,9 +201,9 @@ dt anois, mura raibh sibh ssta le chile? [i dtir seachas ire a bh - + Clinton, Yeltsin agus Paisley saol mr, le go mbeidh seans acu aithreachas a dhanamh." - - + + diff --git a/src/modules/language/detector/data/japanese-shift_jis.dat b/src/modules/language/detector/data/japanese-shift_jis.dat index 27449e154..48f8aaa2a 100644 --- a/src/modules/language/detector/data/japanese-shift_jis.dat +++ b/src/modules/language/detector/data/japanese-shift_jis.dat @@ -16,7 +16,7 @@ yziPjXCT[ő卪̂܂܂ɂāAy̒X[vŎςB R[q[Lݏ̌ʂ ܂BʓIȂ̂͂ Ɏ݂AxXgłB - + @Ql̎qiwQN̒j qƍZRN̏̎qj̎q ĂāA˂Ă 𑝂₵Aቺɖ𗧂 BɁAHׂSɔR ĂĔ얞h~ɂȂ܂B @@ -33,7 +33,7 @@ @{t́uŏdvۑvƂČfĂ(1)sv(2)\v(3)Љۏ\v(4)oύ\v(5)ZVXev(6)v̑́B ȂȂĐbɂȂl Ɏ炾vB̐lɂ낢 ƂꂽBłACɂ ~iɂȂ܂B܂AR pAׁEɁEH ɂʂ܂BƂɃr^ - + @Ȃ͔z_͂AP̖育Ƃɉp[Zg̎kŌʂ\B āAƎcł lO̍ٔɂȂ肽ł ˁv @@ -57,7 +57,7 @@ @ux̓t@bVȂł ˁB̗x̗ǂcĂ ƓɗsĂ̂ B}ɁAȂ łȂ̂ɁAhXƃx[ ͎̎茳ɂB - + YƌoϐV̐OYE햱 씭@uN[^[v̒n Pɂ @@ -66,7 +66,7 @@ ySňSł鍑z @ă\Η̏ÍAAoς̗ʂɂ킽萢Ẻ邱ƂƂȂ܂AǒnIȒn整댯͈ˑRƂĎcĂ܂B̉ŁA킪̈SAăAWAmn̕aƈǂ邩́A킪ʂO̍łdvȉۑł܂B - 씭@PQû܂v + 씭@PQû܂v P̃bZ[W̖ڎɖ߂B nSƓkɁAROVw diff --git a/src/modules/language/detector/data/romanian-iso-8859-2.dat b/src/modules/language/detector/data/romanian-iso-8859-2.dat index 3f9fe1c74..821ff38a0 100644 --- a/src/modules/language/detector/data/romanian-iso-8859-2.dat +++ b/src/modules/language/detector/data/romanian-iso-8859-2.dat @@ -1,4 +1,4 @@ -dezumfla ciorapii de matase ai domnisoarei atlantide cufarul care +dezumfla ciorapii de matase ai domnisoarei atlantide cufarul care omului este DADA. destul de logic. @@ -8,16 +8,16 @@ tata sau papa? ah, chie, mama, ah, domnisoara, ba nu, profesoara ! DEPINDE DE FORMA DATA buna ziua -Dada e teribil: nu se induioseaza in fata infringerilor inteligentei. -Un manifest este o comunicare facuta lumii intregi, in care nu se +Dada e teribil: nu se induioseaza in fata infringerilor inteligentei. +Un manifest este o comunicare facuta lumii intregi, in care nu se vecinilor. la TV, unde in plina emisiune ardea o hirtie de 500 de franci (mai mare nu - foarte rapid impopulara, scrie ziarul francez + foarte rapid impopulara, scrie ziarul francez si cu sens unic. E ceea ce a fost fara indoiala un "cartier popular" acum strecor in fata si constat ca organizatorii se opresc in fata unei bojdeuci pe Astfel intre brazii cu tulpini de ceara -taiate pe din doua, in care vezi stralucind brun sau violet cristalele interioare, +taiate pe din doua, in care vezi stralucind brun sau violet cristalele interioare, nici metode, nici excese persuazive. si urlau hienele si gemeau acrobatele in remorci de hirtie. pe care-o ajut sa se dezbrace si sa se culce @@ -31,15 +31,15 @@ ca femeile lui kooning. functia si masina si as fi purtat lantzug de argint pe coastele costelive. <I>iata pentru ce veti crapa cu totii,</I> -pe acela care are in miini cheia niagarei omul care schioapata +pe acela care are in miini cheia niagarei omul care schioapata -pina la tinerelul cu mustata si creier si pina la masculul cu calvitie si +pina la tinerelul cu mustata si creier si pina la masculul cu calvitie si defavoarea celor doi contracandidati ai sai, Ulm Spineanu si scara redusa realizat stingaci de un copil grabit sau neglijent. Dintr'una au ramas numai traversele, sinele au fost ridicate de mult de vreun -intra pe o straduta ingusta unde aproape se blocheaza. Ce dracu cauta aici? Ma +intra pe o straduta ingusta unde aproape se blocheaza. Ce dracu cauta aici? Ma asupra noastra, antologia compasulete, @@ -51,7 +51,7 @@ dar iarna, iarna cu tine... tii tu minte, annabell lee, seama, peste un pod ca in Eliade, peste unul din aceste Finis Africae pe linga "Ei" au gasit un mod abil de a ne indeparta, si poate ca dupa douazeci de - cu Romania + cu Romania dragostea nu moare niciodata. dar fi cele mai fericite momente ale zilei; nici un terminal @@ -59,13 +59,13 @@ Dada este dictatura limbajului, posibila o intoarcere in Romania. vreun motiv special pentru care s'a oprit circulatia? Nu, zice, ca sa se plimbe e pace, pace si realism. -sticla plin cu pietre verzi translucide cam de marimea unei unghii, grele si la fel +sticla plin cu pietre verzi translucide cam de marimea unei unghii, grele si la fel intriga lui ensor. si birfeala sotilor prin cancelarii. In orice caz, o initiativa deosebit de reusita ("un bon coup de pub") al dreptei da' ce se intimpla de fapt? Pai, zice cocoselul-sef, nu vezi? Lumea se plimba. E XIV -Stapinul locurilor e batrin, schiop si vorbeste cu un accent puternic. E ungur de -decit biografia voastra pe care voi o clociti sub burta cerebelului +Stapinul locurilor e batrin, schiop si vorbeste cu un accent puternic. E ungur de +decit biografia voastra pe care voi o clociti sub burta cerebelului la TV, unde in plina emisiune ardea o hirtie de 500 de franci (mai mare nu Rumeioara juna, cu burtica mare, @@ -73,30 +73,30 @@ politica a manifestatiei. O buna parte din ceilalti participanti gindesc la fel, laudat fie'i numele, mai bine ca se zgirceste la asta decit mult. Totul este invadat de verdeata si parasit, cu vagi arome de Rem sau de ceata cu ochii mari, cu sinii aproape vizibili prin tesatura capotului. -Casa in care m'am mutat e o casa foarte ciudata (spun ciudata in lipsa unui +Casa in care m'am mutat e o casa foarte ciudata (spun ciudata in lipsa unui -eu ca omul. Voi ramine cu impresia agreabila a unei manifestatii civilizate si +eu ca omul. Voi ramine cu impresia agreabila a unei manifestatii civilizate si Parisien", care considera ca, desi comunistii au fost inlaturati de increderea alegatorilor, pentru a forma un guvern trainic, -si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei +si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei dragostea ?! toata lumea pare sa creada ca sint lenes, omului este DADA. raselor si epistolarul perfectionat al amaraciunii. -si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei +si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei (baietii dintr-a opta poate dincolo de firesc) Seara, pe la ora opt, tot datoriata acestei Doamne capricioase care este Maria XV Seara, pe la ora opt, tot datoriata acestei Doamne capricioase care este Maria -ca si celelalte forme, afaceri, casatorii, vizite, razboaie, +ca si celelalte forme, afaceri, casatorii, vizite, razboaie, iar noi citeam in statia lui 31 oriana fallaci -ei sint acei care, fara sa stie, ii doresc si-i pregatesc o +ei sint acei care, fara sa stie, ii doresc si-i pregatesc o Chemati in amintire fiinta pe care o iubiti cel mai mult. cu un mar si tigara de sufletu lu Serge. Dupa care onoram cu prezenta noastra ponderii parlamentare, PNTCD, USD si PNL au acceptat, in -nu fara o oarecare gratie, da de trei ori ocol Coloanei din Iulie si o porneste +nu fara o oarecare gratie, da de trei ori ocol Coloanei din Iulie si o porneste o femeie oarecare ma incoltise: sint o oglinda purtata de-a lungul unei oglinzi. diff --git a/src/modules/language/detector/data/russian-koi8-r.dat b/src/modules/language/detector/data/russian-koi8-r.dat index 04540280f..40809abe8 100644 --- a/src/modules/language/detector/data/russian-koi8-r.dat +++ b/src/modules/language/detector/data/russian-koi8-r.dat @@ -1,38 +1,38 @@ ", ""), - , - + - - , - -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... + -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... , . ... , "" - + - , ? . - - , - , - , , - . , - , , 60 , , ... - . - () , , . + , - , + , , - . , - , , 60 , , ... - . - () , , . + + + : , , , , . (, .) - : , , , , . (, .) - - , , . - . . ? + , , . - . . ? , , , . - + , -- . . - - - , . , - , 2000 . , , - ( ). . . - 300 , . , , , , 200 . , , , 300 . . , . 50 , 200 . . . . 4- . , , 1 . +- . . - - - , . , - , 2000 . , , - ( ). . . + 300 , . , , , , 200 . , , , 300 . . , . 50 , 200 . . . . 4- . , , 1 . - -. . . , . , , 1920 . , , . . . . . . - - , , . + -. . . , . , , 1920 . , , . . . . . . - - , , . ? ? , , - - , . , , , , . - -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... + + , . , , , , . + -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... diff --git a/src/modules/language/detector/data/russian-windows1251.dat b/src/modules/language/detector/data/russian-windows1251.dat index b94dd200e..596fec10c 100644 --- a/src/modules/language/detector/data/russian-windows1251.dat +++ b/src/modules/language/detector/data/russian-windows1251.dat @@ -9,7 +9,7 @@ . , ? ? - , . , , - + : - " . , , ? @@ -27,7 +27,7 @@ . , , - - + . , , . . , @@ -68,7 +68,7 @@ , ? - + . 12 , , : , , ! , . , diff --git a/src/modules/language/detector/data/slovak-windows1250.dat b/src/modules/language/detector/data/slovak-windows1250.dat index 27295c2cc..8988c023a 100644 --- a/src/modules/language/detector/data/slovak-windows1250.dat +++ b/src/modules/language/detector/data/slovak-windows1250.dat @@ -6,7 +6,7 @@ Systmovm problmom vak bude cena repy a odbyt cukru, ktorho vlaajia - + - Vna do vedomia obanov naptie a neistotu, ktorch zkonitm vystenm monost, a poda schopnost ich vedcich initeov. POPRAVA NA VLASTN IADOS @@ -36,7 +36,7 @@ Systmovm problmom vak bude cena repy a odbyt cukru, ktorho vlaajia cirkv proti vlde a o masmedilnom vymvan mozgov sa nikto neponha iba hraj. - + Jozefovi Barusovi, predstaviteovi pchovskej firmy Matador v uzbeckom dotovania telefnnych prstrojov. Budci tde zana Globtel GSM predva diff --git a/src/modules/language/detector/data/slovenian-iso-8859-2.dat b/src/modules/language/detector/data/slovenian-iso-8859-2.dat index da3619254..d0135890e 100644 --- a/src/modules/language/detector/data/slovenian-iso-8859-2.dat +++ b/src/modules/language/detector/data/slovenian-iso-8859-2.dat @@ -45,7 +45,7 @@ dejal Stanko Nerad in pristavil, da dogajanje dejansko zanima vse iz predvidenega prorauna; dejal je, da so se e lani prispevki za - + "Avstrija se je pogajala zelo dolgo," je odvrnil med smehom. "Odkrito Evrope - "za katero ni politine alternative in ki pomeni krepitev da bi z raunalnikim branjem listin in s posebnimi voznimi pasovi @@ -68,7 +68,7 @@ zahteva, da jim posreduje svoja stalia. Za poslanca dravnega zbora, ki bo zamenjal Zorana Thalerja (LDS), v delegatskem sistemu. - Branko Maksimovi + Branko Maksimovi vrzel v ukrepu, in bi slovenski delavci e imeli nekaj monosti za Viktor Klima (ki so ga v Ljubljani sprejeli z najvijimi in tudi @@ -81,7 +81,7 @@ prizoriu. Katastrofa v Amsterdamu (9:1) sodi med najbolj "rne kluba iz Ljudskega vrta. Seveda pa tudi ta okoliina ni nobena tolaba bil dosegljiv. - + in zgolj dokumentarno nizajo vsebine masovnih medijev: kariera, druina, predsednika drave, te bodo 23. novembra, in volitev dravnih svetnikov, diff --git a/src/modules/language/detector/data/ukrainian-koi8-r.dat b/src/modules/language/detector/data/ukrainian-koi8-r.dat index 4d2098d93..1efc6fb1d 100644 --- a/src/modules/language/detector/data/ukrainian-koi8-r.dat +++ b/src/modules/language/detector/data/ukrainian-koi8-r.dat @@ -19,22 +19,22 @@ ̤Ҧ ¦ Ħ - + " " ,"¦ Ԧ - + <HR SIZE 3> - I + I + - - + , Ц ϧ , Ԧ צ ϧ - + " Ħ ? ¦ . æ̦ Φ." צצ @@ -42,7 +42,7 @@ Ħ æ צ ̦ צ Ҧ ̦ ˦ צ : "֦ - + ?" @@ -65,10 +65,10 @@ ͦΦ ڦ . դ ¦ צ - - + + æ Ҧ - . צΦ Ҧ - + @@ -83,7 +83,7 @@ Ц...Ц - + I @@ -93,10 +93,10 @@ Ӧ ۦ ." - - - + + + צ Ħ Ҧ ¤ . ¦ Ħ Φ Φ, @@ -113,13 +113,13 @@ ˦ æ Ԧ ˦ Φ, Ħ - + - - + + @@ -132,15 +132,15 @@ Ԧ . צæ Ҧ. Ц - - + + "צ ?" . - + צ . צ Ʀ @@ -181,22 +181,22 @@ * , Ԧ - + Ħ צԦ " Ħ" ˦Ҧ, Ҧ - + I I : I I . - - + + Ʀæ Ц ¦:" ?" - + Ҧ " - + צ ̦ צ. Ħ -:" Ӧ æ ." diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp index 58535fcb3..d49914801 100644 --- a/src/modules/links/LinksWindow.cpp +++ b/src/modules/links/LinksWindow.cpp @@ -52,7 +52,7 @@ LinksWindow::LinksWindow(KviConsoleWindow * lpConsole) m_pTopSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pTopSplitter->setObjectName("top_splitter"); m_pTopSplitter->setChildrenCollapsible(false); - + // The button box on the left KviTalHBox * box = new KviTalHBox(m_pTopSplitter); diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 84fcd18b4..305c82cfe 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -249,7 +249,7 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole) m_pTreeWidget->setSortingEnabled(true); m_pTreeWidget->sortItems(0,Qt::AscendingOrder); m_pTreeWidget->setUniformRowHeights(true); - + m_pTreeWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); m_pTreeWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); m_pTreeWidget->header()->setStretchLastSection(false); diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h index 73b2bfa07..6df7faa9e 100644 --- a/src/modules/list/ListWindow.h +++ b/src/modules/list/ListWindow.h @@ -75,7 +75,7 @@ private: ChannelTreeWidgetItemData * m_pData; public: bool operator<(const QTreeWidgetItem & other) const; - inline ChannelTreeWidgetItemData * itemData() { return m_pData; }; + inline ChannelTreeWidgetItemData * itemData() { return m_pData; }; }; class ChannelTreeWidget: public KviThemedTreeWidget diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp index 172a1c32b..8fb70ae7b 100644 --- a/src/modules/logview/LogFile.cpp +++ b/src/modules/logview/LogFile.cpp @@ -80,7 +80,7 @@ LogFile::LogFile(const QString & szName) QString szDate = szTmpName.section('_',-1).section('.',0,-2); - switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 1: m_date = QDate::fromString(szDate, Qt::ISODate); diff --git a/src/modules/logview/LogFile.h b/src/modules/logview/LogFile.h index 7a8cafebc..7adabf03b 100644 --- a/src/modules/logview/LogFile.h +++ b/src/modules/logview/LogFile.h @@ -51,7 +51,7 @@ typedef struct _LogFileData /** * \class LogFile * \brief The LogFile class which handle any log file -* +* * Log is in the format: * $type_$nick.$network_$YYYY.$MM.$DD.log * Examples: @@ -79,7 +79,7 @@ public: */ enum ExportType { PlainText, /**< export log in plain text file */ - HTML /**< export log in a HTML archive */ + HTML /**< export log in a HTML archive */ //XML /**< export log in a XML file */ //DB /**< export log in a database file */ }; diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 7957e637d..a6759c774 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -98,7 +98,7 @@ LogViewWindow::LogViewWindow() m_pTabWidget = new QTabWidget(m_pLeftLayout); m_pBottomLayout = new KviTalHBox(m_pLeftLayout); m_pProgressBar = new QProgressBar(m_pBottomLayout); - + m_pCancelButton = new QPushButton(m_pBottomLayout); m_pCancelButton->setText(__tr2qs_ctx("Cancel","log")); connect(m_pCancelButton,SIGNAL(clicked()),this,SLOT(abortFilter())); @@ -368,7 +368,7 @@ void LogViewWindow::filterNext() break; } } - + if(!m_pLastGroupItem) m_pLastGroupItem = new LogListViewItemFolder(m_pLastCategory,m_szLastGroup); } diff --git a/src/modules/mediaplayer/MpSpotifyInterface.cpp b/src/modules/mediaplayer/MpSpotifyInterface.cpp index 59a29479c..acaeb9013 100644 --- a/src/modules/mediaplayer/MpSpotifyInterface.cpp +++ b/src/modules/mediaplayer/MpSpotifyInterface.cpp @@ -79,7 +79,7 @@ QString KviSpotifyInterface::get_window_title() { return szReturn.replace(QString("Spotify - "), QString("")); } else szReturn = QString(""); - + return szReturn; } diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp index 6dc7977d7..d17aa71b0 100644 --- a/src/modules/notifier/NotifierMessage.cpp +++ b/src/modules/notifier/NotifierMessage.cpp @@ -36,7 +36,7 @@ NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText) { m_pLabel0 = 0; m_pLabel1 = 0; - + m_szText=szText; m_pPixmap=pPixmap; @@ -88,8 +88,8 @@ void NotifierMessage::updateGui() m_pLabel1->setFont(KVI_OPTION_FONT(KviOption_fontNotifier)); QPalette pal = m_pLabel1->palette(); pal.setColor(QPalette::WindowText, KVI_OPTION_COLOR(KviOption_colorNotifierForeground)); - m_pLabel1->setPalette(pal); - + m_pLabel1->setPalette(pal); + if(bShowImages) { m_pHBox->setStretch(1,99); diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h index 025e5a11d..9129cdf37 100644 --- a/src/modules/notifier/NotifierMessage.h +++ b/src/modules/notifier/NotifierMessage.h @@ -46,7 +46,7 @@ class NotifierMessage : public QWidget public: /** * \brief Constructs the NotifierMessage object - * \param pPixmap pointer to a message icon, can be null + * \param pPixmap pointer to a message icon, can be null * \param szText const reference to message text in irc format * \return NotifierMessage */ diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index c36997eb1..9029893aa 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -163,7 +163,7 @@ void NotifierWindow::updateGui() palette.setColor(m_pLineEdit->foregroundRole(), KVI_OPTION_COLOR(KviOption_colorNotifierForeground)); m_pLineEdit->setPalette(palette); m_pLineEdit->setFont(KVI_OPTION_FONT(KviOption_fontNotifier)); - + for(int i=0; i<m_pWndTabs->count();++i) { ((NotifierWindowTab*)m_pWndTabs->widget(i))->updateGui(); @@ -265,7 +265,7 @@ void NotifierWindow::stopAutoHideTimer() #if COMPILE_KDE_SUPPORT #include <kwindowsystem.h> - + static bool active_window_is_full_screen() { WId activeId = KWindowSystem::activeWindow(); @@ -274,7 +274,7 @@ void NotifierWindow::stopAutoHideTimer() } #else // COMPILE_KDE_SUPPORT #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - + static bool active_window_is_full_screen() { HWND hForeground = ::GetForegroundWindow(); @@ -294,13 +294,13 @@ void NotifierWindow::stopAutoHideTimer() if((rct.right - rct.left) < GetSystemMetrics(SM_CXSCREEN)) return false; - + if((rct.bottom - rct.top) < GetSystemMetrics(SM_CYSCREEN)) return false; return true; } - + #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW #endif // COMPILE_KDE_SUPPORT @@ -636,7 +636,7 @@ void NotifierWindow::paintEvent(QPaintEvent * e) szTitle += "notifier"; } pPaint->drawText(m_pWndBorder->titleRect(),Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine,szTitle); - + delete pPaint; e->ignore(); } @@ -712,7 +712,7 @@ void NotifierWindow::mousePressEvent(QMouseEvent * e) update(); return; } - + if(m_pWndBorder->captionRect().contains(e->pos())) { if(m_pWndBorder->closeRect().contains(e->pos())) @@ -933,13 +933,13 @@ void NotifierWindow::leaveEvent(QEvent *) m_pWndBorder->resetIcons(); if(!m_bResizing) setCursor(-1); - + if(!m_pShowHideTimer) { m_pShowHideTimer = new QTimer(); connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); } - + if(m_eState!=Hidden) { m_eState = FocusingOff; @@ -1049,7 +1049,7 @@ void NotifierWindow::showLineEdit(bool bShow) if(!((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd()) return; m_pLineEdit->setToolTip(""); - + QString szTip = __tr2qs_ctx("Write text or commands to window","notifier"); szTip += " \""; szTip += ((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd()->plainTextCaption(); diff --git a/src/modules/notifier/NotifierWindowTab.cpp b/src/modules/notifier/NotifierWindowTab.cpp index 0a9c4329e..41c29cf36 100644 --- a/src/modules/notifier/NotifierWindowTab.cpp +++ b/src/modules/notifier/NotifierWindowTab.cpp @@ -221,7 +221,7 @@ void NotifierWindowTab::paintEvent(QPaintEvent * e) #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - + delete pPainter; e->ignore(); } diff --git a/src/modules/notifier/NotifierWindowTab.h b/src/modules/notifier/NotifierWindowTab.h index 5a07f387d..be2163e20 100644 --- a/src/modules/notifier/NotifierWindowTab.h +++ b/src/modules/notifier/NotifierWindowTab.h @@ -57,7 +57,7 @@ public: * \return NotifierWindowTab */ NotifierWindowTab(KviWindow * pWnd, QTabWidget * pParent); - + /** * \brief Destroys the tab object */ @@ -75,19 +75,19 @@ public: * \return void */ void appendMessage(NotifierMessage * pMessage); - + /** * \brief Updates the GUI * \return void */ void updateGui(); - + /** * \brief Returns the name of the current window * \return QString */ inline QString label() const { return m_szLabel; }; - + /** * \brief Returns the pointer of the current window * \return KviWindow * @@ -103,13 +103,13 @@ private slots: * \return void */ void scrollRangeChanged(int, int); - + /** * \brief Emitted when the window changes its name * \return void */ void labelChanged(); - + /** * \brief Emitted when the window is being destroyed * \return void diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index 3983f5d90..21e93bf35 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -287,7 +287,7 @@ bool KvsObject_http::functionGet(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("remote_path",KVS_PT_STRING,0,szPath) KVSO_PARAMETER("local_filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szDest) KVSO_PARAMETERS_END(c) - + QFile * pFile=0; if (!szDest.isEmpty()) { diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp index 48dedf4fc..5c026c661 100644 --- a/src/modules/objects/KvsObject_multiLineEdit.cpp +++ b/src/modules/objects/KvsObject_multiLineEdit.cpp @@ -212,7 +212,7 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_textedit,"multilineedit","widget") KVSO_REGISTER_HANDLER(KvsObject_textedit,"setPointSize", functionsetPointSize) KVSO_REGISTER_HANDLER(KvsObject_textedit,"setReadOnly",functionSetReadOnly) - + KVSO_REGISTER_HANDLER(KvsObject_textedit,"setTextFormat", functionsetTextFormat) KVSO_REGISTER_HANDLER(KvsObject_textedit,"textFormat", functiontextFormat) KVSO_REGISTER_HANDLER(KvsObject_textedit,"loadFile", functionloadFile); diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index fcb57a78d..55bf48f40 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -144,7 +144,7 @@ KVSO_CLASS_FUNCTION(pixmap,fill) if (!var1->asInteger(iCol1)) { var1->asString(szColor); - if (c->paramCount()<2) + if (c->paramCount()<2) iOpacity=255; else { if (!var2->asInteger(iOpacity)) @@ -362,11 +362,11 @@ KVSO_CLASS_FUNCTION(pixmap,rotate) { if (KviQString::equalCI(szAxis,"XAxis")) axis=Qt::XAxis; - else if (KviQString::equalCI(szAxis,"YAxis")) + else if (KviQString::equalCI(szAxis,"YAxis")) axis=Qt::YAxis; - else if (KviQString::equalCI(szAxis,"ZAxis")) + else if (KviQString::equalCI(szAxis,"ZAxis")) axis=Qt::ZAxis; - else + else c->warning(__tr2qs_ctx("Unknown axis '%Q' switching to default ZAxis","objects"),&szAxis); } diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp index 571aff749..98cb3d217 100644 --- a/src/modules/objects/KvsObject_socket.cpp +++ b/src/modules/objects/KvsObject_socket.cpp @@ -109,7 +109,7 @@ const char * const sockerrors_tbl[] = { 4=Bound[br] 5=Closing[br] 6=Listening - + !fn: $connect(<host>,<port>) Attempts a connection to <host> on port <port>.[br] <host> can be a numeric internet address (either Ipv4 or Ipv6 (if supported)) or a hostname.[br] @@ -124,7 +124,7 @@ const char * const sockerrors_tbl[] = { and you will be notified of the attempt result by an asynchronous event call: in case of failure, $connectFailedEvent() will be called, in case of succes, $connectEvent() will be called. - + !fn: $listen([<port>[,<interface>[,<force_ipv6>]]]) Attempts to listen on the specified <port> and <interface>.[br] If <port> is not passed it is assumed to be 0, if <interface> is not passed, it is assumed to be @@ -136,14 +136,14 @@ const char * const sockerrors_tbl[] = { On some systems listening in the IPV6 namespace allows to accept also IPV4 connections (this includes linux but not windows afaik).[br] When an incoming connection will arrive, $incomingConnectionEvent() will be called. - + !fn: $connectedEvent() This function is called when a connection attempt has been successfully completed. The socket is actually connected to [classfnc:socket]$remoteIp[/classfnc]() on [classfnc:socket]$remotePort[/classfnc](). You can start writing data and you may expect [classfnc:socket]$dataAvailableEvent[/classfnc]() to be triggered. - + !fn: $incomingConnectionEvent(<socket:h_object>) This function is called when an incoming connection arrives over a socket in listening state.[br] You must return 1 if you to terminad this incoming connectioncall [classfnc:socket]$accept[/classfnc]() passing a newly created socket object @@ -165,14 +165,14 @@ const char * const sockerrors_tbl[] = { This function is called when some data is available to be read: the <data_length> parameter specifies the length of the available data in bytes.[br] You can use one of the $read* functions to obtain the data - + !fn: $read(<length>[,<hobject>]) Reads at most <length> bytes of data from the socket. If <length> is anything "outside" the available data range (<length> < 0 or <length> > available_data_length), this function returns all the available data.[br] By default this function can deal ascii data only: NULL characters are transformed to ASCII characters 255. You can pass a [class]memorybuffer[/class] object to read binary data. - + !fn: $write(<data, array,files or hobject>[,length]) Writes <data> to the socket.[br] This function can deal with binary data passing a [class]memorybuffer[/class] object[br] @@ -182,7 +182,7 @@ const char * const sockerrors_tbl[] = { Using an array you can pass bytes or data string like this: @$write($array($(0xff),$(0xff),$(0xff),$(0xff),"This is an example")); If you're going to [cmd]delete[/cmd] this object just after the $write call, you should call [classfnc:socket]$close[/classfnc]() just before [cmd]delete[/cmd] to ensure the data delivery. - + !fn: $close() Resets this socket state: kills any pending or active connection. After a close() call the socket may be used for a new connection.[br] @@ -190,22 +190,22 @@ const char * const sockerrors_tbl[] = { You don't need to call $close() if you [cmd]delete[/cmd] the socket: KVIrc will reset the socket state automatically and free the memory. But if you want to ensure data delivery after a $write call sequece and just before a [cmd]delete[/cmd], $close() is the only chance to do it. - + !fn: $remoteIp() Returns the IP address of the remote end of this socket.[br] The return value is meaningful only if the socket is in connected or connecting state. - + !fn: $setProtocol(<protocol>) Let KVIrc use TCP or UDP protocol - + !fn: $remotePort() Returns the port of the remote end of this socket.[br] The return value is meaningful only if the socket is in connected or connecting state. - + !fn: $localIp() Returns the IP address of the local end of this socket.[br] The return value is meaningful only if the socket is in connected, listening or connecting state. - + !fn: $localPort() Returns the port of the local end of this socket.[br] The return value is meaningful only if the socket is in connected, listening or connecting state. diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index ba1758b45..90c7e051b 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -260,7 +260,7 @@ const char * const actions_tbl[] = { Sets the link delegation policy: what happens when the users click on a link. Valid values: [br] DontDelegateLinks: No links are delegated. Instead, webView tries to handle them all. [br] DelegateExternalLinks: When activating links that point to documents not stored on the local filesystem or an equivalent then $linkClickedEvent() is executed. - [br] DelegateAllLinks: Whenever a link is activated the $linkClickedEvent() is executed. + [br] DelegateAllLinks: Whenever a link is activated the $linkClickedEvent() is executed. !fn: $linkClickedEvent() This function can be called when the user clicks on a link, depending no the current link delegation policy. The argument of the function is the url that has been clicked.[br] diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index 0d93f72ab..1e7eafe9a 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -1741,7 +1741,7 @@ KVSO_CLASS_FUNCTION(widget,setFont) QString szFamily; QStringList szListStyle; kvs_int_t iSize; - KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("family",KVS_PT_STRING,0,szFamily) KVSO_PARAMETER("size",KVS_PT_INTEGER,0,iSize) KVSO_PARAMETER("style",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,szListStyle) diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index 3e1debd49..5806005f8 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -393,7 +393,7 @@ bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QS for(int j=0;j<lKeywords.count() && !bFoundSomethingHere;j++) if(szInstanceKeywords.at(i).contains(lKeywords.at(j),Qt::CaseInsensitive)) bFoundSomethingHere = true; - + if(bFoundSomethingHere) { pItem->setForeground(0, Qt::yellow); diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp index 24fc7e528..353811eae 100644 --- a/src/modules/options/OptionsWidgetContainer.cpp +++ b/src/modules/options/OptionsWidgetContainer.cpp @@ -86,7 +86,7 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e) m_pOptionsWidget = NULL; } } - + QWidget::childEvent(e); } diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp index c3bfd7b9f..06edc0421 100644 --- a/src/modules/options/OptionsWidget_channel.cpp +++ b/src/modules/options/OptionsWidget_channel.cpp @@ -120,7 +120,7 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent) KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Minimum delay between two channel requests:","options"),KviOption_uintOnJoinRequestsDelay,0,10,1); u->setSuffix(__tr2qs_ctx(" sec","options")); mergeTip(u,__tr2qs_ctx("<center>This is an artificial delay for the channel requests made on join.<br>You may increase it if your server complains about flooding when joining many channels at once.<br>Minimum value: <b>0 secs</b><br>Maximum value: <b>10 secs</b></center>","options")); - + addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban list","options"),KviOption_boolDisableBanListRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin); diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp index be69cdfb4..28b62ca18 100644 --- a/src/modules/options/OptionsWidget_ircOutput.cpp +++ b/src/modules/options/OptionsWidget_ircOutput.cpp @@ -54,7 +54,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent) if(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) > KVI_VERBOSITY_LEVEL_PARANOIC) KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL; m_pVerbosityCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel)); - + pLabel = new QLabel(__tr2qs_ctx("Datetime format","options"),this); addWidgetToLayout(pLabel,0,1,0,1); @@ -63,7 +63,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent) m_pDatetimeCombo->addItem(__tr2qs_ctx("ISO 8601 format","options")); m_pDatetimeCombo->addItem(__tr2qs_ctx("System locale format","options")); addWidgetToLayout(m_pDatetimeCombo,1,1,1,1); - + m_pDatetimeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)); KviTalGroupBox * pGroup = addGroupBox(0,2,1,2,Qt::Horizontal,__tr2qs_ctx("Show in active window","options")); @@ -102,7 +102,7 @@ void OptionsWidget_ircOutput::commit() iIdx = KVI_VERBOSITY_LEVEL_NORMAL; } KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = iIdx; - + KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat) = m_pDatetimeCombo->currentIndex(); } diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp index 7fb56fc48..e62e6f430 100644 --- a/src/modules/options/OptionsWidget_ircView.cpp +++ b/src/modules/options/OptionsWidget_ircView.cpp @@ -167,7 +167,7 @@ OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent) addBoolSelector(pGroup,__tr2qs_ctx("Nick links","options"),KviOption_boolEnableNickLinkToolTip); addBoolSelector(pGroup,__tr2qs_ctx("Channel links","options"),KviOption_boolEnableChannelLinkToolTip); addBoolSelector(pGroup,__tr2qs_ctx("Escape sequences","options"),KviOption_boolEnableEscapeLinkToolTip); - + addRowSpacer(0,14,0,14); } diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp index 97d9c9978..f529d1789 100644 --- a/src/modules/options/OptionsWidget_logging.cpp +++ b/src/modules/options/OptionsWidget_logging.cpp @@ -46,7 +46,7 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent) QWidget * w = addDirectorySelector(0,1,0,1,__tr2qs_ctx("Save logs to folder:","options"),KviOption_stringLogsPath); mergeTip(w, __tr2qs_ctx("<center>This is the base log directory:<br>" \ "all the log files will be saved inside this directory</center>","options")); - + w = addStringSelector(0,2,0,2,__tr2qs_ctx("Dynamic subfolder:","options"),KviOption_stringLogsDynamicPath); mergeTip(w, __tr2qs_ctx("<center>You can specify a subdirectory where log files will be saved:" \ "use kvs code to create dynamic subfolders.</center>","options")); diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp index a83eb558c..280f2e774 100644 --- a/src/modules/options/OptionsWidget_notifier.cpp +++ b/src/modules/options/OptionsWidget_notifier.cpp @@ -163,7 +163,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) "Note that KDE's notifier isn't flexible and \"tabbed\" like KVIrc's","options"); szTip += "</center>"; mergeTip(m_pKdeNotifier,szTip); - + m_pKdeNotifier->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); connect(b,SIGNAL(toggled(bool)),m_pKdeNotifier,SLOT(setEnabled(bool))); connect(m_pKdeNotifier,SIGNAL(toggled(bool)),this,SLOT(toggleNotifierProtocol(bool))); @@ -205,7 +205,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) "your game from fullscreen to window mode.","options"); szTip += "</center>"; mergeTip(b2,szTip); - + b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool))); @@ -219,7 +219,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool))); iRow++; - + b2 = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Enable notifier window fade effect","options"),KviOption_boolNotifierFading); b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index e83a72b49..bc247d567 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -1609,7 +1609,7 @@ void OptionsWidget_servers::fillServerList() KviPointerList<KviIrcServer> * sl = r->serverList(); bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data(); net->setExpanded(bCurrent); - + for(KviIrcServer * s = sl->first();s;s = sl->next()) { srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),s); @@ -1693,7 +1693,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &) for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { network = (IrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); - if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) || + if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) || network->m_pNetworkData->description().contains(szFilter, Qt::CaseInsensitive)) { network->setHidden(false); @@ -1706,7 +1706,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &) } } else { uint uServers=0; - + IrcServerOptionsTreeWidgetItem * ch; for (int j=0;j<network->childCount();j++) { @@ -1714,7 +1714,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &) ch=(IrcServerOptionsTreeWidgetItem *)network->child(j); if(ch->m_pServerData) { - if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) || + if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) || ch->m_pServerData->description().contains(szFilter, Qt::CaseInsensitive)) bHidden=false; } diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h index c23851ded..bb38ec65a 100644 --- a/src/modules/options/OptionsWidget_servers.h +++ b/src/modules/options/OptionsWidget_servers.h @@ -64,7 +64,7 @@ public: { return m_pServerData; } - + KviIrcNetwork * networkData() const { return m_pNetworkData; diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index 3b8b6d306..3eeeefaf1 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -155,14 +155,14 @@ void OptionsWidget_soundGeneral::showEvent(QShowEvent *) return; // We fill these boxes only before the first show since the soundFillBox() // is likely to trigger sound system-detection which may take time... - + g_pApp->setOverrideCursor(Qt::WaitCursor); - + soundFillBox(); mediaFillBox(); - + g_pApp->restoreOverrideCursor(); - + m_bFirstShow = false; } @@ -177,7 +177,7 @@ void OptionsWidget_soundGeneral::soundTest() return; // doh QString szFileName; - + if(!g_pApp->findAudioFile(szFileName,QString::fromUtf8("jingle.wav"))) { qDebug("Can't find the jingle.wav file: was it shipped with your kvirc installation?"); diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index a7d4225e1..07dcdeec0 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -110,7 +110,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) connect(m_pTable,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged())); connect(m_pTable,SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)),this,SLOT(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *))); - + fillTable(); } @@ -128,7 +128,7 @@ void OptionsWidget_textIcons::fillTable() header.append(__tr2qs("Emoticon")); m_pTable->setHorizontalHeaderLabels(header); m_pTable->setRowCount(g_pTextIconManager->textIconDict()->count()); - + int idx = 0; QTableWidgetItem *item0; TextIconTableItem *item1; @@ -148,7 +148,7 @@ void OptionsWidget_textIcons::fillTable() ++idx; ++it; } - + // disable the delete button m_pDel->setEnabled(false); } diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp index b5bf0c3d0..cbb5240dc 100644 --- a/src/modules/popup/libkvipopup.cpp +++ b/src/modules/popup/libkvipopup.cpp @@ -714,7 +714,7 @@ static bool popup_kvs_fnc_isEmpty(KviKvsModuleFunctionCall * c) Returns the popup item id that owns the executing code @description: When called inside a popup item's callback, this function returns the id of the popup item. - Outside of callback code, $null is returned. + Outside of callback code, $null is returned. @examples: [example] #clean any previous popup by the same name diff --git a/src/modules/python/libkvipython.cpp b/src/modules/python/libkvipython.cpp index 3d6e9778a..0cfc83e9d 100644 --- a/src/modules/python/libkvipython.cpp +++ b/src/modules/python/libkvipython.cpp @@ -36,7 +36,7 @@ #include <Python.h> static KviModule * g_pPythonCoreModule = 0; - + #define KVS_CHECK_PYTHONCORE(_m,_c) \ g_pPythonCoreModule = g_pModuleManager->getModule("pythoncore"); \ if(!g_pPythonCoreModule) \ diff --git a/src/modules/pythoncore/CMakeLists.txt b/src/modules/pythoncore/CMakeLists.txt index ba49fd109..44551235e 100644 --- a/src/modules/pythoncore/CMakeLists.txt +++ b/src/modules/pythoncore/CMakeLists.txt @@ -5,7 +5,7 @@ set(kvipythoncore_SRCS kvircmodule.cpp ) -set(KVI_DEFAULT_FRAME_CAPTION "") +set(KVI_DEFAULT_FRAME_CAPTION "") set(kvi_module_name kvipythoncore) diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp index 297b8945f..ea0dc5393 100644 --- a/src/modules/pythoncore/kvircmodule.cpp +++ b/src/modules/pythoncore/kvircmodule.cpp @@ -89,7 +89,7 @@ static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs) static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs) { Q_UNUSED(pSelf); - + const char * pcText=0; const char * pcWinId=0; KviWindow * pWnd=0; @@ -169,7 +169,7 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs) if(!PyArg_ParseTuple(pArgs,"s",&szVarName)) return 0; - + if(g_pCurrentKvsContext) { KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(szVarName); @@ -402,7 +402,7 @@ PyMODINIT_FUNC python_init() PyKVIrc_API[7] = (void *)PyKVIrc_eval; PyKVIrc_API[8] = (void *)PyKVIrc_internalWarning; PyKVIrc_API[9] = (void *)PyKVIrc_error; - + // Create a CObject containing the API pointer array's address pC_API_Object = PyCObject_FromVoidPtr((void *)PyKVIrc_API,NULL); diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index 7028d422f..a1637549b 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -221,7 +221,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) .arg(ch->name()) .arg(ch->netMask()) ); - + for(QHash<QString,QString>::Iterator it2 = ch->propertyDict()->begin();it2 != ch->propertyDict()->end();++it2) { c->window()->outputNoFmt( diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index f616789ca..9abe11c24 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -651,7 +651,7 @@ void RegisteredUserEntryDialog::okClicked() } else { u->setProperty("notify",QString("")); } - + m_pPropertyDict->remove("comment"); m_pPropertyDict->remove("notify"); m_pPropertyDict->remove("avatar"); diff --git a/src/modules/reguser/RegisteredUserEntryDialog.h b/src/modules/reguser/RegisteredUserEntryDialog.h index 249d8e975..05ee01146 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.h +++ b/src/modules/reguser/RegisteredUserEntryDialog.h @@ -107,7 +107,7 @@ protected: QCheckBox * m_pNotifyCheck; QLineEdit * m_pNotifyNick; QLabel * m_pNotifyLabel; - + KviPixmap * m_pAvatar; KviPixmapSelector * m_pAvatarSelector; diff --git a/src/modules/rijndael/BlowFish.cpp b/src/modules/rijndael/BlowFish.cpp index 9cea65f25..bd9f74b3e 100644 --- a/src/modules/rijndael/BlowFish.cpp +++ b/src/modules/rijndael/BlowFish.cpp @@ -315,15 +315,15 @@ BlowFish::BlowFish(unsigned char* ucKey, unsigned int keysize, const SBlock& roC /* * BRAINDEAD DEVELOPER DISCLAIMER: * Blowfish can accept keys up to 72 bytes, but the common value is 56: - * Using keylenghts of 72 chars offers a small amount of added security, - * but adds also the possibility of choosing a weak key that resulted in all - * 18 P sub−keys turning into 0 after being XORed with a 576 bit key + * Using keylenghts of 72 chars offers a small amount of added security, + * but adds also the possibility of choosing a weak key that resulted in all + * 18 P sub−keys turning into 0 after being XORed with a 576 bit key * (Short version: someone can trick you into using an empty password, and you won't notice) - * + * * Original mircryption uses keys of 56 bytes in ecb mode. * FiSH uses keys of 72 bytes in both ecb and cbc mode. * Newer mirccryption uses keys of 80 (!?) bytes only in ecb mode and 56 in cbc mode. - * + * * Since having a longer key doesn't imply more security (but, instead, adds a potential * security risk), we go the safe way using the standard keylength. */ diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt index 92b3fe56b..2b3c374e8 100644 --- a/src/modules/rijndael/CMakeLists.txt +++ b/src/modules/rijndael/CMakeLists.txt @@ -11,7 +11,7 @@ if(WANT_OPENSSL) InitVectorEngine.cpp ) - + # set(ADDITIONAL_COMPILE_FLAGS "${ADDITIONAL_COMPILE_FLAGS} -fno-strict-aliasing") diff --git a/src/modules/rijndael/InitVectorEngine.cpp b/src/modules/rijndael/InitVectorEngine.cpp index 83faeb3ee..667a11d4b 100644 --- a/src/modules/rijndael/InitVectorEngine.cpp +++ b/src/modules/rijndael/InitVectorEngine.cpp @@ -42,7 +42,7 @@ namespace InitVectorEngine for(int i=0;i<iLen;i++) pIn[i] = (unsigned char)(rand() % 256); - + return iLen; } }; diff --git a/src/modules/rijndael/InitVectorEngine.h b/src/modules/rijndael/InitVectorEngine.h index ae6565990..7d0a20235 100644 --- a/src/modules/rijndael/InitVectorEngine.h +++ b/src/modules/rijndael/InitVectorEngine.h @@ -28,5 +28,5 @@ namespace InitVectorEngine { extern int fillRandomIV(unsigned char * pIn, int iLen=8); } - + #endif //!_INITVECTORENGINE_H_ diff --git a/src/modules/rijndael/UglyBase64.cpp b/src/modules/rijndael/UglyBase64.cpp index 5683a3604..5a80efc54 100644 --- a/src/modules/rijndael/UglyBase64.cpp +++ b/src/modules/rijndael/UglyBase64.cpp @@ -95,7 +95,7 @@ namespace UglyBase64 *p++ = fake_base64[*dd1 & 0x3f]; } } - + void decode(KviCString & szText, unsigned char ** buf, int *len) { // make sure its length is multiple of 12 (eventually pad with zeroes) diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 5784dc8c7..6e525b01d 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -32,7 +32,7 @@ #include "KviControlCodes.h" #include "UglyBase64.h" #include "InitVectorEngine.h" - + //#warning "Other engines: mircStrip koi2win colorizer lamerizer etc.." /* @@ -120,7 +120,7 @@ KviCString szTmpEncryptKey = KviCString(encKey,encKeyLen); KviCString szTmpDecryptKey = KviCString(decKey,decKeyLen); - + m_bEncryptMode = CBC; // default mode m_bDecryptMode = CBC; // default mode @@ -438,7 +438,7 @@ } m_szEncryptKey = KviCString(encKey,encKeyLen); m_szDecryptKey = KviCString(decKey,decKeyLen); - + m_bEncryptCBC = true; m_bDecryptCBC = true; diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index d4bcd58c8..a4cefc66d 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -451,7 +451,7 @@ SetupWizard::SetupWizard() pPixmapLabelHiRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); pPixmapLabelHiRes->setMargin(0); pThemeGrid->addWidget(pPixmapLabelHiRes, 1,1); - + m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),m_pThemeButtonGroup); pThemeGrid->addWidget(m_pThemeHiRes, 2,1); @@ -464,18 +464,18 @@ SetupWizard::SetupWizard() } QLabel* pPixmapLabelLowRes = new QLabel(m_pThemeButtonGroup); - + pPixmapLabelLowRes->setPixmap(*pLowResPixmap); pPixmapLabelLowRes->setFixedSize(pLowResPixmap->size()); pPixmapLabelLowRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); pPixmapLabelLowRes->setMargin(0); pThemeGrid->addWidget(pPixmapLabelLowRes, 1,2); - + m_pThemeLoRes = new QRadioButton(__tr2qs("&Minimalist Theme"),m_pThemeButtonGroup); pThemeGrid->addWidget(m_pThemeLoRes, 2,2); m_pThemeNone = new QRadioButton(__tr2qs("&Don't apply any theme"),m_pThemeButtonGroup); pThemeGrid->addWidget(m_pThemeNone, 3,1); - + m_pThemeHiRes->setChecked(true); addPage(m_pTheme,__tr2qs("Default Theme")); diff --git a/src/modules/setup/SetupWizard.h b/src/modules/setup/SetupWizard.h index 88df3a4a5..3b2204699 100644 --- a/src/modules/setup/SetupWizard.h +++ b/src/modules/setup/SetupWizard.h @@ -148,7 +148,7 @@ public slots: void oldDirClicked(); void newDirClicked(); void portableClicked(); - + void oldDataTextChanged ( const QString & ); void newDataTextChanged ( const QString & ); void newIncomingTextChanged ( const QString & ); diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 0fad1f912..ab170402e 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -300,7 +300,7 @@ void KviSoundPlayer::cleanupPhonon() sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT); return true; } - + void KviSoundPlayer::cleanupWinmm() { // FIXME: how to stop playing on windows ? @@ -319,7 +319,7 @@ void KviSoundPlayer::cleanupPhonon() } return true; } - + void KviSoundPlayer::cleanupOssAudiofile() { } diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h index 1b73c31b1..5fe69f0b1 100644 --- a/src/modules/snd/libkvisnd.h +++ b/src/modules/snd/libkvisnd.h @@ -124,12 +124,12 @@ public: { return m_pPlayRoutine; } - + SoundSystemCleanupRoutine cleanupRoutine() const { return m_pCleanupRoutine; } - + }; class KviSoundPlayer : public QObject diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index b8a029f2c..78b94189a 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -213,8 +213,8 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c) if(!iId) //Delete all spaste's from the current window { - if((c->window()->type() != KviWindow::Channel) && - (c->window()->type() != KviWindow::Query) && + if((c->window()->type() != KviWindow::Channel) && + (c->window()->type() != KviWindow::Query) && (c->window()->type() != KviWindow::DccChat) && (c->window()->type() != KviWindow::DeadChannel) && (c->window()->type() != KviWindow::DeadQuery) diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index a4869dca0..0791e7005 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -420,7 +420,7 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) <variant> $system.dbus(<service:string>,<path:string>,<interface:string>,<method:string>[,<bus_type:string>[,<parameter1:string>[,<parameter2:string>[,...]]]]) @description: This function allows performing simple Dbus calls without executing - an external process. This feature is available ONLY under unix: + an external process. This feature is available ONLY under unix: this means that this function is absolutely non portable (don't use it in scripts that you're going to distribute). <application> is the name of the application being called, <objectid> is the @@ -475,7 +475,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) szBusType = "session"; QDBusConnection busType(""); - + if(szBusType == "system") { busType = QDBusConnection::systemBus(); @@ -485,7 +485,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) c->warning(__tr2qs("No DBus type specified")); return false; } - + if(szService.left(1).compare("?")==0) { szService.remove(0,1); diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp index 875266f06..ac031ba74 100644 --- a/src/modules/theme/PackThemeDialog.cpp +++ b/src/modules/theme/PackThemeDialog.cpp @@ -65,7 +65,7 @@ PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> setMinimumSize(400,350); setDefaultProperty("QTextEdit","plainText",SIGNAL(textChanged())); m_pThemeInfoList = pThemeInfoList; - + QPixmap * pSide = g_pIconManager->getBigIcon("kvi_setup_label.png"); QPixmap * pLogo = g_pIconManager->getBigIcon("kvi_bigicon_addons.png"); @@ -99,7 +99,7 @@ PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> pPage->setLayout(pLayout); pPage->setTitle(__tr2qs_ctx("Welcome","theme")); - + QString szText = "<p>"; szText += __tr2qs_ctx("This procedure allows you to export the selected themes to a single package. It is useful when you want to distribute your themes to the public.","theme"); szText += "</p><p>"; @@ -121,11 +121,11 @@ PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> // Packager information m_pPackThemeInfoWidget = new PackThemeInfoWidget(this); addPage(m_pPackThemeInfoWidget); - + // Screenshot/logo/icon m_pPackThemeImageWidget = new PackThemeImageWidget(this); addPage(m_pPackThemeImageWidget); - + // Save file name m_pPackThemeSaveWidget = new PackThemeSaveWidget(this); addPage(m_pPackThemeSaveWidget); @@ -151,10 +151,10 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL KviThemeInfo * pThemeInfo = 0; bool bPackagePathSet = false; - + QString szPackagePath = QDir::homePath(); KviQString::ensureLastCharIs(szPackagePath,QChar(KVI_PATH_SEPARATOR_CHAR)); - + if(pThemeInfoList->count() > 1) { szPackageName = "MyThemes"; @@ -181,7 +181,7 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL bPackagePathSet = true; } } - + if(!bPackagePathSet) { szPackagePath += szPackageName; @@ -255,7 +255,7 @@ PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent) setObjectName("theme_package_info_page"); setTitle(__tr2qs_ctx("Package Information","theme")); setSubTitle(__tr2qs_ctx("Here you need to provide information about you (the packager) and a short description of the package you're creating.","theme")); - + QGridLayout * pLayout = new QGridLayout(this); @@ -297,7 +297,7 @@ PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent) pLayout->setRowStretch(3,1); pLayout->setColumnStretch(1,1); - + // Store data in the fields registerField("packageName*",m_pPackageNameEdit); registerField("packageVersion*",m_pPackageVersionEdit); @@ -391,7 +391,7 @@ PackThemeSaveWidget::PackThemeSaveWidget(PackThemeDialog * pParent) pLabel->setWordWrap(true); pLabel->setText(__tr2qs_ctx("Finally hit the \"Finish\" button to complete the packaging operation.","theme")); pLayout->addWidget(pLabel); - + // Store data in the fields registerField("packageSavePath*",m_pSavePathSelector); } @@ -466,7 +466,7 @@ bool PackThemeDialog::packTheme() QString szTmp; QDateTime date = QDateTime::currentDateTime(); - + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: @@ -562,7 +562,7 @@ bool PackThemeDialog::packTheme() szTmp, QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton ); - + return false; } @@ -574,6 +574,6 @@ bool PackThemeDialog::packTheme() __tr2qs("Package saved successfully"), QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton ); - + return true; } diff --git a/src/modules/theme/PackThemeDialog.h b/src/modules/theme/PackThemeDialog.h index 920bed2a1..15f8e83d2 100644 --- a/src/modules/theme/PackThemeDialog.h +++ b/src/modules/theme/PackThemeDialog.h @@ -54,7 +54,7 @@ protected: PackThemeImageWidget * m_pPackThemeImageWidget; PackThemeSaveWidget * m_pPackThemeSaveWidget; KviPointerList<KviThemeInfo> * m_pThemeInfoList; - + QString m_szAuthor; QString m_szName; QString m_szVersion; diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp index 009858128..6caab1d0b 100644 --- a/src/modules/theme/SaveThemeDialog.cpp +++ b/src/modules/theme/SaveThemeDialog.cpp @@ -244,7 +244,7 @@ bool SaveThemeDialog::saveTheme() sto.setAuthor(m_pAuthorNameEdit->text()); sto.setDescription(m_pThemeDescriptionEdit->toPlainText()); - + QString szTmp; QDateTime date = QDateTime::currentDateTime(); switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) @@ -261,7 +261,7 @@ bool SaveThemeDialog::saveTheme() szTmp = date.toString(Qt::SystemLocaleShortDate); break; } - + sto.setDate(szTmp); sto.setVersion(m_pThemeVersionEdit->text()); sto.setApplication("KVIrc " KVI_VERSION "." KVI_SOURCES_DATE); diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp index 4778b75ad..e6ca012a6 100644 --- a/src/modules/theme/ThemeManagementDialog.cpp +++ b/src/modules/theme/ThemeManagementDialog.cpp @@ -80,7 +80,7 @@ ThemeListWidgetItem::ThemeListWidgetItem(KviTalListWidget * pBox, KviThemeInfo * : KviTalListWidgetItem(pBox) { m_pThemeInfo = pInfo; - + QString szText; szText = "<nobr><b>"; szText += pInfo->name(); @@ -334,7 +334,7 @@ void ThemeManagementDialog::contextMenuRequested(const QPoint & pos) if(!pInfo) return; QString szDir = pInfo->dirName(); - + if(!pInfo->isBuiltin()) m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Minus)),__tr2qs_ctx("&Remove Theme","theme"),this,SLOT(deleteTheme())); @@ -394,7 +394,7 @@ void ThemeManagementDialog::deleteTheme() &(pInfo->name()), &(pInfo->version())) ) goto jump_out; - + QString szThemePath; ((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->getCompleteDirPath(szThemePath); KviFileUtils::deleteDir(szThemePath); diff --git a/src/modules/theme/WebThemeInterfaceDialog.h b/src/modules/theme/WebThemeInterfaceDialog.h index fa0437f0e..dac3efc74 100644 --- a/src/modules/theme/WebThemeInterfaceDialog.h +++ b/src/modules/theme/WebThemeInterfaceDialog.h @@ -48,9 +48,9 @@ protected: virtual bool installPackage(const QString &szPath,QString &szError); }; - + #endif //COMPILE_WEBKIT_SUPPORT - + #endif //_WEBTHEMEINTERFACEDIALOG_H_ diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index ba7d06adf..0f02ac47a 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -209,7 +209,7 @@ void TipWindow::prevTip() unsigned int uNumTips = m_pConfig->readUIntEntry("uNumTips",0); unsigned int uCurTip = m_pConfig->readUIntEntry("uCurTip",0); - + if(uCurTip == 0)uCurTip = uNumTips-1; else uCurTip--; diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp index d097572f7..73664c129 100644 --- a/src/modules/toolbar/libkvitoolbar.cpp +++ b/src/modules/toolbar/libkvitoolbar.cpp @@ -321,7 +321,7 @@ static bool toolbar_kvs_fnc_exists(KviKvsModuleFunctionCall * c) <boolean> $toolbar.isVisible(<id:string>) @description: Returns 1 if the toolbar with the specified <id> is visible, - or 0 when invisible or the given toolbar does not exist. + or 0 when invisible or the given toolbar does not exist. @seealso: [cmd]toolbar.show[/cmd] */ @@ -349,7 +349,7 @@ static bool toolbar_kvs_fnc_isVisible(KviKvsModuleFunctionCall * c) <array> $toolbar.list() @description: Returns a list of defined toolbar identifiers - - this can be used to loop through all defined toolbars. + this can be used to loop through all defined toolbars. @seealso: */ diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index f3711e022..4e8869b37 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -93,8 +93,8 @@ KviTrayIconWidget::KviTrayIconWidget() QPalette p; m_pTitleLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); QWidgetAction * pAction = new QWidgetAction(this); - pAction->setDefaultWidget(m_pTitleLabel); - m_pContextPopup->addAction(pAction); + pAction->setDefaultWidget(m_pTitleLabel); + m_pContextPopup->addAction(pAction); m_pContextPopup->setWindowTitle(__tr2qs("Context")); m_pAwayMenuId = m_pContextPopup->addMenu(m_pAwayPopup); diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index f80729a1f..3ccd05bef 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -137,7 +137,7 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *) :KviWindow(KviWindow::Tool,"URL List") { setAutoFillBackground(false); - + m_pUrlList = new UrlDialogTreeWidget(this); m_pMenuBar = new KviTalMenuBar(this,"url menu"); diff --git a/src/modules/userlist/libkviuserlist.cpp b/src/modules/userlist/libkviuserlist.cpp index 34bc69672..43942c396 100644 --- a/src/modules/userlist/libkviuserlist.cpp +++ b/src/modules/userlist/libkviuserlist.cpp @@ -126,7 +126,7 @@ static bool userlist_kvs_fnc_selected(KviKvsModuleFunctionCall * c) static bool userlist_kvs_cmd_select(KviKvsModuleCommandCall * c) { GET_KVS_WINDOW_ID_AND_NICK - + if(pWnd->type() != KviWindow::Channel) { c->warning(__tr2qs_ctx("The specified window is not a channel","kvs")); @@ -140,7 +140,7 @@ static bool userlist_kvs_cmd_select(KviKvsModuleCommandCall * c) static bool userlist_kvs_cmd_ensureVisible(KviKvsModuleCommandCall * c) { GET_KVS_WINDOW_ID_AND_NICK - + if(pWnd->type() != KviWindow::Channel) { c->warning(__tr2qs_ctx("The specified window is not a channel","kvs")); |